Changeset 5075 for trunk/src/kernel32/windlllx.cpp

Timestamp:

Feb 9, 2001, 7:31:06 PM (25 years ago)

Author:

sandervl

Message:

heap (shared+code) changes + lx dll unload workaround

File:

• trunk/src/kernel32/windlllx.cpp (modified) (8 diffs)

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.16 2000-10-05 18:36:49 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.17 2001-02-09 18:31:05 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #include "winexepeldr.h"
 #include <odinlx.h>
+#include <wprocess.h>
 #include "oslibmisc.h"
 
@@ -71 +72 @@
    //once for a dll (to make sure OS/2 doesn't unload the dll when it's
    //still needed)
+//testestest
    rc = DosLoadModule(szErrName, sizeof(szErrName), szFileName, &hInstance);
    if(rc != 0) { 
@@ -76 +78 @@
         return 0;
    }
+//testestest
    windll = new Win32LxDll(hInstance, EntryPoint, pResData, MajorImageVersion,
                            MinorImageVersion, Subsystem);
@@ -125 +128 @@
                 windll->addDependency(windlldep);
         }
+        else    dprintf(("WARNING: Can't find dll %s referenced by %s", modulename, windll->getModuleName()));
         offset += modsize + 1;
    }
@@ -164 +168 @@
                   Win32DllBase(hInstance, EntryPoint)
 {
+  this->MajorImageVersion = MajorImageVersion;
+  this->MinorImageVersion = MinorImageVersion;
+  this->Subsystem         = Subsystem;
+ 
   if(EntryPoint == NULL) {
         fSkipThreadEntryCalls    = TRUE;
@@ -229 +237 @@
 ULONG Win32LxDll::Release()
 { 
- HINSTANCE hinst;
- ULONG     ret;
- APIRET    rc;
- BOOL      fNoUnload = fDisableUnload; //only set for kernel32.dll
+ HINSTANCE     hinst;
+ WIN32DLLENTRY EntryPointTmp        = dllEntryPoint;
+ PVOID         pResDataTmp          = (PVOID)pResRootDir;
+ DWORD         MajorImageVersionTmp = MajorImageVersion;
+ DWORD         MinorImageVersionTmp = MinorImageVersion;
+ DWORD         SubsystemTmp         = Subsystem;
+ ULONG         ret;
+ APIRET        rc;
+ BOOL          fNoUnload = fDisableUnload; //only set for kernel32.dll
+ Win32LxDll   *pModule;
 
   hinst = hinstanceOS2;
@@ -241 +255 @@
         rc = DosFreeModule(hinst);
         if(rc) {
-                dprintf(("Win32LxDll::Release: DosFreeModule %x returned %d", hinst, rc));
+            dprintf(("Win32LxDll::Release: DosFreeModule %x returned %d", hinst, rc));
+            if(rc == ERROR_INVALID_ACCESS && !fExitProcess) {
+                //Dll refused to unload because it has an active exitlist handler
+                //or depends on a dll that registered an exitlist handler
+                //In this case the handle remains valid and the entrypoint of
+                //the dll is NOT called for DLL_PROCESS_DETACH
+                //WORKAROUND: Re-register the dll so future LoadLibrary calls
+                //            don't fail!
+                dprintf(("WORKAROUND: Re-register the dll so future LoadLibrary calls don't fail!"));
+                RegisterLxDll(hinst, EntryPointTmp, pResDataTmp, 
+                              MajorImageVersionTmp, 
+                              MinorImageVersionTmp,
+                              SubsystemTmp);
+
+                /* OS/2 dll, system dll, converted dll or win32k took care of it. */
+                pModule = Win32LxDll::findModuleByOS2Handle(hinst);
+                if(pModule)
+                {
+                        pModule->setDllHandleOS2(hinst);
+                        if(fPeLoader)
+                        {
+                            if(pModule->AddRef() == -1) {//-1 -> load failed (attachProcess)
+                                dprintf(("ERROR Dll refused to be loaded; aborting"));
+                                DebugInt3();
+                                delete pModule;
+                                return 0;
+                            }
+                        }
+                        pModule->incDynamicLib();
+                }
+                else    DebugInt3();
+            }
         }
   }