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

Timestamp:

Feb 14, 2001, 11:36:45 AM (25 years ago)

Author:

sandervl

Message:

TLS index allocation + RtlUnwind fixes

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.49 2001-01-29 01:22:21 bird Exp $ */
+/* $Id: exceptions.cpp,v 1.50 2001-02-14 10:36:45 sandervl Exp $ */
 
 /* WARNING: Compiling this module with ICC with optimizations turned on   */
@@ -256 +256 @@
 
 /*******************************************************************
+ *         EXC_UnwindHandler
+ *
+ * Handler for exceptions happening inside an unwind handler.
+ */
+static DWORD WIN32API EXC_UnwindHandler( WINEXCEPTION_RECORD *rec, WINEXCEPTION_FRAME *frame,
+//                              WINCONTEXT *context, WINEXCEPTION_FRAME **dispatcher )
+                                WINCONTEXT *context, LPVOID dispatcher )
+{
+    if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
+        return ExceptionContinueSearch;
+    /* We shouldn't get here so we store faulty frame in dispatcher */
+    *(PWINEXCEPTION_FRAME*)dispatcher = ((EXC_NESTED_FRAME*)frame)->prevFrame;
+    return ExceptionCollidedUnwind;
+}
+
+/*******************************************************************
  *         EXC_CallHandler
  *
@@ -461 +477 @@
         /* Call handler */
         dprintf(("KERNEL32: RtlUnwind - calling exception handler %08X", frame->Handler));
-        rc = frame->Handler(pRecord, frame, &context, &dispatch);
+        rc = EXC_CallHandler(pRecord, frame, &context, &dispatch, frame->Handler, EXC_UnwindHandler );
         dprintf(("KERNEL32: RtlUnwind - handler returned %#x", rc));
         switch (rc)