Changeset 3993 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Aug 11, 2000, 12:56:27 PM (25 years ago)

Author:

sandervl

Message:

Updates for fake system dll headers

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (9 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.51 2000-08-04 21:12:10 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.52 2000-08-11 10:56:19 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
 #include "winimagepeldr.h"
 #include "windllpeldr.h"
+#include "windlllx.h"
 #include <pefile.h>
 #include <unicode.h>
@@ -1218 +1219 @@
  ULONG  ulCurFixup;
  int    Size;
- Win32PeLdrDll *WinDll;
+ Win32DllBase *WinDll;
  Section *section;
 
@@ -1335 +1336 @@
     dprintf((LOG, "************** Import Module %s ", pszCurModule ));
     dprintf((LOG, "**********************************************************************" ));
-    WinDll = (Win32PeLdrDll *)Win32DllBase::findModule(pszCurModule);
+    WinDll = Win32DllBase::findModule(pszCurModule);
 
     if(WinDll == NULL)
@@ -1350 +1351 @@
                 char   szModuleFailure[CCHMAXPATH] = "";
                 ULONG  hInstanceNewDll;
+                Win32LxDll *lxdll;
 
                 char *dot = strchr(modname, '.');
@@ -1363 +1365 @@
                         return(FALSE);
                 }
-                WinDll = (Win32PeLdrDll *)Win32DllBase::findModule(hInstanceNewDll);
-                if(WinDll == NULL) {//shouldn't happen!
+                lxdll = Win32LxDll::findModuleByOS2Handle(hInstanceNewDll);
+                if(lxdll == NULL) {//shouldn't happen!
                         dprintf((LOG, "Just loaded the dll, but can't find it anywhere?!!?"));
                         errorState = ERROR_INTERNAL;
                         return(FALSE);
                 }
-                //Mark this dll as loaded by DosLoadModule
-                WinDll->setLoadLibrary();
-                WinDll->AddRef();
+                lxdll->setDllHandleOS2(hInstanceNewDll);
+                lxdll->AddRef();
+                WinDll = (Win32DllBase*)lxdll;
         }
         else {
-                WinDll = new Win32PeLdrDll(modname, this);
-
-                if(WinDll == NULL) {
-                    dprintf((LOG, "WinDll: Error allocating memory" ));
+         Win32PeLdrDll *pedll;
+
+                pedll = new Win32PeLdrDll(modname, this);
+                if(pedll == NULL) {
+                    dprintf((LOG, "pedll: Error allocating memory" ));
                     WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szMemErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
                     errorState = ERROR_INTERNAL;
@@ -1385 +1388 @@
                 dprintf((LOG, "**********************     Loading Module        *********************" ));
                 dprintf((LOG, "**********************************************************************" ));
-                if(WinDll->init(0) == FALSE) {
-                    dprintf((LOG, "Internal WinDll error ", WinDll->getError() ));
+                if(pedll->init(0) == FALSE) {
+                    dprintf((LOG, "Internal WinDll error ", pedll->getError() ));
                     return(FALSE);
                 }
 #ifdef DEBUG
-                WinDll->AddRef(getModuleName());
+                pedll->AddRef(getModuleName());
 #else
-                WinDll->AddRef();
+                pedll->AddRef();
 #endif
-                if(WinDll->attachProcess() == FALSE) {
+                if(pedll->attachProcess() == FALSE) {
                     dprintf((LOG, "attachProcess failed!" ));
-                    delete WinDll;
+                    delete pedll;
                     errorState = ERROR_INTERNAL;
                     return(FALSE);
                 }
+                WinDll = (Win32DllBase*)pedll;
         }
 
@@ -1407 +1411 @@
     }
     else {
-        if(WinDll->isLxDll() && !WinDll->isLoaded()) {
-                //can happen with i.e. wininet
-                //wininet depends on wsock32; when the app loads wsock32 afterwards
-                //with LoadLibrary or as a child of another dll, we need to make
-                //sure it's loaded once with DosLoadModule
-                WinDll->loadLibrary();
-        }
         WinDll->AddRef();
         
@@ -1419 +1416 @@
     }
     //add the dll we just loaded to dependency list for this image
-    addDependency((Win32DllBase *)WinDll);
+    addDependency(WinDll);
 
     //Make sure the dependency list is correct (already done