Changeset 2786 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

search in path for dlls if not found

Location:

trunk/src/kernel32

Files:

• winimagebase.cpp (modified) (2 diffs)
• winimagepeldr.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);

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.30 2000-02-08 22:29:16 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.31 2000-02-15 00:14:28 sandervl Exp $ */
 
 /*
@@ -150 +150 @@
                                 else    OSLibDosClose(dllfile);
                         }
+                        dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+                        if(dllfile == NULL) {
+                                strcpy(szFileName, pszFileName);
+                                strupr(szFileName);
+                                OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", szFileName, szFileName, sizeof(szFileName));
+                        }
+                        else    OSLibDosClose(dllfile);
                 }
                 else    OSLibDosClose(dllfile);