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

Timestamp:

Jun 15, 2001, 11:42:49 AM (24 years ago)

Author:

bird

Message:

Corrected Pe2Lx bug in LoadLibrary. Added isPe2LxDLL.

File:

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

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.19 2001-05-22 14:25:36 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.20 2001-06-15 09:42:48 bird Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1999-2000 Sander van Leeuwen (sandervl@xs4all.nl)
  *
- * TODO: Unloading of dlls probably needs to be fixed due to OS/2 bug 
+ * TODO: Unloading of dlls probably needs to be fixed due to OS/2 bug
  *       (wrong unload order of dlls)
  *
@@ -18 +18 @@
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
 #define INCL_WIN
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <os2newapi.h>
 #include <stdio.h>
@@ -37 +37 @@
 #include <exe386.h>
 
-#define DBG_LOCALLOG    DBG_windlllx
+#define DBG_LOCALLOG    DBG_windlllx
 #include "dbglocal.h"
 
@@ -44 +44 @@
 //System dlls set EntryPoint to 0
 //Parameters:
-//  HINSTANCE hInstance         - OS/2 module handle
+//  HINSTANCE hInstance     - OS/2 module handle
 //  WIN32DLLENTRY EntryPoint    - Win32 dll entrypoint address
 //  PVOID pResData              - pointer to win32 resource data
@@ -54 +54 @@
 //Returns: Odin32 module handle
 //******************************************************************************
-DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, 
-                             PVOID pResData, 
-                             DWORD MajorImageVersion, 
+DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint,
+                             PVOID pResData,
+                             DWORD MajorImageVersion,
                              DWORD MinorImageVersion,
                              DWORD Subsystem)
-{ 
+{
  APIRET        rc;
  Win32LxDll    *windll;
@@ -66 +66 @@
 
    if(OSLibGetDllName(hInstance, szFileName, sizeof(szFileName)) == FALSE) {
-        dprintf(("ERROR: RegisterLxDll: OSLibGetDllName %x failed!!", hInstance));
-        return 0;
+    dprintf(("ERROR: RegisterLxDll: OSLibGetDllName %x failed!!", hInstance));
+    return 0;
    }
    dprintf(("RegisterLxDll %x %s", hInstance, szFileName));
-   //Make sure DosLoadModule is called at least once for a dll (to make sure 
+   //Make sure DosLoadModule is called at least once for a dll (to make sure
    //OS/2 doesn't unload the dll when it's still needed)
    rc = DosLoadModule(szErrName, sizeof(szErrName), szFileName, &hInstance);
-   if(rc != 0) { 
-        dprintf(("ERROR: RegisterLxDll: DosLoadModule %s failed (rc=%d)!!", szFileName, rc));
-        return 0;
+   if(rc != 0) {
+    dprintf(("ERROR: RegisterLxDll: DosLoadModule %s failed (rc=%d)!!", szFileName, rc));
+    return 0;
    }
 
@@ -81 +81 @@
                            MinorImageVersion, Subsystem);
    if(windll == NULL) {
-        dprintf(("RegisterLxDll: windll == NULL!!!"));
-        return 0;
+    dprintf(("RegisterLxDll: windll == NULL!!!"));
+    return 0;
    }
    if(!fPeLoader) {
-        windll->AddRef();
-
-        if(windll->attachProcess() == 0)
-                return 0;
-
-        return windll->getInstanceHandle();
+    windll->AddRef();
+
+    if(windll->attachProcess() == 0)
+        return 0;
+
+    return windll->getInstanceHandle();
    }
    IMAGE_DOS_HEADER doshdr;
@@ -105 +105 @@
    rc = DosQueryHeaderInfo(hInstance, 0, &doshdr, sizeof(IMAGE_DOS_HEADER), QHINF_READFILE);
    if(rc) {
-        goto hdrerror;
+    goto hdrerror;
    }
    rc = DosQueryHeaderInfo(hInstance, doshdr.e_lfanew, &lxhdr, sizeof(e32_exe), QHINF_READFILE);
    if(rc) {
-        goto hdrerror;
+    goto hdrerror;
    }
    offset = doshdr.e_lfanew + lxhdr.e32_impmod;
    for(i=0;i<lxhdr.e32_impmodcnt;i++) {
-        rc = DosQueryHeaderInfo(hInstance, offset, &modsize, 1, QHINF_READFILE);
-        if(rc) {
-                goto hdrerror;
-        }
-        rc = DosQueryHeaderInfo(hInstance, offset+1, &modulename, min(modsize, sizeof(modulename)), QHINF_READFILE);
-        if(rc) {
-                goto hdrerror;
-        }
-        modulename[modsize] = 0;
-        windlldep = Win32DllBase::findModule(modulename, TRUE);
-        if(windlldep && strcmp(windlldep->getModuleName(), windll->getModuleName())) {
-                dprintf(("RegisterLxDll: Add dependency %s -> %s", windll->getModuleName(), modulename));
-                windll->addDependency(windlldep);
-        }
+    rc = DosQueryHeaderInfo(hInstance, offset, &modsize, 1, QHINF_READFILE);
+    if(rc) {
+        goto hdrerror;
+    }
+    rc = DosQueryHeaderInfo(hInstance, offset+1, &modulename, min(modsize, sizeof(modulename)), QHINF_READFILE);
+    if(rc) {
+        goto hdrerror;
+    }
+    modulename[modsize] = 0;
+    windlldep = Win32DllBase::findModule(modulename, TRUE);
+    if(windlldep && strcmp(windlldep->getModuleName(), windll->getModuleName())) {
+        dprintf(("RegisterLxDll: Add dependency %s -> %s", windll->getModuleName(), modulename));
+        windll->addDependency(windlldep);
+    }
         else    dprintf(("HARMLESS WARNING: Can't find dll %s referenced by %s", modulename, windll->getModuleName()));
-        offset += modsize + 1;
+    offset += modsize + 1;
    }
    return windll->getInstanceHandle();
@@ -146 +146 @@
    //Don't do it either after ExitProcess has been called
    if(!fPeLoader || WinExe == NULL)
-        return TRUE;
+    return TRUE;
 
    windll = Win32DllBase::findModule(hInstance);
    if(!windll) {
-        dprintf(("UnregisterLxDll: Can't find dll with handle %x (already deleted)", hInstance));
-        return TRUE; //already deleted by Win32LxDll::Release
+    dprintf(("UnregisterLxDll: Can't find dll with handle %x (already deleted)", hInstance));
+    return TRUE; //already deleted by Win32LxDll::Release
    }
    dprintf(("UnregisterLxDll %s", windll->getModuleName()));
@@ -162 +162 @@
 Win32LxDll::Win32LxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, PVOID pResData,
                        DWORD MajorImageVersion, DWORD MinorImageVersion,
-                       DWORD Subsystem) 
+                       DWORD Subsystem)
                 : Win32ImageBase(hInstance),
-                  Win32LxImage(hInstance, pResData), 
+                  Win32LxImage(hInstance, pResData),
                   Win32DllBase(hInstance, EntryPoint)
 {
@@ -170 +170 @@
   this->MinorImageVersion = MinorImageVersion;
   this->Subsystem         = Subsystem;
- 
+
   if(EntryPoint == NULL) {
-        fSkipThreadEntryCalls    = TRUE;
-        fAttachedToProcess = TRUE;
+    fSkipThreadEntryCalls    = TRUE;
+    fAttachedToProcess = TRUE;
   }
   hinstanceOS2 = hInstance;
@@ -206 +206 @@
 
   if(!fPeLoader)
-        return ret;
-
-  if(referenced == 1) 
+    return ret;
+
+  if(referenced == 1)
   {
-        item = loadedDlls.Head();
-        while(item) {
-                dll = (Win32DllBase *)loadedDlls.getItem(item);
-                if(dll == NULL) {
-                        dprintf(("ERROR: Win32DllBase::AddRef: dll item == NULL!!"));
-                        DebugInt3();
-                        return -1;
-                }
+    item = loadedDlls.Head();
+    while(item) {
+        dll = (Win32DllBase *)loadedDlls.getItem(item);
+        if(dll == NULL) {
+            dprintf(("ERROR: Win32DllBase::AddRef: dll item == NULL!!"));
+            DebugInt3();
+            return -1;
+        }
 #ifdef DEBUG
-                dll->AddRef(getModuleName());
+        dll->AddRef(getModuleName());
 #else
-                dll->AddRef();
+        dll->AddRef();
 #endif
-                item = loadedDlls.getNext(item);
-        }
-        if(attachProcess() == 0) {
-                dprintf(("WARNING: Dll %s refused to be loaded; aborting", getName()));
-                return -1;
-        }
+        item = loadedDlls.getNext(item);
+    }
+    if(attachProcess() == 0) {
+        dprintf(("WARNING: Dll %s refused to be loaded; aborting", getName()));
+        return -1;
+    }
   }
-  return ret;  
+  return ret;
 }
 //******************************************************************************
 //******************************************************************************
 ULONG Win32LxDll::Release()
-{ 
+{
  HINSTANCE     hinst;
  WIN32DLLENTRY EntryPointTmp        = dllEntryPoint;
@@ -250 +250 @@
   ret = Win32DllBase::Release();
   if(ret == 0 && !fNoUnload) {//only set for kernel32.dll (fDisableUnload)
-        //DosFreeModule sends a termination message to the dll.
+    //DosFreeModule sends a termination message to the dll.
         //The LX dll informs us when it's removed (UnregisterDll call)
-        rc = DosFreeModule(hinst);
-        if(rc) {
+    rc = DosFreeModule(hinst);
+    if(rc) {
             dprintf(("Win32LxDll::Release: DosFreeModule %x returned %d", hinst, rc));
             if(rc == ERROR_INVALID_ACCESS && !fExitProcess) {
@@ -263 +263 @@
                 //            don't fail!
                 dprintf(("WORKAROUND: Re-register the dll so future LoadLibrary calls don't fail!"));
-                RegisterLxDll(hinst, EntryPointTmp, pResDataTmp, 
-                              MajorImageVersionTmp, 
+                RegisterLxDll(hinst, EntryPointTmp, pResDataTmp,
+                              MajorImageVersionTmp,
                               MinorImageVersionTmp,
                               SubsystemTmp);
@@ -286 +286 @@
                 else    DebugInt3();
             }
-        }
+    }
   }
   return(ret);
@@ -292 +292 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32LxDll::isLxDll()
+BOOL Win32LxDll::isPe2LxDll() const
+{
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32LxDll::isLxDll() const
 {
   return TRUE;
@@ -298 +304 @@
 //******************************************************************************
 //******************************************************************************
-void Win32LxDll::setDllHandleOS2(HINSTANCE hInstanceOS2) 
-{ 
+void Win32LxDll::setDllHandleOS2(HINSTANCE hInstanceOS2)
+{
   //Loaded with LoadLibrary(Ex); no need for a 2nd DosLoadModule
   //Dlls that are indirectly loaded (i.e. GDI32->KERNEL32 dependancy) need
   //this additional DosLoadModule (and setDllHandleOS2 isn't called for those)
   if(this->hinstanceOS2) {
-        DosFreeModule(this->hinstanceOS2);
+    DosFreeModule(this->hinstanceOS2);
   }
   this->hinstanceOS2 = hInstanceOS2;
@@ -312 +318 @@
 Win32LxDll *Win32LxDll::findModuleByOS2Handle(HINSTANCE hinstance)
 {
-   dlllistmutex.enter();
-
-   Win32DllBase *mod = Win32DllBase::getFirst();
-   while(mod != NULL) {
-        if(mod->isLxDll()) {
-                Win32LxDll *lxdll = (Win32LxDll *)mod;
-                if(lxdll->hinstanceOS2 == hinstance) {
-                        dlllistmutex.leave();
-                        return(lxdll);
-                }
+    dlllistmutex.enter();
+
+    Win32DllBase *mod = Win32DllBase::getFirst();
+    while (mod != NULL)
+    {
+        if (mod->isLxDll())
+        {
+            Win32LxDll *lxdll = (Win32LxDll *)mod;
+            if (lxdll->hinstanceOS2 == hinstance)
+            {
+                dlllistmutex.leave();
+                return(lxdll);
+            }
         }
-        mod = mod->getNext();
-   }
-   dlllistmutex.leave();
-   return(NULL);
-}
-//******************************************************************************
-//******************************************************************************
+        mod = mod->getNext();
+    }
+    dlllistmutex.leave();
+    return(NULL);
+}
+//******************************************************************************
+//******************************************************************************