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

Timestamp:

Mar 31, 2003, 1:54:29 PM (22 years ago)

Author:

sandervl

Message:

PF: Added vsnprintfW/snprintfW funcs for syncing with latest wine NTDLL + KDO: Made Pe2Lx dlls work again

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.105 2003-02-18 18:58:47 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.106 2003-03-31 11:54:28 sandervl Exp $ */
 
 /*
@@ -186 +186 @@
 
     hFile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-  
+
     dprintf((LOG, "KERNEL32-PELDR: Opening PE-image (%s) returned handle %08xh.\n",
              szFileName,
@@ -198 +198 @@
         }
     }
-  
+
     //default error:
     strcpy(szErrorModule, OSLibStripPath(szFileName));
@@ -702 +702 @@
             return rc;
         }
-      
+
       // PH 2001-11-15
       // For corrupt or misinterpreted PE headers,
@@ -1597 +1597 @@
         char   szModuleFailure[CCHMAXPATH] = "";
         ULONG  hInstanceNewDll;
-        Win32LxDll *lxdll;
 
         char *dot = strchr(modname, '.');
@@ -1610 +1609 @@
             return NULL;
         }
-        lxdll = Win32LxDll::findModuleByOS2Handle(hInstanceNewDll);
-        if(lxdll == NULL) {//shouldn't happen!
+        /* bird 2003-03-30: search pe2lx dlls too! */
+        WinDll = Win32DllBase::findModuleByOS2Handle(hInstanceNewDll);
+        if (WinDll == NULL) {//shouldn't happen!
             dprintf((LOG, "Just loaded the dll, but can't find it anywhere?!!?"));
             errorState = ERROR_INTERNAL;
             return NULL;
         }
-        lxdll->setDllHandleOS2(hInstanceNewDll);
-        if(lxdll->AddRef() == -1) {//-1 -> load failed (attachProcess)
-            dprintf((LOG, "Dll %s refused to be loaded; aborting", modname));
-            delete lxdll;
-            errorState = ERROR_INTERNAL;
-            return NULL;
-        }
-        WinDll = (Win32DllBase*)lxdll;
+        if (WinDll->isLxDll())
+        {
+            Win32LxDll *lxdll = (Win32LxDll *)WinDll;
+            lxdll->setDllHandleOS2(hInstanceNewDll);
+            if(lxdll->AddRef() == -1) {//-1 -> load failed (attachProcess)
+                dprintf((LOG, "Dll %s refused to be loaded; aborting", modname));
+                delete lxdll;
+                errorState = ERROR_INTERNAL;
+                return NULL;
+            }
+            WinDll = (Win32DllBase*)lxdll;
+        }
     }
     else {
@@ -2113 +2117 @@
     //Name exports also contain an ordinal, so check this
     nexport = nameexports;
-    for(int i=0;i<nrNameExports;i++) 
+    for(int i=0;i<nrNameExports;i++)
     {
         if(nexport->ordinal == ordinal) {