Changeset 9537 for trunk/src/kernel32/winexepeldr.cpp

Timestamp:

Dec 20, 2002, 12:39:43 PM (23 years ago)

Author:

sandervl

Message:

Don't display message boxes for module load errors. Pass errors back to the PE loader.

File:

• trunk/src/kernel32/winexepeldr.cpp (modified) (7 diffs)

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.20 2002-12-20 10:38:58 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.21 2002-12-20 11:39:41 sandervl Exp $ */
 
 /*
@@ -46 +46 @@
 
 
-extern char szErrorTitle[];
 extern char szErrorModule[];
 
@@ -58 +57 @@
 //   (not other options available at this time)
 //******************************************************************************
-BOOL WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine,
-                                  char *peoptions, 
-                                  ULONG reservedMem, ULONG ulPEOffset,
-                                  BOOL fConsoleApp, BOOL fVioConsole)
+DWORD WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine,
+                                   char *peoptions, 
+                                   ULONG reservedMem, ULONG ulPEOffset,
+                                   BOOL fConsoleApp, BOOL fVioConsole,
+                                   char *pszErrorModule, ULONG cbErrorModule)
 {
  APIRET  rc;
@@ -76 +76 @@
   rc = DosGetInfoBlocks(&ptib, &ppib);
   if(rc) {
-        WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szInteralErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
-        delete WinExe;
-        return FALSE;
+      delete WinExe;
+      return LDRERROR_INTERNAL;
   }
   //Handle special pe cmd line options here (/OPT:[x1=y,x2=z,..])
@@ -123 +122 @@
   if(WinExe->isConsoleApp()) 
   {
-        dprintf(("Console application!\n"));
+      dprintf(("Console application!\n"));
 
-        APIRET rc = iConsoleInit(fVioConsole);                /* initialize console subsystem */
-        if (rc != NO_ERROR)                                  /* check for errors */
-                dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
+      rc = iConsoleInit(fVioConsole);                /* initialize console subsystem */
+      if (rc != NO_ERROR)                                  /* check for errors */
+          dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
   }
 
   OS2SetExceptionHandler(&exceptFrame);
-  if(WinExe->init(reservedMem, ulPEOffset) == FALSE) 
+  rc = WinExe->init(reservedMem, ulPEOffset);
+  if(rc != LDRERROR_SUCCESS)
   {
         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);
+            strncpy(pszErrorModule, szErrorModule, cbErrorModule-1);
+            pszErrorModule[cbErrorModule-1] = 0;
         }
         delete WinExe;
         OS2UnsetExceptionHandler(&exceptFrame);
-        return FALSE;
+        return rc;
   }
   OS2UnsetExceptionHandler(&exceptFrame);
@@ -158 +156 @@
   delete WinExe;
 
-  return TRUE;
+  return LDRERROR_SUCCESS;
 }
 //******************************************************************************
@@ -167 +165 @@
                    Win32PeLdrImage(szFileName, TRUE)
 {
-  dprintf(("Win32PeLdrExe ctor: %s", szFileName));
-  this->fConsoleApp = fConsoleApp;
+    dprintf(("Win32PeLdrExe ctor: %s", szFileName));
+    this->fConsoleApp = fConsoleApp;
 
-  //SvL: set temporary full path here as console init needs it
-  setFullPath(szFileName);
+    //SvL: set temporary full path here as console init needs it
+    setFullPath(szFileName);
 }
 //******************************************************************************