Changeset 6015 for trunk/src/kernel32/windllpeldr.cpp

Timestamp:

Jun 15, 2001, 11:42:49 AM (24 years ago)

Author:

bird

Message:

Corrected Pe2Lx bug in LoadLibrary. Added isPe2LxDLL.

File:

• trunk/src/kernel32/windllpeldr.cpp (modified) (7 diffs)

trunk/src/kernel32/windllpeldr.cpp

@@ -1 @@
-/* $Id: windllpeldr.cpp,v 1.8 2000-10-23 13:42:44 sandervl Exp $ */
+/* $Id: windllpeldr.cpp,v 1.9 2001-06-15 09:42:48 bird Exp $ */
 
 /*
@@ -16 +16 @@
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
 #define INCL_WIN
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdio.h>
 #include <string.h>
@@ -31 +31 @@
 #include "oslibdos.h"
 
-#define DBG_LOCALLOG    DBG_windllpeldr
+#define DBG_LOCALLOG    DBG_windllpeldr
 #include "dbglocal.h"
 
@@ -37 +37 @@
 //******************************************************************************
 //******************************************************************************
-Win32PeLdrDll::Win32PeLdrDll(char *szDllName, Win32ImageBase *parentImage) 
-                : Win32ImageBase(-1), 
-                  Win32DllBase(-1, 0, parentImage), 
+Win32PeLdrDll::Win32PeLdrDll(char *szDllName, Win32ImageBase *parentImage)
+                : Win32ImageBase(-1),
+                  Win32DllBase(-1, 0, parentImage),
                   Win32PeLdrImage(szDllName, FALSE)
 {
@@ -63 +63 @@
   strupr(szFileName);
   if(!strchr(szFileName, (int)'.')) {
-        strcat(szFileName, DLL_EXTENSION);
+    strcat(szFileName, DLL_EXTENSION);
   }
   dllfile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
   if(dllfile == NULL) {//search in libpath for dll
-        syspath = getenv("WIN32LIBPATH");
-        if(syspath) {
-                strcpy(modname, syspath);
-                if(modname[strlen(modname)-1] != '\\') {
-                        strcat(modname, "\\");
-                }
-                strcat(modname, szFileName);
-                strcpy(szFileName, modname);
-        }
+    syspath = getenv("WIN32LIBPATH");
+    if(syspath) {
+        strcpy(modname, syspath);
+        if(modname[strlen(modname)-1] != '\\') {
+            strcat(modname, "\\");
+        }
+        strcat(modname, szFileName);
+        strcpy(szFileName, modname);
+    }
   }
-  else  OSLibDosClose(dllfile);
+  else  OSLibDosClose(dllfile);
   fRet = Win32PeLdrImage::init(0);
   dllEntryPoint = (WIN32DLLENTRY)entryPoint;
 
   if(!(fh.Characteristics & IMAGE_FILE_DLL)) {
-        //executable loaded as dll; don't call entrypoint
-        dprintf(("WARNING: Exe %s loaded as dll; entrypoint not called", szFileName));
-        dllEntryPoint = NULL;
+    //executable loaded as dll; don't call entrypoint
+    dprintf(("WARNING: Exe %s loaded as dll; entrypoint not called", szFileName));
+    dllEntryPoint = NULL;
   }
   return fRet;
@@ -90 +90 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32PeLdrDll::isLxDll()
+BOOL Win32PeLdrDll::isPe2LxDll() const
 {
   return FALSE;
@@ -96 +96 @@
 //******************************************************************************
 //******************************************************************************
+BOOL Win32PeLdrDll::isLxDll() const
+{
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************