Changeset 1720 for trunk/src/kernel32

Timestamp:

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

Author:

sandervl

Message:

better error reporting for pe loader

Location:

trunk/src/kernel32

Files:

• winexepeldr.cpp (modified) (3 diffs)
• winimagepeldr.cpp (modified) (6 diffs)

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.3 1999-10-14 09:57:34 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.4 1999-11-13 15:41:10 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
 
 #include "cio.h"
+#include "oslibmisc.h"
+
+extern char szErrorTitle[];
+extern char szErrorModule[];
 
 //******************************************************************************
@@ -68 +72 @@
   OS2SetExceptionHandler(&exceptFrame);
   if(WinExe->init(reservedMem) == FALSE) {
+        if(szErrorModule[0] != 0) {
+          char szErrorMsg[128];
+
+                sprintf(szErrorMsg, "Can't execute %s due to bad or missing %s", OSLibStripPath(szFileName), szErrorModule);
+                WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        }
         delete WinExe;
         return FALSE;

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.12 1999-11-11 19:10:09 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.13 1999-11-13 15:41:11 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
 char szExeErrorMsg[]    = "File isn't an executable";
 char szInteralErrorMsg[]= "Internal Error";
+char szErrorModule[128] = "";
 
 #ifndef max
@@ -136 +137 @@
 BOOL Win32PeLdrImage::init(ULONG reservedMem)
 {
- char   szErrorMsg[64];
  LPVOID win32file     = NULL;
  ULONG  filesize, ulRead;
@@ -148 +148 @@
 
   if (fImgMapping == -1) {
-        sprintf(szErrorMsg, "Unable to open %32s\n", szFileName);
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        strcpy(szErrorModule, OSLibStripPath(szFileName));
         goto failure;
   }
@@ -1089 +1088 @@
                 if(rc) {
                         dprintf(("DosLoadModule returned %X for %s\n", rc, szModuleFailure));
+                        sprintf(szErrorModule, "%s.DLL", szModuleFailure);
                         errorState = rc;
                         return(FALSE);
@@ -1113 +1113 @@
                 if(WinDll->init(0) == FALSE) {
                     fout << "Internal WinDll error " << WinDll->getError() << endl;
+                    strcpy(szErrorModule, OSLibStripPath(modname));
                     return(FALSE);
                 }