Changeset 3390 for trunk/src

Timestamp:

Apr 15, 2000, 6:32:35 PM (25 years ago)

Author:

sandervl

Message:

dll search order changes

Location:

trunk/src/kernel32

Files:

• makefile (modified) (2 diffs)
• winimagebase.cpp (modified) (3 diffs)

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.92 2000-03-23 19:23:46 sandervl Exp $
+# $Id: makefile,v 1.93 2000-04-15 16:32:35 sandervl Exp $
 
 #
@@ -23 +23 @@
 #CFLAGS   = $(CFLAGS) -DDEBUG
 #CXXFLAGS = $(CXXFLAGS) /Fa+
-
+#LD2FLAGS = /nologo /DE /noe /map /NOD /dbgpack /packcode /packdata /exepack:2
+#CXXFLAGS = $(CXXFLAGS) /Ti+
 
 # Object files. All objects should be prefixed with $(OBJDIR)!

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.12 2000-04-15 12:43:31 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.13 2000-04-15 16:32:35 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
 #include "oslibdos.h"
 #include "initterm.h"
+#include "directory.h"
 #include <win\virtual.h>
 
@@ -144 +145 @@
         strcat(szFullName,".DLL");
   }
+
   //search order:
-  //1) current dir
-  //2) exe dir
+  //1) exe dir
+  //2) current dir
   //3) windows system dir (kernel32 path)
-  //4) path
-  dllfile = OSLibDosOpen(szFullName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-  if(dllfile == NULL) {//search in libpath for dll
-        strcpy(modname, WinExe->getFullPath());
-        //remove file name from full path
-        imagepath = modname + strlen(modname) - 1;
-        while(*imagepath != '\\') imagepath--;
-        imagepath[1] = 0;
-        strcat(modname, szFileName);
-        dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+  //4) windows dir
+  //5) path
+  strcpy(modname, WinExe->getFullPath());
+  //remove file name from full path
+  imagepath = modname + strlen(modname) - 1;
+  while(*imagepath != '\\') imagepath--;
+  imagepath[1] = 0;
+  strcat(modname, szFullName);
+  dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+  if(dllfile == NULL) {
+        strcpy(modname, szFullName);
+        dllfile = OSLibDosOpen(szFullName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
         if(dllfile == NULL) {
-                strcpy(modname, kernel32Path);
-                strcat(modname, szFileName);
+                strcpy(modname, InternalGetSystemDirectoryA());
+                strcat(modname, "\\");
+                strcat(modname, szFullName);
                 dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
                 if(dllfile == NULL) {
-                        OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", szFullName, szFullName, cchFullFileName);
-                }
-                else {
-                        strcpy(szFullName, modname);
-                        OSLibDosClose(dllfile);
+                        strcpy(modname, InternalGetWindowsDirectoryA());
+                        strcat(modname, "\\");
+                        strcat(modname, szFullName);
+                        dllfile = OSLibDosOpen(modname, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+                        if(dllfile == NULL) {
+                                OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", szFullName, modname, sizeof(modname));
+                        }
                 }
         }
-        else {
-                strcpy(szFullName, modname);
-                OSLibDosClose(dllfile);
-        }
-  }
-  else  OSLibDosClose(dllfile);
+  }
+  strcpy(szFullName, modname);
+  if(dllfile) OSLibDosClose(dllfile);
 }
 //******************************************************************************