Changeset 2687 for trunk/src

Timestamp:

Feb 8, 2000, 11:29:16 PM (26 years ago)

Author:

sandervl

Message:

Search path for executables when they can't be found in the current directory.

Location:

trunk/src/kernel32

Files:

• oslibdos.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.17 2000-01-27 21:51:17 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.18 2000-02-08 22:29:15 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -377 +377 @@
   case OSLIB_SEARCHENV:
   {
-        if(DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT, path,
-                         name, full_name, length_fullname) != 0) {
+   PCSZ envstring;
+   CHAR szResult[CCHMAXPATH];
+
+        if(DosScanEnv(path, &envstring) != 0) {
                 return 0;
         }
+        if(DosSearchPath(SEARCH_IGNORENETERRS, envstring,
+                         name, szResult, sizeof(szResult)) != 0) {
+                return 0;
+        }
+        strcpy(full_name, szResult);
         return strlen(full_name);
   }

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.29 2000-01-25 20:27:17 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.30 2000-02-08 22:29:16 sandervl Exp $ */
 
 /*
@@ -120 +120 @@
                 if(!strstr(szFileName, ".EXE")) {
                         strcat(szFileName,".EXE");
+                }
+                dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+                if(dllfile == NULL) {
+                        OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", szFileName, szFileName, sizeof(szFileName));
                 }
         }