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

Timestamp:

Mar 4, 2000, 8:52:37 PM (25 years ago)

Author:

sandervl

Message:

DosOpen (file handle error) & dll destruction bugfixes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.70 2000-03-03 11:16:00 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.71 2000-03-04 19:52:37 sandervl Exp $ */
 
 /*
@@ -344 +344 @@
 //******************************************************************************
 //******************************************************************************
-static void _System Win32DllExitList(ULONG reason)
-{
-  dprintf(("Win32DllExitList %d\n", reason));
-
-  if(WinExe) {
-    delete(WinExe);
-    WinExe = NULL;
-  }
-  return;
-}
-//******************************************************************************
-//******************************************************************************
 VOID WIN32API ExitProcess(DWORD exitcode)
 {
@@ -363 +351 @@
   SetOS2ExceptionChain(-1);
 
-  Win32DllExitList(0);
-
-  //Note: Needs to be done after Win32DllExitList (destruction of exe + dll objects)
+  if(WinExe) {
+        delete(WinExe);
+        WinExe = NULL;
+  }
+
+  //Note: Needs to be done after deleting WinExe (destruction of exe + dll objects)
   //Flush and delete all open memory mapped files
   Win32MemMap::deleteAll();
@@ -458 +449 @@
             peldrDll->setNoEntryCalls();
         }
+        //Set flag so this dll doesn't get automatically deleted in ExitProcess
+        //(the first time); give application the chance to free it first
+        //If it's not freed, we delete it the 2nd time in ExitProcess
+        peldrDll->SetDynamicallyLoaded();
 
         if(peldrDll->attachProcess() == FALSE) {