Changeset 346 for trunk

Timestamp:

Apr 19, 2012, 1:28:27 AM (13 years ago)

Author:

dmik

Message:

Disable Win32 TIB mode since SEH now works in OS/2 context.

This fixes the old IBM TCP/IP settings application (closes #162).

Location:

trunk/openjdk

Files:

• hotspot/src/os/os2/vm/os_os2_init.cpp (modified) (1 diff)
• jdk/src/windows/bin/java_md.c (modified) (1 diff)

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

@@ -72 +72 @@
         CheckVersionFromHMOD(PE2LX_VERSION, hModule);
 
+#ifdef ODIN_FORCE_WIN32_TIB
         // enable __try/__except support
-        EnableSEH();
+        ForceWin32TIB();
+#endif
 
         dllHandle = RegisterLxDll(hModule, DllMain, NULL);

trunk/openjdk/jdk/src/windows/bin/java_md.c

@@ -365 +365 @@
 main(int argc, char ** argv)
 {
-    EnableSEH();
+#ifdef ODIN_FORCE_WIN32_TIB
+    ForceWin32TIB();
+#endif
     return RegisterLxExe((WINMAIN)WinMain, NULL);
 }