Changeset 21626 for trunk/src/kernel32/thread.cpp

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.

File:

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

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) {