Changeset 395 for trunk/openjdk/hotspot

Timestamp:

Jul 18, 2012, 9:37:38 PM (13 years ago)

Author:

dmik

Message:

Make sure BEGINLIBPATH is not necessary when loading JVM.

BEGINLIBPATH is not necessary at all now: neither when loading the JVM
with standard launchers (like java.exe) nor when doing JVM.DLL directly.

File:

• trunk/openjdk/hotspot/src/os/os2/vm/os_os2_init.cpp (modified) (3 diffs)

trunk/openjdk/hotspot/src/os/os2/vm/os_os2_init.cpp

@@ -28 +28 @@
 // the Windows DllMain() and registers the DLL with Odin
 
+#define INCL_DOS
+#define INCL_ERRORS
 #include <os2wrap.h> // Odin32 OS/2 api wrappers
 #include <odinlx.h>
@@ -36 +38 @@
 #include <emx/startup.h>
 #endif
+
+#include <string.h>
 
 extern "C" BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved);
@@ -72 +76 @@
         CheckVersionFromHMOD(PE2LX_VERSION, hModule);
 
+        // Assuming that JVM.DLL is stored in a bin/<type>/ subdirectory (where
+        // type is e.g. "client"), we add this directory, as well as its parent
+        // (which contains all other Java DLLs), to BEGINLIBPATH so that the OS2
+        // DLL loader can satisfy DLL dependencies (i.e. find DLLs referred to
+        // by other DLLs through their import module table) when some Java DLLs
+        // (e.g. JAVA.DLL, JZIP.DLL) are dynamically loaded later by JVM.DLL.
+        // Note that despite the fact that JVM.DLL is already loaded at this
+        // point, we still need to add its directory to BEGINLIBPATH. This is
+        // bcause most likely it's been loaded by full path which does NOT make
+        // it locatable by the loader when referred to by name from the import
+        // table of some other DLL (like JAVA.DLL).
+
+        char dllpath[CCHMAXPATH + 16 /* ";%BEGINLIBPATH%" */];
+        if (DosQueryModuleName(hModule, sizeof(dllpath), dllpath) == NO_ERROR)
+        {
+            char *end = strrchr(dllpath, '\\');
+            if (end)
+            {
+                strcpy(end, ";%BEGINLIBPATH%");
+                DosSetExtLIBPATH(dllpath, BEGIN_LIBPATH);
+                end = strrchr(dllpath, '\\');
+                if (end)
+                {
+                    strcpy(end, ";%BEGINLIBPATH%");
+                    DosSetExtLIBPATH(dllpath, BEGIN_LIBPATH);
+                }
+            }
+        }
+
 #ifdef ODIN_FORCE_WIN32_TIB
         // enable __try/__except support