Changeset 1663 for trunk/src/kernel32/wprocess.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/wprocess.cpp (modified) (5 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.44 1999-11-05 14:06:44 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.45 1999-11-09 14:19:47 sandervl Exp $ */
 
 /*
@@ -311 +311 @@
   }
 
-  hDll = O32_LoadLibrary(lpszLibFile);
+  strcpy(modname, lpszLibFile);
+  strupr(modname);
+  //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
+  Win32DllBase::renameDll(modname);
+
+  hDll = O32_LoadLibrary(modname);
   dprintf(("KERNEL32:  iLoadLibraryA %s returned %X (%d)\n",
            lpszLibFile,
@@ -321 +326 @@
   }
 
-  strcpy(modname, lpszLibFile);
-  strupr(modname);
   if(!strstr(modname, ".")) {
         strcat(modname,".DLL");
@@ -696 +699 @@
 //Retrieve the version
 //******************************************************************************
-BOOL SYSTEM GetVersionStruct(char *modname, char *verstruct, ULONG bufLength)
+BOOL SYSTEM GetVersionStruct(char *lpszModName, char *verstruct, ULONG bufLength)
 {
  Win32ImageBase *winimage;
  Win32PeLdrRsrcImg *rsrcimg;
 
-  dprintf(("GetVersionStruct"));
-  if(WinExe && !stricmp(WinExe->getFullPath(), modname)) {
+  dprintf(("GetVersionStruct of module %s", lpszModName));
+  if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName)) {
         winimage = (Win32ImageBase *)WinExe;
   }
   else {
-        winimage = (Win32ImageBase *)Win32DllBase::findModule(modname);
+        winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
         if(winimage == NULL) 
         {
+         char modname[CCHMAXPATH];
+
+                strcpy(modname, lpszModName);
+                //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
+                Win32DllBase::renameDll(modname);
+                
                 if(Win32ImageBase::isPEImage(modname) == FALSE) 
                 {
@@ -744 +753 @@
 //******************************************************************************
 //******************************************************************************
-ULONG SYSTEM GetVersionSize(char *modname)
+ULONG SYSTEM GetVersionSize(char *lpszModName)
 {
  Win32ImageBase *winimage;
  Win32PeLdrRsrcImg *rsrcimg;
 
-  dprintf(("GetVersionSize of %s\n", modname));
-
-  if(WinExe && !stricmp(WinExe->getFullPath(), modname)) {
+  dprintf(("GetVersionSize of %s\n", lpszModName));
+
+  if(WinExe && !stricmp(WinExe->getFullPath(), lpszModName)) {
         winimage = (Win32ImageBase *)WinExe;
   }
   else {
-        winimage = (Win32ImageBase *)Win32DllBase::findModule(modname);
+        winimage = (Win32ImageBase *)Win32DllBase::findModule(lpszModName);
         if(winimage == NULL) 
         {
+         char modname[CCHMAXPATH];
+
+                strcpy(modname, lpszModName);
+                //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
+                Win32DllBase::renameDll(modname);
+
                 if(Win32ImageBase::isPEImage(modname) == FALSE) 
                 {