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

Timestamp:

Oct 27, 1999, 12:35:42 PM (26 years ago)

Author:

sandervl

Message:

Color cursor changes + dll loading fixes

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.8 1999-10-23 12:34:48 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.9 1999-10-27 10:35:42 sandervl Exp $ */
 
 /*
@@ -44 +44 @@
 #include "initterm.h"
 #include <win\virtual.h>
+#include "oslibdos.h"
 
 char szErrorTitle[]     = "Odin";
@@ -67 +68 @@
 //******************************************************************************
 //******************************************************************************
-Win32PeLdrImage::Win32PeLdrImage(char *szFileName, int loadtype) :
+Win32PeLdrImage::Win32PeLdrImage(char *pszFileName, int loadtype) :
     Win32ImageBase(-1),
     nrsections(0), imageSize(0),
@@ -74 +75 @@
     pResSection(NULL), fImgMapping(0)
 {
+ HFILE  dllfile;
+
   loadType = loadtype;
 
-  strcpy(this->szFileName, szFileName);
+  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);
 
   strcpy(szModule, OSLibStripPath(szFileName));