Changeset 4229 for trunk/src

Timestamp:

Sep 9, 2000, 10:59:55 AM (25 years ago)

Author:

sandervl

Message:

exception handler changes/fixes (after ExitProcess has been called

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (3 diffs)
• oslibexcept.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.43 2000-09-08 18:07:49 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.44 2000-09-09 08:59:54 sandervl Exp $ */
 
 /* WARNING: Compiling this module with ICC with optimizations turned on   */
@@ -1076 +1076 @@
         dprintfException(pERepRec, pERegRec, pCtxRec, p);
         dprintf(("KERNEL32: OS2ExceptionHandler: FPU exception\n"));
-        if(fIsOS2Image == FALSE)  //Only for real win32 apps
+        if(!fIsOS2Image && !fExitProcess)  //Only for real win32 apps
         {
                 if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == FALSE)
@@ -1181 +1181 @@
         }
 #endif
-        if(fIsOS2Image == FALSE)  //Only for real win32 apps
+        if(!fIsOS2Image && !fExitProcess)  //Only for real win32 apps
         {
                 if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == TRUE)

trunk/src/kernel32/oslibexcept.cpp

@@ -1 @@
-/* $Id: oslibexcept.cpp,v 1.3 2000-09-08 18:07:50 sandervl Exp $ */
+/* $Id: oslibexcept.cpp,v 1.4 2000-09-09 08:59:55 sandervl Exp $ */
 /*
  * Exception handler util. procedures
@@ -182 +182 @@
   case XCPT_UNABLE_TO_GROW_STACK:
   case XCPT_IN_PAGE_ERROR:
+  default:
         SetFS(oldsel);  //restore FS
         return FALSE; //let's not dispatch those for now

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.89 2000-08-18 18:16:34 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.90 2000-09-09 08:59:55 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
 //******************************************************************************
 BOOL      fIsOS2Image = FALSE;  //TRUE  -> Odin32 OS/2 application (not converted!)
-                            //FALSE -> otherwise
+                                //FALSE -> otherwise
+BOOL      fExitProcess = FALSE;
+
 //Process database
 PDB       ProcessPDB = {0};
@@ -400 +402 @@
     dprintf(("KERNEL32:  ExitProcess %d\n", exitcode));
     dprintf(("KERNEL32:  ExitProcess FS = %x\n", GetFS()));
+
+    fExitProcess = TRUE;
 
     SetOS2ExceptionChain(-1);