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

Timestamp:

Oct 8, 1999, 9:47:26 PM (26 years ago)

Author:

sandervl

Message:

Ported latest Wine exception handling code

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.20 1999-10-05 14:28:33 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.21 1999-10-08 19:47:26 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  * Project Odin Software License can be found in LICENSE.TXT
  *
+ *
+ * (dlls\ntdll\exception.c)
+ * 
+ * Copyright 1999 Turchanov Sergey
+ * Copyright 1999 Alexandre Julliard
  *
  * (win32\except.c)
@@ -58 +63 @@
 #include <misc.h>
 #include "mmap.h"
+#include <wprocess.h>
 
 //Global Process Unhandled exception filter
@@ -112 +118 @@
  * Author    : Sander van Leeuwen [Tue, 1999/07/01 09:00]
  *****************************************************************************/
+
+void WIN32API RtlRaiseException(WINEXCEPTION_RECORD *rec, WINCONTEXT *context);
 
 VOID _Pascal OS2RaiseException(DWORD dwExceptionCode,
@@ -122 +130 @@
                                DWORD es,  DWORD fs,   DWORD gs,  DWORD ss)
 {
-  PWINEXCEPTION_FRAME   pframe;
+  PWINEXCEPTION_FRAME   pframe, dispatch, nested_frame;
   WINEXCEPTION_RECORD   record;
+  WINEXCEPTION_RECORD   newrec;
   WINEXCEPTION_POINTERS ExceptionInfo;
   WINCONTEXT            context;
-  DWORD                 dispatch;
   int                   rc;
   int                   i;
@@ -169 +177 @@
   // get chain of exception frames
   rc     = ExceptionContinueSearch;
-  pframe = QueryExceptionChain();
+
+  nested_frame = NULL;
+  TEB *winteb = GetThreadTEB();
+  pframe      = (PWINEXCEPTION_FRAME)winteb->except;
 
   // walk the exception chain
   while( (pframe != NULL) && (pframe != ((void *)0xFFFFFFFF)) )
   {
-    dispatch=0;
-    rc = pframe->Handler(&record,
-                         pframe,
-                         &context,
-                         &dispatch);
-    if(rc == ExceptionContinueExecution)
-      break;
-
-    pframe = pframe->Prev;
+        dispatch=0;
+
+        dprintf(("Calling exception handler %x", pframe->Handler));
+        /* Check frame address */
+        if (((void*)pframe < winteb->stack_low) ||
+            ((void*)(pframe+1) > winteb->stack_top) ||
+            (int)pframe & 3)
+        {
+            record.ExceptionFlags |= EH_STACK_INVALID;
+            break;
+        }
+
+        rc = pframe->Handler(&record,
+                             pframe,
+                             &context,
+                             &dispatch);
+
+        if (pframe == nested_frame)
+        {
+            /* no longer nested */
+            nested_frame = NULL;
+            record.ExceptionFlags &= ~EH_NESTED_CALL;
+        }
+
+        dprintf(("exception handler returned %x", rc));
+
+        switch(rc)
+        {
+        case ExceptionContinueExecution:
+            if (!(record.ExceptionFlags & EH_NONCONTINUABLE)) return;
+            DosExit(EXIT_PROCESS, 0);
+            break;
+        case ExceptionContinueSearch:
+            break;
+        case ExceptionNestedException:
+            if (nested_frame < dispatch) nested_frame = dispatch;
+            record.ExceptionFlags |= EH_NESTED_CALL;
+            break;
+        default:
+            DosExit(EXIT_PROCESS, 0);
+            break;
+        }
+
+        pframe = pframe->Prev;
   }
 
@@ -226 +272 @@
                          DWORD es,  DWORD fs,   DWORD gs,  DWORD ss)
 {
-  WINEXCEPTION_RECORD record;
+  PWINEXCEPTION_FRAME frame, dispatch;
+  WINEXCEPTION_RECORD record, newrec;
   WINCONTEXT          context;
-  DWORD               dispatch;
   int                 rc;
 
@@ -267 +313 @@
 
   /* get chain of exception frames */
-  while((QueryExceptionChain() != NULL) &&
-        (QueryExceptionChain() != (void *)0xffffffff) &&
-        (QueryExceptionChain() != pEndFrame))
-  {
-    dispatch=0;
-    rc = QueryExceptionChain()->Handler(pRecord,
-                                        QueryExceptionChain(),
-                                        &context,
-                                        &dispatch);
-
-    if((rc == ExceptionCollidedUnwind) &&
-       (QueryExceptionChain() != (LPVOID)dispatch))
-    {
-      SetExceptionChain(dispatch);
-    }
-    else
-      if((QueryExceptionChain() != pEndFrame) &&
-         (QueryExceptionChain() != QueryExceptionChain()->Prev))
-        SetExceptionChain((DWORD)QueryExceptionChain()->Prev);
-      else
-        break;
-  }
-
-  if(pEndFrame == UNWIND_ALL)
-  {
-    dprintf(("KERNEL32: RtlUnwind terminating thread.\n"));
-    DosExit(EXIT_THREAD, 0);
+  TEB *winteb = GetThreadTEB();
+  frame       = (PWINEXCEPTION_FRAME)winteb->except;
+
+  while ((frame != (PWINEXCEPTION_FRAME)0xffffffff) && (frame != pEndFrame))
+  {
+        /* Check frame address */
+        if (pEndFrame && (frame > pEndFrame))
+        {
+            newrec.ExceptionCode    = STATUS_INVALID_UNWIND_TARGET;
+            newrec.ExceptionFlags   = EH_NONCONTINUABLE;
+            newrec.ExceptionRecord  = pRecord;
+            newrec.NumberParameters = 0;
+            dprintf(("KERNEL32: RtlUnwind terminating thread.\n"));
+            DosExit(EXIT_THREAD, 0);
+        }
+        if (((void*)frame < winteb->stack_low) ||
+            ((void*)(frame+1) > winteb->stack_top) ||
+            (int)frame & 3)
+        {
+            newrec.ExceptionCode    = STATUS_BAD_STACK;
+            newrec.ExceptionFlags   = EH_NONCONTINUABLE;
+            newrec.ExceptionRecord  = pRecord;
+            newrec.NumberParameters = 0;
+            dprintf(("KERNEL32: RtlUnwind terminating thread.\n"));
+            DosExit(EXIT_THREAD, 0);
+        }
+
+        /* Call handler */
+        dprintf(("Calling exception handler %x", frame->Handler));
+        switch(frame->Handler(pRecord, frame, &context, &dispatch ))
+        {
+        case ExceptionContinueSearch:
+            break;
+        case ExceptionCollidedUnwind:
+            frame = dispatch;
+            break;
+        default:
+            newrec.ExceptionCode    = STATUS_INVALID_DISPOSITION;
+            newrec.ExceptionFlags   = EH_NONCONTINUABLE;
+            newrec.ExceptionRecord  = pRecord;
+            newrec.NumberParameters = 0;
+            dprintf(("KERNEL32: RtlUnwind terminating thread.\n"));
+            DosExit(EXIT_THREAD, 0);
+            break;
+        }
+        SetExceptionChain((DWORD)frame->Prev);
+        frame = frame->Prev;
   }
   return(0);