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

Timestamp:

Nov 9, 1999, 3:19:47 PM (26 years ago)

Author:

sandervl

Message:

heapstring fixes + dll renaming support added

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.10 1999-11-03 20:18:22 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.11 1999-11-09 14:19:47 sandervl Exp $ */
 
 /*
@@ -1060 +1060 @@
     if(WinDll == NULL)
     {  //not found, so load it
-        if(isPEImage(pszCurModule) == FALSE)
+        char modname[CCHMAXPATH];
+        
+        strcpy(modname, pszCurModule);
+        //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
+        Win32DllBase::renameDll(modname);
+
+        if(isPEImage(modname) == FALSE)
         {//LX image, so let OS/2 do all the work for us
                 APIRET rc;
                 char   szModuleFailure[CCHMAXPATH] = "";
-                char   szModuleName[CCHMAXPATH];
                 ULONG  hInstanceNewDll;
 
-                strcpy(szModuleName, pszCurModule);
-                char *dot = strchr(szModuleName, '.');
+                char *dot = strchr(modname, '.');
                 if(dot) {
                         *dot = 0;
                 }
-                strcat(szModuleName, ".DLL");
-                rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), szModuleName, (HMODULE *)&hInstanceNewDll);
+                strcat(modname, ".DLL");
+                rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), modname, (HMODULE *)&hInstanceNewDll);
                 if(rc) {
                         dprintf(("DosLoadModule returned %X for %s\n", rc, szModuleFailure));
@@ -1087 +1091 @@
         }
         else {
-                WinDll = new Win32PeLdrDll(pszCurModule, this);
+                WinDll = new Win32PeLdrDll(modname, this);
 
                 if(WinDll == NULL) {