Changeset 2786 for trunk/src/kernel32/winimagebase.cpp

Timestamp:

Feb 15, 2000, 1:14:28 AM (26 years ago)

Author:

sandervl

Message:

search in path for dlls if not found

File:

• trunk/src/kernel32/winimagebase.cpp (modified) (2 diffs)

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.6 1999-11-30 19:40:26 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.7 2000-02-15 00:14:27 sandervl Exp $ */
 
 /*
@@ -128 +128 @@
   dllfile = OSLibDosOpen(filename, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
   if(dllfile == NULL) {//search in libpath for dll
-    strcpy(modname, kernel32Path);
-    strcat(modname, filename);
-    strcpy(filename, modname);
+        strcpy(modname, kernel32Path);
+        strcat(modname, filename);
+        dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+        if(dllfile == NULL) {
+                OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", filename, filename, sizeof(filename));
+        }
+        else {
+                strcpy(filename, modname);
+                OSLibDosClose(dllfile);
+        }
   }
   else  OSLibDosClose(dllfile);