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

Timestamp:

Mar 12, 2001, 3:16:33 PM (24 years ago)

Author:

sandervl

Message:

SearchPath & pe loader fixes

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.68 2001-02-25 16:05:39 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.69 2001-03-12 14:16:33 sandervl Exp $ */
 
 /*
@@ -1675 +1675 @@
     if(WinDll == NULL)
     {  //not found, so load it
-        WinDll = loadDll(pszCurModule);
+        if (WinExe != NULL && WinExe->matchModName(pszCurModule)) {
+             WinImage = (Win32ImageBase *)WinExe;
+        }
+        else {
+             WinDll = loadDll(pszCurModule);
+        }
     }
     else {
@@ -1681 +1686 @@
         dprintf((LOG, "Already found ", pszCurModule));
     }
-    if(WinDll == NULL) {
-        //TODO: might not be the right order (check executable first and only then dll??)
-        if (WinExe != NULL && WinExe->matchModName(pszCurModule)) {
-             WinImage = (Win32ImageBase *)WinExe;
-        }
-        else return FALSE;
-    }
-    else {
+    if(WinDll != NULL) {
         //add the dll we just loaded to dependency list for this image
         addDependency(WinDll);