Changeset 1192

Timestamp:

Oct 8, 1999, 6:27:48 PM (26 years ago)

Author:

sandervl

Message:

Winspool load bugfix

Location:

trunk/src/kernel32

Files:

• winimagepeldr.cpp (modified) (3 diffs)
• winimgres.cpp (modified) (2 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.4 1999-10-05 23:23:47 phaller Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.5 1999-10-08 16:27:48 sandervl Exp $ */
 
 /*
@@ -1018 +1018 @@
     fout << "**********************************************************************" << endl;
     WinDll = (Win32PeLdrDll *)Win32DllBase::findModule(pszCurModule);
+
     if(WinDll == NULL)
     {  //not found, so load it
@@ -1024 +1025 @@
                 APIRET rc;
                 char   szModuleFailure[CCHMAXPATH] = "";
+                char   szModuleName[CCHMAXPATH];
                 ULONG  hInstanceNewDll;
 
-                rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), pszCurModule, (HMODULE *)&hInstanceNewDll);
+                strcpy(szModuleName, pszCurModule);
+                char *dot = strchr(szModuleName, '.');
+                if(dot) {
+                        *dot = 0;
+                }
+                strcat(szModuleName, ".DLL");
+                rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), szModuleName, (HMODULE *)&hInstanceNewDll);
                 if(rc) {
                         dprintf(("DosLoadModule returned %X for %s\n", rc, szModuleFailure));

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.21 1999-10-06 08:07:41 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.22 1999-10-08 16:27:21 sandervl Exp $ */
 
 /*
@@ -265 +265 @@
   if(pData == NULL) {
         if(HIWORD(id)) {
-                dprintf(("Win32ImageBase::getPEResource: couldn't find resource %s (type %d, lang %d)", id, type, lang));
+                dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %s (type %d, lang %d)", szModule, id, type, lang));
         }
-        else    dprintf(("Win32ImageBase::getPEResource: couldn't find resource %d (type %d, lang %d)", id, type, lang));
+        else    dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %d (type %d, lang %d)", szModule, id, type, lang));
         return 0;
   }