Better error reporting when dll/shared library is not able to be loaded.

Submitted by: Bård Farstad <bf@ez.no>

diff --git a/ext/java/java.c b/ext/java/java.c
index ed78777e775779c193eee871af3b40c482dd65b9..6bb0aaa2d01c6f4d59fa3c67eb9dbcecf6d9b358 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -29,6 +29,13 @@
 #include "php_ini.h"
 #include "php_globals.h"
 
+#ifdef PHP_WIN32
+  #include "win32/winutil.h"
+  #define DL_ERROR php_win_err()
+#else
+  #define DL_ERROR dlerror()
+#endif
+
 #include <jni.h>
 
 #include <stdio.h>
@@ -185,7 +192,8 @@ static int jvm_create() {
     dl_handle = DL_LOAD(javalib);
 
     if (!dl_handle) {
-      php_error(E_ERROR, "Unable to load Java Library %s", javalib);
+      php_error(E_ERROR, "Unable to load Java Library %s, error: %s", 
+        javalib, DL_ERROR);
       return -1;
     }
   }

diff --git a/ext/java/java.dsp b/ext/java/java.dsp
index 2cc16332458d241970e7063c156e7e0e2198b34d..6c33f4e0e3b30b15f7eb9899854adf545bcb9d0f 100644 (file)
--- a/ext/java/java.dsp
+++ b/ext/java/java.dsp
@@ -150,6 +150,10 @@ LINK32=link.exe
 \r
 SOURCE=.\java.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\..\..\win32\winutil.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index ed78777e775779c193eee871af3b40c482dd65b9..6bb0aaa2d01c6f4d59fa3c67eb9dbcecf6d9b358 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -29,6 +29,13 @@
 #include "php_ini.h"
 #include "php_globals.h"
 
+#ifdef PHP_WIN32
+  #include "win32/winutil.h"
+  #define DL_ERROR php_win_err()
+#else
+  #define DL_ERROR dlerror()
+#endif
+
 #include <jni.h>
 
 #include <stdio.h>
@@ -185,7 +192,8 @@ static int jvm_create() {
     dl_handle = DL_LOAD(javalib);
 
     if (!dl_handle) {
-      php_error(E_ERROR, "Unable to load Java Library %s", javalib);
+      php_error(E_ERROR, "Unable to load Java Library %s, error: %s", 
+        javalib, DL_ERROR);
       return -1;
     }
   }

diff --git a/ext/rpc/java/java.dsp b/ext/rpc/java/java.dsp
index 2cc16332458d241970e7063c156e7e0e2198b34d..6c33f4e0e3b30b15f7eb9899854adf545bcb9d0f 100644 (file)
--- a/ext/rpc/java/java.dsp
+++ b/ext/rpc/java/java.dsp
@@ -150,6 +150,10 @@ LINK32=link.exe
 \r
 SOURCE=.\java.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\..\..\win32\winutil.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/sapi/servlet/servlet.dsp b/sapi/servlet/servlet.dsp
index 77654a69f898806325aa1f4eaab6e82d4b6d2144..648e9be3ec289f3c9a3b0c8cee0c5f2ea792cd92 100644 (file)
--- a/sapi/servlet/servlet.dsp
+++ b/sapi/servlet/servlet.dsp
@@ -154,6 +154,10 @@ SOURCE=..\..\ext\java\java.c
 \r
 SOURCE=.\servlet.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\..\..\win32\winutil.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r