Changeset 22051 for trunk/src

Timestamp:

Dec 29, 2012, 1:31:02 AM (13 years ago)

Author:

dmik

Message:

kernel32: Use file/pipe device classes when standard handles are redirected/piped.

This fixes working with standard handles (stdin/stdout/stderr) broken after r22024.

Location:

trunk/src/kernel32

Files:

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

trunk/src/kernel32/HandleManager.cpp

@@ -68 +68 @@
 
 #include "hmhandle.h"
+#include "oslibdos.h"
 
 #include <vmutex.h>
@@ -657 +658 @@
 #endif
 
-    /* copy standard handles from OS/2's Open32 Subsystem */
+    /* create handle manager instance for Open32 handles */
     HMGlobals.pHMStandard   = new HMDeviceStandardClass("\\\\STANDARD_HANDLE\\");
-    HMSetStdHandle(STD_INPUT_HANDLE,  O32_GetStdHandle(STD_INPUT_HANDLE));
-    HMSetStdHandle(STD_OUTPUT_HANDLE, O32_GetStdHandle(STD_OUTPUT_HANDLE));
-    HMSetStdHandle(STD_ERROR_HANDLE,  O32_GetStdHandle(STD_ERROR_HANDLE));
-
-    /* create handle manager instance for Open32 handles */
     HMGlobals.pHMOpen32     = new HMDeviceOpen32Class("\\\\.\\");
     HMGlobals.pHMEvent      = new HMDeviceEventClass("\\\\EVENT\\");
@@ -679 +675 @@
     HMGlobals.pHMParPort    = new HMDeviceParPortClass("\\\\LPT\\");
     HMGlobals.pHMNul        = new HMDeviceNulClass("\\\\NUL\\");
+
+    HMSetupStdHandle(STD_INPUT_HANDLE);
+    HMSetupStdHandle(STD_OUTPUT_HANDLE);
+    HMSetupStdHandle(STD_ERROR_HANDLE);
   }
   return (NO_ERROR);
@@ -1052 +1052 @@
 
 /*****************************************************************************
- * Name      : HANDLE  _HMSetStdHandle
- * Purpose   : replacement for Open32's SetStdHandle function
+ * Name      : HANDLE  _HMSetupStdHandle
+ * Purpose   : initialization of standard handles
  * Parameters: DWORD  nStdHandle
  *             HANDLE hHandle
@@ -1064 +1064 @@
  *****************************************************************************/
 
-BOOL HMSetStdHandle(DWORD  nStdHandle, HANDLE hHandleOpen32)
+BOOL HMSetupStdHandle(DWORD  nStdHandle)
 {
  PHMHANDLEDATA pHMHandleData;
@@ -1074 +1074 @@
     SetLastError(ERROR_NOT_ENOUGH_MEMORY);      /* use this as error message */
     return 0;
+  }
+
+  ULONG handle;
+
+  switch (nStdHandle)
+  {
+    case STD_INPUT_HANDLE:
+    {
+      handle = 0;
+      HMGlobals.hStandardIn = hHandle;
+      break;
+    }
+    case STD_OUTPUT_HANDLE:
+    {
+      handle = 1;
+      HMGlobals.hStandardOut = hHandle;
+      break;
+    }
+    case STD_ERROR_HANDLE:
+    {
+      handle = 2;
+      HMGlobals.hStandardError = hHandle;
+      break;
+    }
+    default:
+    {
+      SetLastError(ERROR_INVALID_PARAMETER);        /* set error information */
+      return (FALSE);                               /* raise error condition */
+    }
   }
 
@@ -1082 +1111 @@
   pHMHandleData->dwCreation = 0;
   pHMHandleData->dwFlags    = 0;
-  pHMHandleData->dwUserData = nStdHandle;
-  pHMHandleData->hHMHandle  = hHandleOpen32;
+  pHMHandleData->dwUserData = 0;
   pHMHandleData->lpHandlerData = NULL;
 
-  TabWin32Handles[hHandle].pDeviceHandler = HMGlobals.pHMStandard;
-
-  switch (nStdHandle)
-  {
-    case STD_INPUT_HANDLE:  HMGlobals.hStandardIn    = hHandle; return TRUE;
-    case STD_OUTPUT_HANDLE: HMGlobals.hStandardOut   = hHandle; return TRUE;
-    case STD_ERROR_HANDLE:  HMGlobals.hStandardError = hHandle; return TRUE;
-
+
+  DWORD type = OSLibDosQueryHType(handle);
+  switch (type & 0x7)
+  {
+    case 0: /* disk file */
+    {
+      pHMHandleData->hHMHandle = handle;
+      TabWin32Handles[hHandle].pDeviceHandler = HMGlobals.pHMFile;
+      break;
+    }
+    case 1: /* character device */
+    {
+      // Note: we use a simple read/write device by default;
+      // if this is a console application, iConsoleInit() will set up
+      // proper devices with extended functionality
+      pHMHandleData->hHMHandle = O32_GetStdHandle(nStdHandle);
+      TabWin32Handles[hHandle].pDeviceHandler = HMGlobals.pHMStandard;
+      break;
+    }
+    case 2: /* pipe */
+    {
+      pHMHandleData->hHMHandle = handle;
+      TabWin32Handles[hHandle].pDeviceHandler = HMGlobals.pHMNamedPipe;
+      break;
+    }
     default:
     {
-      SetLastError(ERROR_INVALID_PARAMETER);        /* set error information */
+      SetLastError(ERROR_SYS_INTERNAL);             /* set error information */
       return (FALSE);                               /* raise error condition */
     }
   }
-}
-
-/*****************************************************************************
- * Name      : HANDLE  _HMUdptStdHandle
- * Purpose   :
+
+  return TRUE;
+}
+
+/*****************************************************************************
+ * Name      : HANDLE  _HMSetStdHandle
+ * Purpose   : replacement for Open32's SetStdHandle function
  * Parameters: DWORD  nStdHandle
  *             HANDLE hHandle
@@ -1115 +1162 @@
  *****************************************************************************/
 
-BOOL HMUpdtStdHandle(DWORD  nStdHandle, HANDLE hHandle)
+BOOL HMSetStdHandle(DWORD  nStdHandle, HANDLE hHandle)
 {
   switch (nStdHandle)
@@ -1784 +1831 @@
 
   if (!pHMHandle || !pHMHandle->pDeviceHandler)
-      return ERROR_SYS_INTERNAL;
+  {
+    SetLastError(ERROR_SYS_INTERNAL);
+    return (FALSE);
+  }
 
   fResult = pHMHandle->pDeviceHandler->ReadFile(&pHMHandle->hmHandleData,

trunk/src/kernel32/console.cpp

@@ -468 +468 @@
                                CONSOLE_TEXTMODE_BUFFER,
                                0);
-    HMUpdtStdHandle(STD_INPUT_HANDLE,
-                    hStandardIn);
+    HMSetStdHandle(STD_INPUT_HANDLE,
+                   hStandardIn);
   }
 
@@ -485 +485 @@
                                 CONSOLE_TEXTMODE_BUFFER,
                                 0);
-    HMUpdtStdHandle(STD_OUTPUT_HANDLE,
-                    hStandardOut);
+    HMSetStdHandle(STD_OUTPUT_HANDLE,
+                   hStandardOut);
   }
 
@@ -502 +502 @@
                                   CONSOLE_TEXTMODE_BUFFER,
                                   0);
-    HMUpdtStdHandle(STD_ERROR_HANDLE,
-                    hStandardError);
+    HMSetStdHandle(STD_ERROR_HANDLE,
+                   hStandardError);
   }
 

trunk/src/kernel32/oslibdos.cpp

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

trunk/src/kernel32/oslibdos.h

@@ -363 +363 @@
 DWORD OSLibDosGetNumPhysDrives();
 
+DWORD OSLibDosQueryHType(ULONG handle);
+
 #ifdef __cplusplus
 }