Changeset 7474 for trunk/src/kernel32/hmdevio.cpp

Timestamp:

Nov 29, 2001, 12:33:37 AM (24 years ago)

Author:

phaller

Message:

Fixes in HandleManager and Device Handlers

File:

• trunk/src/kernel32/hmdevio.cpp (modified) (6 diffs)

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.17 2001-11-26 17:16:24 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.18 2001-11-28 23:33:35 phaller Exp $ */
 
 /*
@@ -30 +30 @@
 #include "map.h"
 #include "exceptutil.h"
+#include "oslibdos.h"
 
 #define DBG_LOCALLOG    DBG_hmdevio
@@ -111 +112 @@
                 {
                     HINSTANCE hDrvDll = LoadLibraryA(szDllName);
-                    if(hDrvDll) {
+                    if(hDrvDll)
+                    {
                         sprintf(szDrvName, "\\\\.\\%s", szKeyName);
                         driver = new HMCustomDriver(hDrvDll, szDrvName);
@@ -117 +119 @@
                         rc = HMDeviceRegister(szDrvName, driver);
                         if (rc != NO_ERROR)                                  /* check for errors */
-                              dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n", szDrvName, rc));
+                          dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n", szDrvName, rc));
+                      
+                        // @@@PH
+                        // there should be an symbolic link:
+                        // "\\.\drvname$" -> "drvname$"
                     }
                 }
@@ -217 +223 @@
         if(rc) {
                 dprintf(("DosSetRelMaxFH returned %d", rc));
-                return rc;
+                return error2WinError(rc);
         }
         dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
@@ -225 +231 @@
   dprintf(("DosOpen %s returned %d\n", szOS2Name, rc));
 
-  if(rc == NO_ERROR) {
-        pHMHandleData->hHMHandle = hfFileHandle;
-        return (NO_ERROR);
-  }
-  else  return(rc);
+  if(rc == NO_ERROR) 
+  {
+    pHMHandleData->hHMHandle = hfFileHandle;
+    return (NO_ERROR);
+  }
+  else  
+    return(error2WinError(rc));
 }
 //******************************************************************************