Changeset 4003 for trunk/src

Timestamp:

Aug 12, 2000, 6:58:40 PM (25 years ago)

Author:

sandervl

Message:

system dll unload bug fixed

Location:

trunk/src/kernel32

Files:

• windlllx.cpp (modified) (3 diffs)
• winimagebase.cpp (modified) (3 diffs)

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.13 2000-08-11 21:45:23 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.14 2000-08-12 16:58:39 sandervl Exp $ */
 
 /*
@@ -228 +228 @@
  ULONG     ret;
  APIRET    rc;
+ BOOL      fNoUnload = fDisableUnload; //only set for kernel32.dll
 
   hinst = hinstanceOS2;
   ret = Win32DllBase::Release();
-  if(ret == 0 && !fDisableUnload) {//only set for kernel32.dll (fDisableUnload)
+  if(ret == 0 && !fNoUnload) {//only set for kernel32.dll (fDisableUnload)
         //DosFreeModule sends a termination message to the dll.
         //The LX dll informs us when it's removed (UnregisterDll call)
@@ -265 +266 @@
    dlllistmutex.enter();
 
-   Win32LxDll *mod = (Win32LxDll*)Win32DllBase::head;
+   Win32DllBase *mod = Win32DllBase::getFirst();
    while(mod != NULL) {
-        if(mod->isLxDll() && mod->hinstanceOS2 == hinstance) {
-                dlllistmutex.leave();
-                return(mod);
+        if(mod->isLxDll()) {
+                Win32LxDll *lxdll = (Win32LxDll *)mod;
+                if(lxdll->hinstanceOS2 == hinstance) {
+                        dlllistmutex.leave();
+                        return(lxdll);
+                }
         }
-        mod = (Win32LxDll*)mod->next;
+        mod = mod->getNext();
    }
    dlllistmutex.leave();

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.24 2000-07-15 09:14:26 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.25 2000-08-12 16:58:40 sandervl Exp $ */
 
 /*
@@ -251 +251 @@
   }
   rc = DosRead(win32handle, pdoshdr, sizeof(IMAGE_DOS_HEADER), &ulRead);
-  if(rc != NO_ERROR) {
+  if(rc != NO_ERROR || ulRead != sizeof(IMAGE_DOS_HEADER)) {
         free(pdoshdr);
         DosClose(win32handle);                /* Close the file */
@@ -273 +273 @@
   }
   rc = DosRead(win32handle, win32file, hdrsize, &ulRead);
-  if(rc != NO_ERROR) {
+  if(rc != NO_ERROR || ulRead != hdrsize) {
         goto failure;
   }