Changeset 21661 for trunk/src/kernel32/initkernel32.cpp

Timestamp:

Jul 5, 2011, 7:44:49 PM (14 years ago)

Author:

dmik

Message:

kernel32: Do not unwind Win32 exception handlers from DLL_InitTerm() as there is no guarantee that the stack frames are alive.

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;
 
@@ -318 +311 @@
     dprintf(("kernel32 exit %d", 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 );
@@ -340 +324 @@
     OSLibLVMExit();
 
+    // Note: unwinding win32 exceptions before destroying TEB like we do in
+    // ExitThread()/ExitProcess() is impossible here since the stack is already
+    // vanished at this point. In cases where process termination is not coming
+    // from ExitThread()/ExitProcess(), unwinding is to be done by
+    // OS2ExceptionHandler2ndLevel() in responce to the normal unwind procedure.
+
+    TEB *teb = GetThreadTEB();
     if(teb) DestroyTEB(teb);
+
     DestroySharedHeap();
     DestroyCodeHeap();