Changeset 1833 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Nov 24, 1999, 8:33:34 PM (26 years ago)

Author:

sandervl

Message:

exe loader fixes + updates

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (3 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.14 1999-11-22 20:35:52 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.15 1999-11-24 19:31:23 sandervl Exp $ */
 
 /*
@@ -70 +70 @@
 //******************************************************************************
 //******************************************************************************
-Win32PeLdrImage::Win32PeLdrImage(char *pszFileName, int loadtype) :
+Win32PeLdrImage::Win32PeLdrImage(char *pszFileName, BOOL isExe, int loadtype) :
     Win32ImageBase(-1),
     nrsections(0), imageSize(0),
@@ -83 +83 @@
   strcpy(szFileName, pszFileName);
   strupr(szFileName);
-  if(!strchr(szFileName, (int)'.')) {
-        strcat(szFileName,".DLL");
-  }
-  dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-  if(dllfile == NULL) {//search in libpath for dll
-        strcpy(szModule, kernel32Path);
-        strcat(szModule, szFileName);
-        strcpy(szFileName, szModule);
-  }
-  else  OSLibDosClose(dllfile);
-
+  if(isExe) {
+        dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+        if(dllfile == NULL) {
+                if(!strstr(szFileName, ".EXE")) {
+                        strcat(szFileName,".EXE");
+                }
+        }
+        else    OSLibDosClose(dllfile);
+  }
+  else {
+        dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+        if(dllfile == NULL) {//search in libpath for dll
+                strcpy(szModule, kernel32Path);
+                strcat(szModule, szFileName);
+                strcpy(szFileName, szModule);
+
+                dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+                if(dllfile == NULL) {
+                        if(!strstr(szFileName, ".DLL")) {
+                                strcat(szFileName,".DLL");
+                                dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
+                                if(dllfile == NULL) {
+                                        strcpy(szModule, kernel32Path);
+                                        strcat(szModule, szFileName);
+                                        strcpy(szFileName, szModule);
+                                }
+                                else    OSLibDosClose(dllfile);
+                        }
+                }
+                else    OSLibDosClose(dllfile);
+        }
+        else    OSLibDosClose(dllfile);
+  }
   strcpy(szModule, OSLibStripPath(szFileName));
   strupr(szModule);