Changeset 332

Timestamp:

Feb 22, 2012, 8:36:01 PM (13 years ago)

Author:

dmik

Message:

jdk: Make sure DllMain in JAWTOS2.DLL is called.

This also fixes the duplicate symbol error.

Location:

trunk/openjdk/jdk

Files:

• make/sun/awt/Makefile (modified) (1 diff)
• src/os2/native/common/jdk_DllMain.cpp (modified) (2 diffs)

trunk/openjdk/jdk/make/sun/awt/Makefile

@@ -95 +95 @@
 
 FILES_cpp += jdk_DllMain.cpp
+CXXFLAGS_OPT/jdk_DllMain.obj += -DHAVE_DLLMAIN
+CXXFLAGS_DBG/jdk_DllMain.obj += -DHAVE_DLLMAIN
 
 #

trunk/openjdk/jdk/src/os2/native/common/jdk_DllMain.cpp

@@ -43 +43 @@
 static HMODULE dllHandle = 0;
 
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
+#ifdef HAVE_DLLMAIN
+extern "C" BOOL WINAPI DllMain(HANDLE hInstance, DWORD ul_reason_for_call,
+                               LPVOID);
+#endif
+
+static BOOL WINAPI DefaultDllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
 {
+    BOOL rc = TRUE;
+
+#ifdef HAVE_DLLMAIN
+    rc = DllMain(hinst, reason, reserved);
+#endif
+
     // call destructors when detaching the DLL from the process
     if (reason == 0)
         __ctordtorTerm();
 
-    return TRUE;
+    return rc;
 }
 
@@ -63 +74 @@
     switch (ulFlag) {
         case 0 :
-            dllHandle = RegisterLxDll(hModule, DllMain, NULL,
+            dllHandle = RegisterLxDll(hModule, DefaultDllMain, NULL,
                                       ODINNT_MAJOR_VERSION,
                                       ODINNT_MINOR_VERSION,