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

Timestamp:

Jul 26, 2002, 12:47:33 PM (23 years ago)

Author:

sandervl

Message:

kill thread when it crashes after ExitProcess

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.64 2002-07-05 17:59:30 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.65 2002-07-26 10:47:33 sandervl Exp $ */
 
 /*
@@ -679 +679 @@
     SetExceptionChain((ULONG)-1);
     DosExit(EXIT_PROCESS, 666);
+}
+//*****************************************************************************
+//*****************************************************************************
+void KillWin32Thread(void)
+{
+//    ExitThread(666);
+    //Restore original OS/2 TIB selector
+    RestoreOS2FS();
+
+    SetExceptionChain((ULONG)-1);
+    DosExit(EXIT_THREAD, 666);
 }
 //*****************************************************************************
@@ -1283 +1294 @@
 #ifdef DEBUG
         dprintfException(pERepRec, pERegRec, pCtxRec, p);
-        if(pCtxRec->ContextFlags & CONTEXT_CONTROL) {
+        if(!fExitProcess && (pCtxRec->ContextFlags & CONTEXT_CONTROL)) {
                 dbgPrintStack(pERepRec, pERegRec, pCtxRec, p);
         }
@@ -1290 +1301 @@
         if(!fIsOS2Image && !fExitProcess)  //Only for real win32 apps
         {
-                if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == TRUE)
+            if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == TRUE)
+            {
+                goto continueexecution;
+            }
+        }
+        else {
+            if(fExitProcess) {
+                PPIB   pPIB;
+                PTIB   pTIB;
+                APIRET rc;
+
+                rc = DosGetInfoBlocks (&pTIB, &pPIB);
+                if(rc == NO_ERROR && pTIB->tib_ptib2->tib2_ultid != 1)
                 {
-                        goto continueexecution;
+                    dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill thread"));
+
+                    pCtxRec->ctx_RegEip = (ULONG)KillWin32Thread;
+                    pCtxRec->ctx_RegEsp = pCtxRec->ctx_RegEsp + 0x10;
+                    pCtxRec->ctx_RegEax = pERepRec->ExceptionNum;
+                    pCtxRec->ctx_RegEbx = pCtxRec->ctx_RegEip;
+                    goto continueexecution;
                 }
-        }
-        else    goto continuesearch; //pass on to OS/2 RTL or app exception handler
+            }
+            goto continuesearch; //pass on to OS/2 RTL or app exception handler
+        }
 
         //Log fatal exception here