Changeset 7476 for trunk/src/kernel32

Timestamp:

Nov 29, 2001, 1:20:48 AM (24 years ago)

Author:

phaller

Message:

added NUL device

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (5 diffs)
• conout.cpp (modified) (2 diffs)
• console.cpp (modified) (3 diffs)
• dbglocal.cpp (modified) (2 diffs)
• dbglocal.h (modified) (1 diff)
• hmcomm.cpp (modified) (2 diffs)
• hmnul.cpp (added)
• hmnul.h (added)
• hmparport.cpp (modified) (2 diffs)
• kernel32.mak (modified) (2 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.79 2001-11-28 23:33:34 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.80 2001-11-29 00:20:45 phaller Exp $ */
 
 /*
@@ -60 +60 @@
 #include "HMComm.h"
 #include "HMParPort.h"
+#include "HMNul.h"
 #include "HMToken.h"
 #include "HMThread.h"
@@ -148 +149 @@
   HMDeviceHandler        *pHMMailslot;
   HMDeviceHandler        *pHMParPort;              /* parallel communication */
+  HMDeviceHandler        *pHMNul;                              /* nul device */
 
   ULONG         ulHandleLast;                   /* index of last used handle */
@@ -488 +490 @@
     HMGlobals.pHMMailslot   = new HMMailslotClass("\\MAILSLOT\\");
     HMGlobals.pHMParPort    = new HMDeviceParPortClass("\\\\LPT\\");
+    HMGlobals.pHMNul        = new HMDeviceNulClass("\\\\NUL\\");
   }
   return (NO_ERROR);
@@ -537 +540 @@
   if(HMGlobals.pHMParPort)
     delete HMGlobals.pHMParPort;
+  if(HMGlobals.pHMNul)
+    delete HMGlobals.pHMNul;
 
   return (NO_ERROR);

trunk/src/kernel32/conout.cpp

@@ -1 @@
-/* $Id: conout.cpp,v 1.11 2001-11-26 14:53:59 sandervl Exp $ */
+/* $Id: conout.cpp,v 1.12 2001-11-29 00:20:46 phaller Exp $ */
 
 /*
@@ -100 +100 @@
                                            PHMHANDLEDATA pHMHandleDataTemplate)
 {
-  APIRET rc;
   BOOL   fResult;
   HANDLE hConsole;

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.28 2001-10-01 01:47:01 bird Exp $ */
+/* $Id: console.cpp,v 1.29 2001-11-29 00:20:46 phaller Exp $ */
 
 /*
@@ -74 +74 @@
 #include "conwin.h"          // Windows Header for console only
 #include "HandleManager.h"
+#include "handlenames.h"
 #include "HMDevice.h"
 
@@ -415 +416 @@
       dprintf(("KERNEL32:ConsoleDevicesRegister: registering CONOUT$ failed with %u.\n",
                rc));
-
+  
+  // add standard symbolic links
+  HandleNamesAddSymbolicLink("CON",        "CONOUT$");
+  HandleNamesAddSymbolicLink("CON:",       "CONOUT$");
+  HandleNamesAddSymbolicLink("\\\\.\\CON", "CONOUT$");
+  
   if(flVioConsole == TRUE)
   {

trunk/src/kernel32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.17 2001-11-13 13:19:15 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.18 2001-11-29 00:20:47 phaller Exp $ */
 
 /*
@@ -125 +125 @@
 "mailslot",
 "hmmailslot",
-"hmparport"
+"hmparport",
+"hmnul"
 };
 //******************************************************************************

trunk/src/kernel32/dbglocal.h

@@ -123 +123 @@
 #define DBG_hmmailslot     103
 #define DBG_hmparport      104
-#define DBG_MAXFILES       105
+#define DBG_hmnul          105
+#define DBG_MAXFILES       106
 
 extern USHORT DbgEnabledKERNEL32[DBG_MAXFILES];

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.19 2001-11-28 23:52:50 phaller Exp $ */
+/* $Id: hmcomm.cpp,v 1.20 2001-11-29 00:20:47 phaller Exp $ */
 
 /*
@@ -97 +97 @@
     // @@@PH what's the long device name: SerialPortx ?
     // HandleNamesAddSymbolicLink("\\Device\\ParallelPort3", "COM3");
+    // Note: \\.\COMx: is invalid (NT4SP6)
     
     PSZ pszCOM = strdup("\\\\.\\COMx");
-    PSZ pszCOM2 = strdup("\\\\.\\COMx:");
     for (char ch = '1'; ch <= '9'; ch++)
     {
       pszCOM[7] = ch;
-      pszCOM2[7] = ch;
       HandleNamesAddSymbolicLink(pszCOM, pszCOM+4);
-      HandleNamesAddSymbolicLink(pszCOM2, pszCOM+4);
     }
     free(pszCOM);
-    free(pszCOM2);
+  
+    // add "AUX" device
+    HandleNamesAddSymbolicLink("AUX",        "COM1");
+    HandleNamesAddSymbolicLink("AUX:",       "COM1");
+    HandleNamesAddSymbolicLink("\\\\.\\AUX", "COM1");
   }
 }

trunk/src/kernel32/hmparport.cpp

@@ -1 @@
-/* $Id: hmparport.cpp,v 1.10 2001-11-28 23:52:50 phaller Exp $ */
+/* $Id: hmparport.cpp,v 1.11 2001-11-29 00:20:48 phaller Exp $ */
 
 /*
@@ -153 +153 @@
   // add symbolic links to the "real name" of the device
   {
+    // Note: \\.\LPTx: is invalid (NT4SP6)
     PSZ pszLPT  = strdup("\\\\.\\LPTx");
-    PSZ pszLPT2 = strdup("\\\\.\\LPTx:");
-    PSZ pszLPT3 = strdup("\\Device\\ParallelPort1");
+    PSZ pszLPT2 = strdup("\\Device\\ParallelPort1");
     for (char ch = '1'; ch <= '3'; ch++)
     {
       pszLPT[7] = ch;
-      pszLPT2[7] = ch;
-      pszLPT3[20] = ch;
+      pszLPT2[20] = ch;
       HandleNamesAddSymbolicLink(pszLPT, pszLPT+4);
       HandleNamesAddSymbolicLink(pszLPT2, pszLPT+4);
-      HandleNamesAddSymbolicLink(pszLPT3, pszLPT+4);
     }
     free(pszLPT);
     free(pszLPT2);
-    free(pszLPT3);
+    
+    // add "PRN" device
+    HandleNamesAddSymbolicLink("PRN",        "LPT1");
+    HandleNamesAddSymbolicLink("PRN:",       "LPT1");
+    HandleNamesAddSymbolicLink("\\\\.\\PRN", "LPT1");
   }
 }

trunk/src/kernel32/kernel32.mak

@@ -1 @@
-# $Id: kernel32.mak,v 1.17 2001-11-23 18:07:37 phaller Exp $
+# $Id: kernel32.mak,v 1.18 2001-11-29 00:20:48 phaller Exp $
 
 #
@@ -76 +76 @@
 $(OBJDIR)\hmcomm.obj \
 $(OBJDIR)\hmparport.obj \
+$(OBJDIR)\hmnul.obj \
 $(OBJDIR)\hmsemaphore.obj \
 $(OBJDIR)\hmstd.obj \