Changeset 21647 for trunk/src/kernel32/exceptions.cpp

Timestamp:

Jun 23, 2011, 1:33:43 PM (14 years ago)

Author:

dmik

Message:

kernel32: Propagate exceptions further along the OS/2 chain instead of terminating the application if the last Win32 exception handler (eg the SEH one) returns ExceptionContinueSearch. This lets unhandled exceptions be seen by eg PROCDUMP.

File:

• trunk/src/kernel32/exceptions.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1249 +1249 @@
         if((!fIsOS2Image || fSEHEnabled) && !fExitProcess)  //Only for real win32 apps or if SEH enabled
         {
-                if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == FALSE)
-                {
-                        pCtxRec->ctx_env[0] |= 0x1F;
-                        pCtxRec->ctx_stack[0].losig = 0;
-                        pCtxRec->ctx_stack[0].hisig = 0;
-                        pCtxRec->ctx_stack[0].signexp = 0;
-                }
+            if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == FALSE)
+            {
+                pCtxRec->ctx_env[0] |= 0x1F;
+                pCtxRec->ctx_stack[0].losig = 0;
+                pCtxRec->ctx_stack[0].hisig = 0;
+                pCtxRec->ctx_stack[0].signexp = 0;
+            }
+            else
+            {
                 dprintf(("KERNEL32: OS2ExceptionHandler: fix and continue\n"));
                 goto continueexecution;
-        }
-        else
-        {
-                dprintf(("KERNEL32: OS2ExceptionHandler: continue search\n"));
-                goto continuesearch;
-        }
+            }
+        }
+        dprintf(("KERNEL32: OS2ExceptionHandler: continue search\n"));
+        goto continuesearch;
 
     case XCPT_PROCESS_TERMINATE:
@@ -1519 +1519 @@
                 goto continueexecution;
             }
+            else
+            {
+                goto continuesearch;
+            }
         }
         else {