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

Timestamp:

Oct 6, 2000, 1:04:02 PM (25 years ago)

Author:

sandervl

Message:

console, pe loader + FormatMessage fixes

File:

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

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.11 2000-10-01 12:05:57 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.12 2000-10-06 11:04:01 sandervl Exp $ */
 
 /*
@@ -47 +47 @@
 //Called by ring 3 pe loader to create win32 executable
 //******************************************************************************
-BOOL WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine, ULONG reservedMem)
+BOOL WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine, 
+                                  ULONG reservedMem, BOOL fConsoleApp)
 {
  APIRET  rc;
@@ -58 +59 @@
   fPeLoader = TRUE;
 
-  WinExe = new Win32PeLdrExe(szFileName);
+  WinExe = new Win32PeLdrExe(szFileName, fConsoleApp);
 
   rc = DosGetInfoBlocks(&ptib, &ppib);
@@ -81 +82 @@
 
   if(getenv("WIN32_IOPL2")) {
-    io_init1();
+        io_init1();
   }
-
-  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;
-  }
-
-  OS2UnsetExceptionHandler(&exceptFrame);
-  if(WinExe->isConsoleApp()) {
+  //Init console before loading executable as dlls might want to print 
+  //something on the console while being loaded
+  if(WinExe->isConsoleApp()) 
+  {
         dprintf(("Console application!\n"));
 
@@ -104 +94 @@
                 dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
   }
+
+  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;
+        OS2UnsetExceptionHandler(&exceptFrame);
+        return FALSE;
+  }
+  OS2UnsetExceptionHandler(&exceptFrame);
 
   WinExe->start();
@@ -113 +118 @@
 //******************************************************************************
 //******************************************************************************
-Win32PeLdrExe::Win32PeLdrExe(char *szFileName) :
+Win32PeLdrExe::Win32PeLdrExe(char *szFileName, BOOL fConsoleApp) :
                    Win32ImageBase(-1),
                    Win32ExeBase(-1),
@@ -119 +124 @@
 {
   dprintf(("Win32PeLdrExe ctor: %s", szFileName));
+  this->fConsoleApp = fConsoleApp;
+
+  //SvL: set temporary full path here as console init needs it
+  setFullPath(szFileName);
 }
 //******************************************************************************
@@ -132 +141 @@
 
   rc = Win32PeLdrImage::init(reservedMem);
-  fConsoleApp = (oh.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI);
   return rc;
 }