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

Timestamp:

Oct 18, 2000, 7:09:34 PM (25 years ago)

Author:

sandervl

Message:

LoadLibraryExA + memory map close fix, added new registry keys for installation, don't log guard page violation

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.46 2000-10-05 18:36:49 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.47 2000-10-18 17:09:31 sandervl Exp $ */
 
 /* WARNING: Compiling this module with ICC with optimizations turned on   */
@@ -1048 +1048 @@
 #endif
 
-//in misc.cpp
-void CheckLogException();
-
 ULONG APIENTRY OS2ExceptionHandler(PEXCEPTIONREPORTRECORD       pERepRec,
                                    PEXCEPTIONREGISTRATIONRECORD pERegRec,
@@ -1058 +1055 @@
   //SvL: Check if exception inside debug fprintf -> if so, clear lock so
   //     next dprintf won't wait forever
-  CheckLogException();
-
+  LogException(ENTER_EXCEPTION);
 
   /* Access violation at a known location */
@@ -1083 +1079 @@
                 }
                 dprintf(("KERNEL32: OS2ExceptionHandler: fix and continue\n"));
-                return (XCPT_CONTINUE_EXECUTION);
+                goto continueexecution;
         }
         else
         {
                 dprintf(("KERNEL32: OS2ExceptionHandler: continue search\n"));
-                return (XCPT_CONTINUE_SEARCH);
+                goto continuesearch;
         }
 
@@ -1095 +1091 @@
         dprintfException(pERepRec, pERegRec, pCtxRec, p);
         SetExceptionChain((ULONG)-1);
-        return (XCPT_CONTINUE_SEARCH);
+        goto continuesearch;
 
   case XCPT_ACCESS_VIOLATION:
@@ -1126 +1122 @@
         }
         if(map->commitPage(offset, fWriteAccess) == TRUE)
-                return (XCPT_CONTINUE_EXECUTION);
+                goto continueexecution;
 
         //no break;
@@ -1177 +1173 @@
         //    recurse infinitely until we run out of stack space!!
         if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
-                return XCPT_CONTINUE_SEARCH;
+                goto continuesearch;
 
 #ifdef DEBUG
@@ -1189 +1185 @@
                 if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == TRUE)
                 {
-                        return (XCPT_CONTINUE_EXECUTION);
+                        goto continueexecution;
                 }
         }
-        else    return XCPT_CONTINUE_SEARCH; //pass on to OS/2 RTL or app exception handler
+        else    goto continuesearch; //pass on to OS/2 RTL or app exception handler
 
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
@@ -1199 +1195 @@
         pCtxRec->ctx_RegEax = pERepRec->ExceptionNum;
         pCtxRec->ctx_RegEbx = pCtxRec->ctx_RegEip;
-        return (XCPT_CONTINUE_EXECUTION);
+        goto continueexecution;
 
   //@@@PH: growing thread stacks might need special treatment
   case XCPT_GUARD_PAGE_VIOLATION:
-    dprintf(("KERNEL32: OS2ExceptionHandler: trying to grow stack (continue search)"));
-    return (XCPT_CONTINUE_SEARCH);
+        //SvL: don't print anything here -> fatal hang if happens inside fprintf
+        //dprintf(("KERNEL32: OS2ExceptionHandler: trying to grow stack (continue search)"));
+        goto continuesearch;
 
   case XCPT_SIGNAL:
-      if(pERepRec->ExceptionInfo[0] == XCPT_SIGNAL_KILLPROC)          /* resolve signal information */
-      {
-        SetExceptionChain((ULONG)-1);
-        return (XCPT_CONTINUE_SEARCH);
-      }
-      goto CrashAndBurn;
+        if(pERepRec->ExceptionInfo[0] == XCPT_SIGNAL_KILLPROC)          /* resolve signal information */
+        {
+            SetExceptionChain((ULONG)-1);
+            goto continuesearch;
+        }
+        goto CrashAndBurn;
 
   default: //non-continuable exceptions
         dprintfException(pERepRec, pERegRec, pCtxRec, p);
-        return (XCPT_CONTINUE_SEARCH);
-  }
-  return (XCPT_CONTINUE_SEARCH);
+        goto continuesearch;
+  }
+continuesearch:
+  LogException(LEAVE_EXCEPTION);
+  return XCPT_CONTINUE_SEARCH;
+
+continueexecution:
+  LogException(LEAVE_EXCEPTION);
+  return XCPT_CONTINUE_EXECUTION;
 }