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

Timestamp:

Feb 29, 2000, 8:17:13 PM (25 years ago)

Author:

sandervl

Message:

win32killprocess change

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.35 2000-02-29 00:54:22 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.36 2000-02-29 19:17:13 sandervl Exp $ */
 
 /*
@@ -520 +520 @@
 void KillWin32Process(void)
 {
-
-  ExitProcess(666);
+ static BOOL fEntry = FALSE;
+
+  if(fEntry == FALSE) {
+        fEntry = TRUE;
+        ExitProcess(666);
+        return;
+  }
+  //Restore original OS/2 TIB selector
+  RestoreOS2FS();
+
+  SetExceptionChain((ULONG)-1);
+  DosExit(EXIT_PROCESS, 666);
 }
 
@@ -1007 +1017 @@
 continueFail:
 
+////#define DEBUGSTACK
+#ifdef DEBUGSTACK
+  if(pCtxRec->ContextFlags & CONTEXT_CONTROL) {
+        ULONG *stackptr;
+        APIRET rc;
+        int    i;
+        ULONG  ulOffset, ulModule, ulObject;
+        CHAR   szModule[CCHMAXPATH];
+
+        stackptr = (ULONG *)pCtxRec->ctx_RegEsp;
+        dprintf(("Stack DUMP:"));
+        for(i=0;i<16;i++) {
+                rc = DosQueryModFromEIP(&ulModule,
+                                        &ulObject,
+                                        sizeof(szModule),
+                                        szModule,
+                                        &ulOffset,
+                                        (ULONG)*stackptr);
+
+                if (rc == NO_ERROR)
+                        dprintf(("0x%8x: 0x%8x %s (#%u), obj #%u:%08x", stackptr, *stackptr, szModule, ulModule, ulObject, ulOffset));
+                else    dprintf(("0x%8x: 0x%8x", stackptr, *stackptr));
+                stackptr++;
+        }
+        dprintf(("Stack DUMP END"));
+  }
+#endif
+
   case XCPT_BREAKPOINT:
   case XCPT_ARRAY_BOUNDS_EXCEEDED: