Changeset 21626 for trunk/src

Timestamp:

Apr 15, 2011, 9:37:36 PM (14 years ago)

Author:

dmik

Message:

kernel32: To complete the Win32 exception chain unwind support, make sure it is unwound when the thread terminates itself with ExitThread/ExitProcess etc. before removing its exception handlers from stack.

Location:

trunk/src/kernel32

Files:

• initkernel32.cpp (modified) (3 diffs)
• thread.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (1 diff)

trunk/src/kernel32/initkernel32.cpp

@@ -73 +73 @@
 }
 
+// borrowed from ntddk.h
+extern "C"
+void WIN32API RtlUnwind(
+        LPVOID,
+        LPVOID,
+        LPVOID,DWORD);
+
 extern PFN pfnImSetMsgQueueProperty;
 
@@ -275 +282 @@
     dprintf(("kernel32 exit %d\n", ulReason));
 
+    TEB *teb = GetThreadTEB();
+
+    if (teb)
+    {
+        // make sure the Win32 exception stack (if there is still any) is unwound
+        // before we destroy internal structures including the Win32 TEB
+        RtlUnwind(NULL, 0, 0, 0);
+    }
+
     if( IsDBCSEnv() && imHandle )
         DosFreeModule( imHandle );
@@ -288 +304 @@
     OSLibLVMExit();
 
-    TEB *teb = GetThreadTEB();
     if(teb) DestroyTEB(teb);
     DestroySharedHeap();

trunk/src/kernel32/thread.cpp

@@ -52 +52 @@
 #define MQP_INSTANCE_PERMQ              0x00000001 // from os2im.h
 
+// borrowed from ntddk.h
+extern "C"
+void WINAPI RtlUnwind(
+        PEXCEPTION_FRAME,
+        LPVOID,
+        PEXCEPTION_RECORD,DWORD);
+
 //******************************************************************************
 //******************************************************************************
@@ -547 +554 @@
 
     dprintf(("ExitThread %x (%x)", GetCurrentThread(), exitcode));
+
+    // make sure the Win32 exception stack (if there is still any) is unwound
+    // before we destroy internal structures including the Win32 TIB
+    RtlUnwind(NULL, 0, 0, 0);
 
     teb = GetThreadTEB();
@@ -729 +740 @@
     CONTROL87(0x27F, 0xFFF);
     rc = AsmCallThreadHandler(fAlignStack, threadCallback, userdata);
+
+    // make sure the Win32 exception stack (if there is still any) is unwound
+    // before we destroy internal structures including the Win32 TIB
+    RtlUnwind(NULL, 0, 0, 0);
 
     if(fExitProcess) {

trunk/src/kernel32/wprocess.cpp

@@ -550 +550 @@
     dprintf(("KERNEL32:  ExitProcess %d (time %x)", exitcode, GetCurrentTime()));
     dprintf(("KERNEL32:  ExitProcess FS = %x\n", GetFS()));
+
+    // make sure the Win32 exception stack (if there is still any) is unwound
+    // before we destroy internal structures including the Win32 TIB
+    RtlUnwind(NULL, 0, 0, 0);
 
     fExitProcess = TRUE;