Changeset 22055 for trunk/src

Timestamp:

Dec 31, 2012, 1:34:36 PM (13 years ago)

Author:

dmik

Message:

kernel32: Use console input/output mode only if handle is attached to a real console.

Previously it would use this mode (which reads/writes directly to the attached VIO window)
for all character devices (e.g. NUL) which was clearly wrong.

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (1 diff)
• console.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (1 diff)
• oslibdos.h (modified) (1 diff)

trunk/src/kernel32/HandleManager.cpp

@@ -1114 +1114 @@
   pHMHandleData->lpHandlerData = NULL;
 
-
-  DWORD type = OSLibDosQueryHType(handle);
+  DWORD type = OSLibDosQueryHType(handle, NULL);
   switch (type & 0x7)
   {

trunk/src/kernel32/console.cpp

@@ -455 +455 @@
                rc));
 
+  ULONG type = 0, attr = 0;
+
+  // Below, to distinguish console from other character devices (e.g. NUL)
+  // we use the undocumented device attr field of DosQueryHType(). For CON
+  // it returns 0x8083 here, for NUL -- 0x8084. We need to distinguish because
+  // we only use the console classes if the handle is a real console.
+
   /***********************************************************************
    * initialize stdin handle                                             *
    ***********************************************************************/
-  hStandardIn = GetStdHandle(STD_INPUT_HANDLE);
-  dwType = GetFileType(hStandardIn);
-  if (dwType == FILE_TYPE_CHAR) {               /* is handle not redirected ? */
+  if (DosQueryHType(0, &type, &attr) == 0 && type == 1 && (attr & 0xF) == 0x03) {
     hStandardIn = HMCreateFile("CONIN$",
                                GENERIC_READ | GENERIC_WRITE,
@@ -475 +480 @@
    * initialize stdout handle                                            *
    ***********************************************************************/
-  hStandardOut = GetStdHandle(STD_OUTPUT_HANDLE);
-  dwType = GetFileType(hStandardOut);
-  if (dwType == FILE_TYPE_CHAR) {               /* is handle redirected ? */
+  if (DosQueryHType(1, &type, &attr) == 0 && type == 1 && (attr & 0xF) == 0x03) {
     hStandardOut = HMCreateFile("CONOUT$",
                                 GENERIC_READ | GENERIC_WRITE,
@@ -492 +495 @@
    * initialize stderr handle                                            *
    ***********************************************************************/
-  hStandardError = GetStdHandle(STD_ERROR_HANDLE);
-  dwType = GetFileType(hStandardError);
-  if (dwType == FILE_TYPE_CHAR) {               /* is handle redirected ? */
+  if (DosQueryHType(2, &type, &attr) == 0 && type == 1 && (attr & 0xF) == 0x03) {
     hStandardError = HMCreateFile("CONOUT$",
                                   GENERIC_READ | GENERIC_WRITE,

trunk/src/kernel32/oslibdos.cpp

@@ -3485 +3485 @@
 //******************************************************************************
 //******************************************************************************
-DWORD OSLibDosQueryHType(ULONG handle)
+DWORD OSLibDosQueryHType(ULONG handle, PULONG pAttr)
 {
     ULONG type, attr;
-    APIRET rc = DosQueryHType(handle, &type, &attr);
+    APIRET rc = DosQueryHType(handle, &type, pAttr ? pAttr : &attr);
     if (rc != NO_ERROR) {
         dprintf(("DosQueryHType error: return code = %u\n", rc));

trunk/src/kernel32/oslibdos.h

@@ -363 +363 @@
 DWORD OSLibDosGetNumPhysDrives();
 
-DWORD OSLibDosQueryHType(ULONG handle);
+DWORD OSLibDosQueryHType(ULONG handle, PULONG pAttr);
 
 #ifdef __cplusplus