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

Timestamp:

Oct 22, 1999, 8:07:24 PM (26 years ago)

Author:

sandervl

Message:

exception handler changes + EB's HeapReAlloc fix

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.25 1999-10-14 12:30:01 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.26 1999-10-22 18:07:18 sandervl Exp $ */
 
 /*
@@ -71 +71 @@
 static PEXCEPTION_HANDLER           StartupCodeHandler = NULL;
 
-extern "C" PWINEXCEPTION_FRAME QueryExceptionChain();
 extern "C" PWINEXCEPTION_FRAME GetExceptionRecord(ULONG offset, ULONG segment);
 
@@ -1025 +1024 @@
                 }
         }
+        else    return XCPT_CONTINUE_SEARCH; //pass on to OS/2 RTL or app exception handler
+
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
         pCtxRec->ctx_RegEip = (ULONG)KillWin32Process;
@@ -1073 +1074 @@
 
   DosSetExceptionHandler(pExceptRec);
+  dprintf(("OS2SetExceptionHandler: exception chain %x (old %x)", pExceptRec, pExceptRec->prev_structure));
 }
 
@@ -1127 +1129 @@
     return;
 
-  orgframe = QueryExceptionChain();
+  orgframe = (PWINEXCEPTION_FRAME)QueryExceptionChain();
   if((int)orgframe == 0 ||
      (int)orgframe == -1)