Changeset 5019

Timestamp:

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

Author:

sandervl

Message:

handle manager class for standard handles added

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (9 diffs)
• KERNEL32.CPP (modified) (5 diffs)
• conout.cpp (modified) (3 diffs)
• dbglocal.cpp (modified) (2 diffs)
• dbglocal.h (modified) (2 diffs)
• hmstd.cpp (added)
• hmstd.h (added)
• makefile (modified) (2 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 */
-    }
   }
 

trunk/src/kernel32/KERNEL32.CPP ¶

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.57 2000-10-26 17:21:38 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.58 2001-01-23 18:31:25 sandervl Exp $ */
 
 /*
@@ -278 +278 @@
  char *astring;
 
-    dprintf(("KERNEL32:  OS2FatalAppExitW\n"));
+    dprintf(("KERNEL32: OS2FatalAppExitW %x", arg1));
     astring = UnicodeToAsciiString((LPWSTR)arg2);
     O32_FatalAppExit(arg1, astring);
@@ -288 +288 @@
 VOID WIN32API FatalExit( UINT arg1)
 {
-    dprintf(("KERNEL32:  OS2FatalExit\n"));
+    dprintf(("KERNEL32: FatalExit %x", arg1));
     O32_FatalExit(arg1);
 }
@@ -302 +302 @@
 BOOL WIN32API IsBadHugeWritePtr( PVOID arg1, UINT  arg2)
 {
-    dprintf(("KERNEL32:  OS2IsBadHugeWritePtr\n"));
+    dprintf(("KERNEL32: IsBadHugeWritePtr\n"));
     return O32_IsBadHugeWritePtr(arg1, arg2);
 }
@@ -309 +309 @@
 BOOL WIN32API IsDBCSLeadByte(BYTE arg1)
 {
-    dprintf2(("KERNEL32:  OS2IsDBCSLeadByte\n"));
+    dprintf2(("KERNEL32:  IsDBCSLeadByte %x", arg1));
     return O32_IsDBCSLeadByte(arg1);
 }

trunk/src/kernel32/conout.cpp ¶

@@ -1 @@
-/* $Id: conout.cpp,v 1.8 2000-10-03 17:28:28 sandervl Exp $ */
+/* $Id: conout.cpp,v 1.9 2001-01-23 18:31:25 sandervl Exp $ */
 
 /*
@@ -243 +243 @@
   if (pHMHandleData->hHMHandle != pConsoleGlobals->hConsoleBuffer)
   {
-#if 0
-    HMDeviceRequest(pConsoleGlobals->hConsoleBuffer,        /* hide the cursor */
-                    DRQ_INTERNAL_CONSOLECURSORSHOW,
-                    CONSOLECURSOR_HIDE,
-                    0,
-                    0,
-                    0);
-#endif
-
     dwResult = HMWriteFile(pConsoleGlobals->hConsoleBuffer,
                            lpBuffer,
@@ -258 +249 @@
                            lpOverlapped);
 
-#if 0
-    HMDeviceRequest(pConsoleGlobals->hConsoleBuffer,        /* show the cursor */
-                    DRQ_INTERNAL_CONSOLECURSORSHOW,
-                    CONSOLECURSOR_SHOW,
-                    0,
-                    0,
-                    0);
-#endif
-
     return (dwResult);                                 /* return result code */
   }
-  else
+  else {
     return (FALSE);                    /* raise error condition */
+  }
 }
 

trunk/src/kernel32/dbglocal.cpp ¶

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.12 2000-10-10 17:14:02 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.13 2001-01-23 18:31:26 sandervl Exp $ */
 
 /*
@@ -121 +121 @@
 "hmnpipe",
 "hmdisk",
-"version"
+"version",
+"hmstd"
 };
 //******************************************************************************

trunk/src/kernel32/dbglocal.h ¶

@@ -1 @@
-/* $Id: dbglocal.h,v 1.12 2000-10-10 17:14:03 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.13 2001-01-23 18:31:26 sandervl Exp $ */
 
 /*
@@ -121 +121 @@
 #define DBG_hmdisk         99
 #define DBG_version        100
-#define DBG_MAXFILES       101
+#define DBG_hmstd          101
+#define DBG_MAXFILES       102
 
 extern USHORT DbgEnabled[DBG_MAXFILES];

trunk/src/kernel32/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.108 2000-12-03 00:33:26 bird Exp $
+# $Id: makefile,v 1.109 2001-01-23 18:31:26 sandervl Exp $
 
 #
@@ -68 +68 @@
 $(OBJDIR)\hmcomm.obj \
 $(OBJDIR)\hmsemaphore.obj \
+$(OBJDIR)\hmstd.obj \
 $(OBJDIR)\wprocess.obj \
 $(OBJDIR)\conprop.obj \