Changeset 3005 for trunk/src/kernel32/windllbase.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/windllbase.cpp (modified) (6 diffs)

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.9 2000-02-16 14:22:11 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.10 2000-03-04 19:52:36 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
                  : Win32ImageBase(hinstance),
                    referenced(0), fSkipEntryCalls(FALSE),
-                   fAttachedToProcess(FALSE), fUnloaded(FALSE)
+                   fAttachedToProcess(FALSE), fUnloaded(FALSE), fDynamicLoad(FALSE)
 {
   dllEntryPoint = DllEntryPoint;
@@ -96 +96 @@
 Win32DllBase::~Win32DllBase()
 {
- Win32DllBase *dll = head;
-
   dprintf(("Win32DllBase::~Win32DllBase %s", szModule));
 
@@ -110 +108 @@
   }
   else {
+        Win32DllBase *dll = head;
         while(dll && dll->next != this) {
                 dll = dll->next;
@@ -294 +293 @@
 //******************************************************************************
 //******************************************************************************
-void Win32DllBase::deleteAll()
-{
+void Win32DllBase::deleteAll(BOOL fDynamicLoad)
+{
+ Win32DllBase *dll = Win32DllBase::head, *tmp;
+
 #ifdef DEBUG
   dlllistmutex.enter();
-  Win32DllBase *dll = head;
 
   dprintf(("Win32DllBase::deleteAll: List of loaded dlls:"));
@@ -306 +306 @@
   }
   dlllistmutex.leave();
+  dll = Win32DllBase::head;
 #endif
 
-  while(Win32DllBase::head) {
-        delete Win32DllBase::head;
+  while(dll) {
+        if(fDynamicLoad || !dll->fDynamicLoad) {
+                tmp = dll->next;
+                dll->Release();
+                dll = tmp;
+        }
+        else    dll = dll->next;
   }
 }