Changeset 22053 for trunk/src/kernel32/winexelx.cpp

Timestamp:

Dec 30, 2012, 1:21:31 AM (13 years ago)

Author:

dmik

Message:

kernel32: Initialize console input/output mode for VIO (WINDOWCOMPAT) applications.

This matches the console applications in Windows terms.

File:

• trunk/src/kernel32/winexelx.cpp (modified) (3 diffs)

trunk/src/kernel32/winexelx.cpp

@@ -14 +14 @@
 #define INCL_DOSPROCESS          /* DOS Process values       */
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
+#define INCL_DOSMODULEMGR
+#define INCL_DOSSESMGR
 #define INCL_WIN
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
@@ -33 +35 @@
 #include "exceptions.h"
 #include "exceptutil.h"
+
+#include "console.h"
 
 #define DBG_LOCALLOG    DBG_winexelx
@@ -91 +95 @@
   dprintf(("Win32LxExe ctor: %s", szModule));
   hinstance = (HINSTANCE)buildHeader(1, 0, IMAGE_SUBSYSTEM_WINDOWS_GUI);
+
+  PPIB ppib;
+  if (DosGetInfoBlocks(NULL, &ppib) == 0)
+  {
+    char buf[CCHMAXPATH];
+    if (DosQueryModuleName(ppib->pib_hmte, sizeof(buf), buf) == 0)
+    {
+      ULONG Flags;
+      if (DosQueryAppType(buf, &Flags) == 0)
+      {
+        dprintf(("Win32LxExe ctor: app type %x", Flags));
+        if ((Flags & 0x2) == FAPPTYP_WINDOWCOMPAT)
+          iConsoleInit(TRUE);
+      }
+    }
+  }
 }
 //******************************************************************************