Changeset 21626 for trunk/src/kernel32/initkernel32.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/initkernel32.cpp (modified) (3 diffs)

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();