Changeset 5019 for trunk/src/kernel32/HandleManager.cpp

Timestamp:

Jan 23, 2001, 7:31:26 PM (25 years ago)

Author:

sandervl

Message:

handle manager class for standard handles added

File:

• trunk/src/kernel32/HandleManager.cpp (modified) (9 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.61 2001-01-23 11:59:44 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.62 2001-01-23 18:31:25 sandervl Exp $ */
 
 /*
@@ -61 +61 @@
 #include "HMThread.h"
 #include "HMNPipe.h"
+#include "HMStd.h"
 #include <vmutex.h>
 #include <win\thread.h>
@@ -129 +130 @@
                                          /* this MUST !!! be false initially */
 
-  HMDeviceHandler        *pHMOpen32;      /* default handle manager instance */
+  HMDeviceHandler        *pHMStandard;     /* default handle manager instance */
+  HMDeviceHandler        *pHMOpen32;       /* default handle manager instance */
   HMDeviceHandler        *pHMEvent;        /* static instances of subsystems */
   HMDeviceHandler        *pHMFile;
@@ -253 +255 @@
                                                        /* free handle found ? */
     if (INVALID_HANDLE_VALUE == TabWin32Handles[ulLoop].hmHandleData.hHMHandle) {
-        //SvL: Mark handle as taken here. Doing it outside of this function
+        //SvL: Mark handle as allocated here. Doing it outside of this function
         //     isn't thread safe. (and not very smart)
         TabWin32Handles[ulLoop].hmHandleData.hHMHandle      = ulLoop; 
@@ -403 +405 @@
 
     /* copy standard handles from OS/2's Open32 Subsystem */
+    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 */
+    /* create handle manager instance for Open32 handles */
     HMGlobals.pHMOpen32     = new HMDeviceOpen32Class("\\\\.\\");
     HMGlobals.pHMEvent      = new HMDeviceEventClass("\\\\EVENT\\");
@@ -462 +465 @@
   if(HMGlobals.pHMDisk)
     delete HMGlobals.pHMDisk;
+  if(HMGlobals.pHMStandard);
+    delete HMGlobals.pHMStandard;
 
   return (NO_ERROR);
@@ -707 +712 @@
  *****************************************************************************/
 
-HANDLE  HMGetStdHandle(DWORD nStdHandle)
+HANDLE HMGetStdHandle(DWORD nStdHandle)
 {
   switch (nStdHandle)
@@ -737 +742 @@
  *****************************************************************************/
 
-BOOL    HMSetStdHandle(DWORD  nStdHandle,
-                               HANDLE hHandle)
-{
+BOOL HMSetStdHandle(DWORD  nStdHandle, HANDLE hHandleOpen32)
+{
+ PHMHANDLEDATA pHMHandleData;
+ HANDLE        hHandle;
+
+  hHandle = _HMHandleGetFree();              /* get free handle */
+  if (hHandle == -1)                         /* oops, no free handles ! */
+  {
+    SetLastError(ERROR_NOT_ENOUGH_MEMORY);      /* use this as error message */
+    return 0;
+  }
+
+  /* initialize the complete HMHANDLEDATA structure */
+  pHMHandleData = &TabWin32Handles[hHandle].hmHandleData;
+  pHMHandleData->dwType     = FILE_TYPE_CHAR;
+  pHMHandleData->dwAccess   = 0;
+  pHMHandleData->dwShare    = 0;
+  pHMHandleData->dwCreation = 0;
+  pHMHandleData->dwFlags    = 0;
+  pHMHandleData->dwUserData = nStdHandle;
+  pHMHandleData->hHMHandle  = hHandleOpen32;
+  pHMHandleData->lpHandlerData = NULL;
+
+  TabWin32Handles[hHandle].pDeviceHandler = HMGlobals.pHMStandard;
+
   switch (nStdHandle)
   {
@@ -1377 +1404 @@
   if (-1 == iIndex)                                               /* error ? */
   {
-    //Must return FILE_TYPE_CHAR here; (used to fail index check)
-    //---------->>> ASSUMES that _HMHandleQuery failes!!!!!!!!!!!!!!!!
-    if((hFile == GetStdHandle(STD_INPUT_HANDLE)) ||
-       (hFile == GetStdHandle(STD_OUTPUT_HANDLE)) ||
-       (hFile == GetStdHandle(STD_ERROR_HANDLE)))
-    {
-        return FILE_TYPE_CHAR;
-    }
-    else
-    {
       SetLastError(ERROR_INVALID_HANDLE);     /* set win32 error information */
       return FILE_TYPE_UNKNOWN;                            /* signal failure */
-    }
   }