Changeset 5494 for trunk/src/peldr/pe.cpp

Timestamp:

Apr 10, 2001, 7:09:08 PM (24 years ago)

Author:

sandervl

Message:

Print module name that contributed to the failure of loading kernel32.

File:

• trunk/src/peldr/pe.cpp (modified) (4 diffs)

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.26 2001-02-14 12:56:55 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.27 2001-04-10 17:09:08 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 char szExeErrorMsg[]    = "File isn't an executable";
 char szInteralErrorMsg[]= "Internal Error";
-char szNoKernel32Msg[]  = "Can't load/find kernel32.dll (rc=%d)";
+char szNoKernel32Msg[]  = "Can't load/find kernel32.dll (rc=%d, module %s)";
 char szDosInfoBlocks[]  = "DosInfoBlocks failed!";
 
@@ -83 +83 @@
  char   exeName[CCHMAXPATH];
  char   fullpath[CCHMAXPATH];
+ char   errorMod[CCHMAXPATH];
  APIRET  rc;
  HMODULE hmodPMWin = 0, hmodKernel32 = 0;
@@ -194 +195 @@
   }
 
-  rc = DosLoadModule(exeName, sizeof(exeName), "KERNEL32.DLL", &hmodKernel32);
+  errorMod[0] = 0;
+  rc = DosLoadModule(errorMod, sizeof(errorMod), "KERNEL32.DLL", &hmodKernel32);
   if(rc) {
-        sprintf(exeName, szNoKernel32Msg, rc);
-        MyWinMessageBox(HWND_DESKTOP, NULL, exeName, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        sprintf(fullpath, szNoKernel32Msg, rc, errorMod);
+        MyWinMessageBox(HWND_DESKTOP, NULL, fullpath, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
         goto fail;
   }