Changeset 1720 for trunk/src/peldr

Timestamp:

Nov 13, 1999, 4:41:11 PM (26 years ago)

Author:

sandervl

Message:

better error reporting for pe loader

Location:

trunk/src/peldr

Files:

• makefile (modified) (2 diffs)
• pe.cpp (modified) (5 diffs)

trunk/src/peldr/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 1999-10-26 17:54:42 sandervl Exp $
+# $Id: makefile,v 1.11 1999-11-13 15:40:51 sandervl Exp $
 
 #
@@ -49 +49 @@
 
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
+        $(RM) *.obj *.lib *.dll *.map *.pch *.exe
         $(RM) $(PDWIN32_BIN)\$(TARGET).exe
         $(RM) $(PDWIN32_BIN)\$(TARGETDLL).dll

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.10 1999-10-10 08:58:51 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.11 1999-11-13 15:39:45 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 char szExeErrorMsg[]    = "File isn't an executable";
 char szInteralErrorMsg[]= "Internal Error";
+char szNoKernel32Msg[]  = "Can't load/find kernel32.dll";
 
 char fullpath[CCHMAXPATH];
@@ -77 +78 @@
   rc = DosQueryProcAddr(hmodPMWin, ORD_WIN32MESSAGEBOX, NULL, (PFN *)&MyWinMessageBox);
 
-  rc = DosLoadModule(exeName, sizeof(exeName), "KERNEL32.DLL", &hmodKernel32);
-  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@8", (PFN *)&CreateWin32Exe);
-
   if ((hab = MyWinInitialize(0)) == 0L) /* Initialize PM     */
         goto fail;
@@ -90 +88 @@
   }
 
+  rc = DosLoadModule(exeName, sizeof(exeName), "KERNEL32.DLL", &hmodKernel32);
+  if(rc) {
+        MyWinMessageBox(HWND_DESKTOP, NULL, szNoKernel32Msg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        goto fail;
+  }
+  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@8", (PFN *)&CreateWin32Exe);
+
   strcpy(exeName, argv[1]);
   strupr(exeName);
@@ -96 +101 @@
   }
   if(CreateWin32Exe(exeName, ReserveMem()) == FALSE) {
-        MyWinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szLoadErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
         goto fail;
   }