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

Timestamp:

Jul 7, 2012, 1:59:15 AM (13 years ago)

Author:

dmik

Message:

kernel32: Pick up register changes in try/except filter.

This is a regression of r21999. Fixes endless exceptions eventually
leading to program termination.

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1119 +1119 @@
                              PEXCEPTIONREGISTRATIONRECORD pERegRec,
                              PCONTEXTRECORD               pCtxRec,
-                             PVOID                        p)
+                             PVOID                        p,
+                             BOOL                         fSEH)
 {
     char szTrapDump[2048];
@@ -1128 +1129 @@
 #endif
     /* now dump the information to the logfile */
-    dprintf(("\n%s", szTrapDump));
+    dprintf(("OS2ExceptionHandler: fSEH=%d\n%s", fSEH, szTrapDump));
 }
 
 #else // DEBUG
-#define dprintfException(a,b,c,d) do {} while (0)
+#define dprintfException(a,b,c,d,e) do {} while (0)
 #endif // DEBUG
 
@@ -1321 +1322 @@
     case XCPT_FLOAT_STACK_CHECK:
     case XCPT_FLOAT_UNDERFLOW:
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
         dprintf(("KERNEL32: OS2ExceptionHandler (fSEH=%d): FPU exception\n", fSEH));
         if((!fIsOS2Image || fForceWin32TIB || fSEH) && !fExitProcess)  //Only for real win32 apps or when forced
@@ -1344 +1345 @@
     case XCPT_ASYNC_PROCESS_TERMINATE:
 #if 0
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
         PrintExceptionChain();
         // fall through
@@ -1511 +1512 @@
             if(teb->o.odin.context.ContextFlags)
             {
-                dprintfException(pERepRec, pERegRec, pCtxRec, p);
+                dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
 
                 //NOTE: This will not work properly in case multiple threads execute this code
@@ -1582 +1583 @@
 
 #if defined(DEBUG)
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
 
         if(!fExitProcess && (pCtxRec->ContextFlags & CONTEXT_CONTROL)) {
@@ -1765 +1766 @@
 // @@VP20040507: Isn't this a bit dangerous to call dprintfon such exception
 //#ifdef DEBUG
-//        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+//        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
 //#endif
         goto continuesearch;
@@ -1790 +1791 @@
 
             case XCPT_SIGNAL_INTR:
-                dprintfException(pERepRec, pERegRec, pCtxRec, p);
+                dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
                 if (InternalGenerateConsoleCtrlEvent((breakPressed) ? CTRL_BREAK_EVENT : CTRL_C_EVENT, 0))
                 {
@@ -1805 +1806 @@
 
     default: //non-continuable exceptions
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
         goto continuesearch;
     }