Changeset 21999 for trunk/testapp/exceptions

Timestamp:

Apr 18, 2012, 10:46:37 PM (13 years ago)

Author:

dmik

Message:

kernel32: Make SEH work in OS/2 context.

See #82 for details.

Location:

trunk/testapp/exceptions

Files:

• GuardPages/main.cpp (modified) (5 diffs)
• seh/crash.c (modified) (3 diffs)
• seh/except.c (modified) (1 diff)
• seh/finally.c (modified) (1 diff)
• seh/longjmp.c (modified) (1 diff)

trunk/testapp/exceptions/GuardPages/main.cpp

@@ -149 +149 @@
     ///////////////////////////////////////////////////
 
+#if 1
+
     printf ("\nTEST 1 (STACK)\n");
 
@@ -154 +156 @@
     DWORD dwYellowZoneSize = sSysInfo.dwPageSize * 3;
 
-#if 1
     if (VirtualAlloc ((LPVOID) dwStackBase, dwYellowZoneSize,
                       MEM_COMMIT, PAGE_READWRITE))
@@ -186 +187 @@
         }
     }
-#endif
 
     PrintMemLayout (&dwStackTop);
 
+#endif
+
     ///////////////////////////////////////////////////
+
+#if 1
 
     printf ("\nTEST 2 (PAGE_GUARD)\n");
@@ -220 +224 @@
     VirtualFree (pNonStack, 0, MEM_RELEASE);
 
+#endif
+
     return 0;
 }
@@ -226 +232 @@
 {
 #ifdef __WIN32OS2__
-    EnableSEH();
+#ifdef ODIN_FORCE_WIN32_TIB
+    ForceWin32TIB();
+#endif
 #endif
 

trunk/testapp/exceptions/seh/crash.c

@@ -24 +24 @@
     _argc = argc;
     _argv = argv;
-    EnableSEH();
+#ifdef ODIN_FORCE_WIN32_TIB
+    ForceWin32TIB();
+#endif
     RegisterLxExe(WinMain, NULL);
 }
@@ -87 +89 @@
 void foo(int code)
 {
-   __try
-   {
-       printf("In foo(%d)...\n", code);
+    __try
+    {
+        printf("In foo(%d)...\n", code);
 
-       if (code == 2)
-       {
-           throw_EXCEPTION_INT_DIVIDE_BY_ZERO();
-           printf("FAILED: No exception!\n");
-       }
-       else
-       {
-           foo(code + 1);
-       }
-   }
-   __except(exc_filter(exception_info()))
-   {
-       printf("FAILED: foo(%d) exception handled.\n", code);
-   }
+        if (code == 2)
+        {
+            throw_EXCEPTION_INT_DIVIDE_BY_ZERO();
+            printf("FAILED: No exception!\n");
+        }
+        else
+        {
+            foo(code + 1);
+        }
+    }
+    __except(exc_filter(exception_info()))
+    {
+        printf("FAILED: foo(%d) exception handled.\n", code);
+    }
 }
 
@@ -118 +120 @@
 {
     printf("The program should now expectedly crash "
-           "(but NO POPUPLOG.OS2 entry!)...\n");
+           "(and may be a NO POPUPLOG.OS2 entry)...\n");
 
     HANDLE hThread = CreateThread(NULL, 0, ThreadProc, NULL, 0, NULL);

trunk/testapp/exceptions/seh/except.c

@@ -23 +23 @@
     _argc = argc;
     _argv = argv;
-    EnableSEH();
+#ifdef ODIN_FORCE_WIN32_TIB
+    ForceWin32TIB();
+#endif
     RegisterLxExe(WinMain, NULL);
 }

trunk/testapp/exceptions/seh/finally.c

@@ -23 +23 @@
     _argc = argc;
     _argv = argv;
-    EnableSEH();
+#ifdef ODIN_FORCE_WIN32_TIB
+    ForceWin32TIB();
+#endif
     RegisterLxExe(WinMain, NULL);
 }

trunk/testapp/exceptions/seh/longjmp.c

@@ -24 +24 @@
     _argc = argc;
     _argv = argv;
-    EnableSEH();
+#ifdef ODIN_FORCE_WIN32_TIB
+    ForceWin32TIB();
+#endif
     RegisterLxExe(WinMain, NULL);
 }