Changeset 7443 for trunk/src

Timestamp:

Nov 23, 2001, 7:58:24 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (4 diffs)
• hmparport.cpp (modified) (3 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.74 2001-11-08 14:49:26 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.75 2001-11-23 18:58:24 phaller Exp $ */
 
 /*
@@ -49 +49 @@
 
 #include "HandleManager.H"
+#include "handlenames.h"
 #include "HMDevice.h"
 #include "HMDisk.h"
@@ -984 +985 @@
   else
   {
+    // name resolving
+    CHAR szFilename[260];
+    if (TRUE == HandleNamesResolveName((PSZ)lpFileName,
+                            szFilename,
+                            sizeof(szFilename),
+                                       TRUE))
+    {
+      // use the resolved name
+      lpFileName = szFilename;
+    }
+      
+    
     pDeviceHandler = _HMDeviceFind((LPSTR)lpFileName);        /* find device */
     if (NULL == pDeviceHandler)                /* this name is unknown to us */
@@ -1123 +1136 @@
   PHMHANDLEDATA   pHMHandleData;
   DWORD           rc;                                     /* API return code */
-
+  
+  // name resolving
+  CHAR szFilename[260];
+  if (TRUE == HandleNamesResolveName((PSZ)lpFileName,
+                          szFilename,
+                          sizeof(szFilename),
+                                     TRUE))
+  {
+    // use the resolved name
+    lpFileName = szFilename;
+  }
+  
+  
   if(fuMode & OF_REOPEN) {
        pDeviceHandler = _HMDeviceFind((LPSTR)pOFStruct->szPathName);          /* find device */

trunk/src/kernel32/hmparport.cpp

@@ -1 @@
-/* $Id: hmparport.cpp,v 1.6 2001-11-23 16:07:19 phaller Exp $ */
+/* $Id: hmparport.cpp,v 1.7 2001-11-23 18:58:24 phaller Exp $ */
 
 /*
@@ -15 +15 @@
 #include <string.h>
 #include <handlemanager.h>
+#include "handlenames.h"
 #include <heapstring.h>
 #include <winioctl.h>
@@ -150 +151 @@
     HMDeviceRegisterEx("LPT1", this, pData);
   
-  // @@@PH
-  // Note: also register \Device\ParallelPort1...
-  // -> we need the kernel object name space mapping
+  // add symbolic links to the "real name" of the device
+  HandleNamesAddSymbolicLink("\\Device\\ParallelPort1", "LPT1");
+  HandleNamesAddSymbolicLink("\\Device\\ParallelPort2", "LPT2");
+  HandleNamesAddSymbolicLink("\\Device\\ParallelPort3", "LPT3");
 }