Changeset 1284 for trunk/src

Timestamp:

Oct 14, 1999, 11:58:10 AM (26 years ago)

Author:

sandervl

Message:

Console fixes

Location:

trunk/src/kernel32

Files:

• winexepeldr.cpp (modified) (4 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.2 1999-10-01 10:15:50 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.3 1999-10-14 09:57:34 sandervl Exp $ */
 
 /*
@@ -72 +72 @@
   }
   OS2UnsetExceptionHandler(&exceptFrame);
+  if(WinExe->isConsoleApp()) {
+        dprintf(("Console application!\n"));
+
+        APIRET rc = iConsoleInit();                     /* initialize console subsystem */
+        if (rc != NO_ERROR)                                  /* check for errors */
+                dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
+  }
+
   WinExe->start();
 
@@ -85 +93 @@
                    Win32PeLdrImage(szFileName)
 {
-  fConsoleApp = (oh.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI);
-
   dprintf(("Win32PeLdrExe ctor: %s", szFileName));
-
-  if(fConsoleApp) {
-        dprintf(("Console application!\n"));
-
-        APIRET rc = iConsoleInit();                     /* initialize console subsystem */
-        if (rc != NO_ERROR)                                  /* check for errors */
-                dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
-  }
 }
 //******************************************************************************
@@ -104 +102 @@
 //******************************************************************************
 //******************************************************************************
+BOOL Win32PeLdrExe::init(ULONG reservedMem)
+{
+ BOOL rc;
+
+  rc = Win32PeLdrImage::init(reservedMem);
+  fConsoleApp = (oh.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI);
+  return rc;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.6 1999-10-14 09:21:42 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.7 1999-10-14 09:57:35 sandervl Exp $ */
 
 /*
@@ -168 +168 @@
   fout << "SizeOfHeapCommit  : " << oh.SizeOfHeapCommit << endl;
   fout << "FileAlignment     : " << oh.FileAlignment << endl;
+  fout << "Subsystem         : " << oh.Subsystem << endl;
 
   nSections = NR_SECTIONS(win32file);

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.37 1999-10-14 09:21:43 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.38 1999-10-14 09:57:38 sandervl Exp $ */
 
 /*
@@ -209 +209 @@
    //we don't switch FS selectors
    if(fIsOS2Image) {
-        return;
+        return GetFS();
    }