Changeset 8921 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Jul 26, 2002, 12:47:59 PM (23 years ago)

Author:

sandervl

Message:

terminate & resume threads that are suspended when ExitProcess is called

File:

• trunk/src/kernel32/wprocess.cpp (modified) (4 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.156 2002-06-26 07:13:00 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.157 2002-07-26 10:47:59 sandervl Exp $ */
 
 /*
@@ -465 +465 @@
 VOID WIN32API ExitProcess(DWORD exitcode)
 {
+    HANDLE hThread = GetCurrentThread();
+    TEB   *teb;
+
     dprintf(("KERNEL32:  ExitProcess %d\n", exitcode));
     dprintf(("KERNEL32:  ExitProcess FS = %x\n", GetFS()));
@@ -473 +476 @@
 
     HMDeviceCommClass::CloseOverlappedIOHandlers();
+
+    //detach all dlls (LIFO order) before really unloading them; this
+    //should take care of circular dependencies (crash while accessing
+    //memory of a dll that has just been freed)
+    dprintf(("********************************************"));
+    dprintf(("**** Detach process from all dlls -- START"));
+    Win32DllBase::detachProcessFromAllDlls();
+    dprintf(("**** Detach process from all dlls -- END"));
+    dprintf(("********************************************"));
 
     if(WinExe) {
@@ -485 +497 @@
     //SvL: We must make sure no threads are still suspended (with SuspendThread)
     //     OS/2 seems to be unable to terminate the process otherwise (exitlist hang)
-    TEB *teb = threadList;
     threadListMutex.enter();
+    teb = threadList;
     while(teb) {
-        ResumeThread(teb->o.odin.hThread);
+        if(teb->o.odin.hThread != hThread && teb->o.odin.dwSuspend > 0) {
+            //kill any threads that are suspended; dangerous, but so is calling
+            //SuspendThread; we assume the app knew what it was doing
+            TerminateThread(teb->o.odin.hThread, 0);
+            ResumeThread(teb->o.odin.hThread);
+        }
         teb = teb->o.odin.next;
     }
     threadListMutex.leave();
-
 
 #ifdef PROFILE