Changeset 108 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Jun 15, 1999, 7:57:34 PM (26 years ago)

Author:

phaller

Message:

Fix: LoadLibraryA not skips specified path to DLL image if loading failed on 1st attempt.

File:

• trunk/src/kernel32/wprocess.cpp (modified) (4 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.4 1999-06-10 19:09:05 phaller Exp $ */
+/* $Id: wprocess.cpp,v 1.5 1999-06-15 17:57:34 phaller Exp $ */
 
 /*
@@ -204 +204 @@
 /******************************************************************************/
 /******************************************************************************/
-HINSTANCE WIN32API LoadLibraryA(LPCTSTR lpszLibFile)
+static HINSTANCE iLoadLibraryA(LPCTSTR lpszLibFile)
 {
  HINSTANCE   hDll;
@@ -210 +210 @@
 
   hDll = O32_LoadLibrary(lpszLibFile);
-  dprintf(("KERNEL32:  LoadLibraryA %s returned %X (%d)\n", lpszLibFile, hDll, GetLastError()));
-  if(hDll) {
+  dprintf(("KERNEL32:  iLoadLibraryA %s returned %X (%d)\n",
+           lpszLibFile,
+           hDll,
+           GetLastError()));
+  if(hDll)
+  {
     return hDll;    //converted dll or win32k took care of it
   }
@@ -239 +243 @@
     return module->getInstanceHandle();
   }
-  else  return(0);
-}
+  else
+    return(0);
+}
+
+
+HINSTANCE WIN32API LoadLibraryA(LPCTSTR lpszLibFile)
+{
+  HINSTANCE hDll;
+
+  dprintf(("KERNEL32:  LoadLibraryA(%s)\n",
+           lpszLibFile));
+
+  hDll = iLoadLibraryA(lpszLibFile);
+  if (hDll == 0)
+  {
+    PSZ pszName;
+
+    // remove path from the image name
+    pszName = strrchr((PSZ)lpszLibFile,
+                      '\\');
+    if (pszName != NULL)
+    {
+      pszName++;                // skip backslash
+
+      // now try again without fully qualified path
+      hDll = iLoadLibraryA(pszName);
+    }
+  }
+
+  return hDll;
+}
+
+
 //******************************************************************************
 //******************************************************************************