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

Timestamp:

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

Author:

sandervl

Message:

Exception handling changes

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.22 1999-10-09 13:33:23 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.23 1999-10-09 15:03:10 sandervl Exp $ */
 
 /*
@@ -64 +64 @@
 #include "mmap.h"
 #include <wprocess.h>
+#include "oslibexcept.h"
 
 //Global Process Unhandled exception filter
@@ -130 +131 @@
                                DWORD es,  DWORD fs,   DWORD gs,  DWORD ss)
 {
-  PWINEXCEPTION_FRAME   pframe, dispatch, nested_frame;
   WINEXCEPTION_RECORD   record;
-  WINEXCEPTION_RECORD   newrec;
   WINEXCEPTION_POINTERS ExceptionInfo;
   WINCONTEXT            context;
@@ -175 +174 @@
   }
 
+  rc = RtlDispatchException(&record, &context);
+
+  // and finally, the unhandled exception filter
+  if(rc == ExceptionContinueSearch && UnhandledExceptionFilter != NULL)
+  {
+    ExceptionInfo.ExceptionRecord = &record;
+    ExceptionInfo.ContextRecord   = &context;
+
+    rc = UnhandledExceptionFilter(&ExceptionInfo);
+  }
+
+  // terminate the process
+  if(rc != ExceptionContinueExecution ||
+     record.ExceptionFlags & EH_NONCONTINUABLE)
+  {
+    dprintf(("KERNEL32: RaiseException terminating process.\n"));
+    DosExit(EXIT_PROCESS, 0);
+  }
+
+  return;
+}
+//******************************************************************************
+//******************************************************************************
+DWORD RtlDispatchException(WINEXCEPTION_RECORD *pRecord, WINCONTEXT *pContext)
+{
+  PWINEXCEPTION_FRAME   pframe, dispatch, nested_frame;
+  int                   rc;
+
   // get chain of exception frames
-  rc     = ExceptionContinueSearch;
+  rc  = ExceptionContinueSearch;
 
   nested_frame = NULL;
@@ -193 +220 @@
             (int)pframe & 3)
         {
-            record.ExceptionFlags |= EH_STACK_INVALID;
+            pRecord->ExceptionFlags |= EH_STACK_INVALID;
             break;
         }
 
-        rc = pframe->Handler(&record,
+        rc = pframe->Handler(pRecord,
                              pframe,
-                             &context,
-                             &dispatch);
+                             pContext,
+                             dispatch);
 
         if (pframe == nested_frame)
@@ -206 +233 @@
             /* no longer nested */
             nested_frame = NULL;
-            record.ExceptionFlags &= ~EH_NESTED_CALL;
+            pRecord->ExceptionFlags &= ~EH_NESTED_CALL;
         }
 
@@ -214 +241 @@
         {
         case ExceptionContinueExecution:
-            if (!(record.ExceptionFlags & EH_NONCONTINUABLE)) return;
-            DosExit(EXIT_PROCESS, 0);
+            if (!(pRecord->ExceptionFlags & EH_NONCONTINUABLE)) return rc;
             break;
         case ExceptionContinueSearch:
@@ -221 +247 @@
         case ExceptionNestedException:
             if (nested_frame < dispatch) nested_frame = dispatch;
-            record.ExceptionFlags |= EH_NESTED_CALL;
+            pRecord->ExceptionFlags |= EH_NESTED_CALL;
             break;
         default:
-            DosExit(EXIT_PROCESS, 0);
             break;
         }
@@ -230 +255 @@
         pframe = pframe->Prev;
   }
-
-  // and finally, the unhandled exception filter
-  if(rc == ExceptionContinueSearch && UnhandledExceptionFilter != NULL)
-  {
-    ExceptionInfo.ExceptionRecord = &record;
-    ExceptionInfo.ContextRecord   = &context;
-
-    rc = UnhandledExceptionFilter(&ExceptionInfo);
-  }
-
-  // terminate the process
-  if(rc != ExceptionContinueExecution)
-  {
-    dprintf(("KERNEL32: RaiseException terminating process.\n"));
-    DosExit(EXIT_PROCESS, 0);
-  }
-
-  return;
-}
-
-
+  return rc;
+}
 /*****************************************************************************
  * Name      : int _Pascal OS2RtlUnwind
@@ -934 +940 @@
                                    PVOID                        p)
 {
-  //  pERegRec->prev_structure = 0;
   dprintfException(pERepRec, pERegRec, pCtxRec, p);
 
@@ -948 +953 @@
   case XCPT_FLOAT_UNDERFLOW:
         dprintf(("KERNEL32: OS2ExceptionHandler: FPU exception, fix and continue\n"));
-        pCtxRec->ctx_env[0] |= 0x1F;
-        pCtxRec->ctx_stack[0].losig = 0;
-        pCtxRec->ctx_stack[0].hisig = 0;
-        pCtxRec->ctx_stack[0].signexp = 0;
-
-        return (XCPT_CONTINUE_EXECUTION);
+        if(fIsOS2Image == FALSE)  //Only for real win32 apps
+        {
+                if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == FALSE) 
+                {
+                        pCtxRec->ctx_env[0] |= 0x1F;
+                        pCtxRec->ctx_stack[0].losig = 0;
+                        pCtxRec->ctx_stack[0].hisig = 0;
+                        pCtxRec->ctx_stack[0].signexp = 0;
+                }
+                return (XCPT_CONTINUE_EXECUTION);
+        }
+        else    return (XCPT_CONTINUE_SEARCH);
 
   case XCPT_PROCESS_TERMINATE:
@@ -1008 +1019 @@
   case XCPT_IN_PAGE_ERROR:
 CrashAndBurn:
+        if(fIsOS2Image == FALSE)  //Only for real win32 apps
+        {
+                if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == TRUE) 
+                {
+                        return (XCPT_CONTINUE_EXECUTION);
+                }
+        }
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
         pCtxRec->ctx_RegEip = (ULONG)KillWin32Process;