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

Timestamp:

Nov 14, 2000, 3:27:04 PM (25 years ago)

Author:

sandervl

Message:

Handlemanager fix (MN), changes for device name lookup, com bugfix (error check) + com class now called for COMx: names

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.53 2000-10-16 17:56:08 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.54 2000-11-14 14:26:55 sandervl Exp $ */
 
 /*
@@ -177 +177 @@
 {
   PHMDEVICE pHMDevice;                     /* iterator over the device table */
-
-  if (pszDeviceName != NULL) {
+  int namelength = strlen(pszDeviceName);
+
+  if (pszDeviceName != NULL)
+  {
     for (pHMDevice = TabWin32Devices;  /* loop over all devices in the table */
          pHMDevice != NULL;
          pHMDevice = pHMDevice->pNext)
     {
-      if (stricmp(pHMDevice->pszDeviceName,       /* case-insensitive search */
-                  pszDeviceName) == 0)
-        return (pHMDevice->pDeviceHandler);    /* OK, we've found our device */
+        if(pHMDevice->pDeviceHandler->FindDevice(pHMDevice->pszDeviceName, pszDeviceName, namelength) == TRUE)
+        {
+            return pHMDevice->pDeviceHandler;
+        }
     }
   }
-  int namelength = strlen(pszDeviceName);
-
-  //SvL: \\.\x:                 -> drive x (i.e. \\.\C:)
-  //     \\.\PHYSICALDRIVEn     -> drive n (n>=0)
-  if((strncmp(pszDeviceName, "\\\\.\\", 4) == 0) && 
-     namelength == 6 && pszDeviceName[5] == ':') 
-  {
-        return HMGlobals.pHMDisk;
-  }
-  if((strncmp(pszDeviceName, "\\\\.\\PHYSICALDRIVE", 17) == 0) && namelength == 18) {
-        return HMGlobals.pHMDisk;
-  }
-
   return (HMGlobals.pHMOpen32);    /* haven't found anything, return default */
 }
@@ -219 +209 @@
 {
   PHMDEVICE pHMDevice;                     /* iterator over the device table */
+  int namelength = strlen(pszDeviceName);
 
   if (pszDeviceName != NULL)
+  {
     for (pHMDevice = TabWin32Devices;  /* loop over all devices in the table */
          pHMDevice != NULL;
          pHMDevice = pHMDevice->pNext)
     {
-      if (stricmp(pHMDevice->pszDeviceName,       /* case-insensitive search */
-                  pszDeviceName) == 0)
-        return (pHMDevice->pDevData);    /* OK, we've found our device */
+        if(pHMDevice->pDeviceHandler->FindDevice(pHMDevice->pszDeviceName, pszDeviceName, namelength) == TRUE)
+        {
+            return (pHMDevice->pDevData);    /* OK, we've found our device */
+        }
     }
-
+  }
   return (NULL);    /* haven't found anything, return NULL */
 }
@@ -259 +252 @@
                                                        /* free handle found ? */
     if (INVALID_HANDLE_VALUE == TabWin32Handles[ulLoop].hmHandleData.hHMHandle) {
-  TabWin32Handles[ulLoop].hmHandleData.dwUserData     = 0;
-  TabWin32Handles[ulLoop].hmHandleData.dwInternalType = HMTYPE_UNKNOWN;
-  TabWin32Handles[ulLoop].hmHandleData.lpDeviceData   = NULL;
-      handleMutex.leave();
+        TabWin32Handles[ulLoop].hmHandleData.dwUserData     = 0;
+        TabWin32Handles[ulLoop].hmHandleData.dwInternalType = HMTYPE_UNKNOWN;
+        TabWin32Handles[ulLoop].hmHandleData.lpDeviceData   = NULL;
+        handleMutex.leave();
         return (ulLoop);                    /* OK, then return it to the caller */
     }
@@ -389 +382 @@
   if (HMGlobals.fIsInitialized != TRUE)
   {
-    HMGlobals.fIsInitialized = TRUE;                             /* OK, done */
-
     handleMutex.enter();
     // fill handle table
@@ -403 +394 @@
            0,
            sizeof(HMGlobals));
+
+    HMGlobals.fIsInitialized = TRUE;                             /* OK, done */
 
     /* copy standard handles from OS/2's Open32 Subsystem */
@@ -442 +435 @@
   /* @@@PH we could deallocate the device list here */
 
-  if(HMGlobals.pHMOpen32) 
-        delete HMGlobals.pHMOpen32;
-  if(HMGlobals.pHMEvent) 
-        delete HMGlobals.pHMEvent;
-  if(HMGlobals.pHMFile) 
-        delete HMGlobals.pHMFile;
-  if(HMGlobals.pHMMutex) 
-        delete HMGlobals.pHMMutex;
-  if(HMGlobals.pHMSemaphore) 
-        delete HMGlobals.pHMSemaphore;
-  if(HMGlobals.pHMFileMapping) 
-        delete HMGlobals.pHMFileMapping;
-  if(HMGlobals.pHMComm) 
-        delete HMGlobals.pHMComm;
-  if(HMGlobals.pHMToken) 
-        delete HMGlobals.pHMToken;
-  if(HMGlobals.pHMThread) 
-        delete HMGlobals.pHMThread;
-  if(HMGlobals.pHMNamedPipe) 
-        delete HMGlobals.pHMNamedPipe;
-  if(HMGlobals.pHMDisk) 
-        delete HMGlobals.pHMDisk;
+  if(HMGlobals.pHMOpen32)
+    delete HMGlobals.pHMOpen32;
+  if(HMGlobals.pHMEvent)
+    delete HMGlobals.pHMEvent;
+  if(HMGlobals.pHMFile)
+    delete HMGlobals.pHMFile;
+  if(HMGlobals.pHMMutex)
+    delete HMGlobals.pHMMutex;
+  if(HMGlobals.pHMSemaphore)
+    delete HMGlobals.pHMSemaphore;
+  if(HMGlobals.pHMFileMapping)
+    delete HMGlobals.pHMFileMapping;
+  if(HMGlobals.pHMComm)
+    delete HMGlobals.pHMComm;
+  if(HMGlobals.pHMToken)
+    delete HMGlobals.pHMToken;
+  if(HMGlobals.pHMThread)
+    delete HMGlobals.pHMThread;
+  if(HMGlobals.pHMNamedPipe)
+    delete HMGlobals.pHMNamedPipe;
+  if(HMGlobals.pHMDisk)
+    delete HMGlobals.pHMDisk;
 
   return (NO_ERROR);
@@ -1380 +1373 @@
   if((hFile == GetStdHandle(STD_INPUT_HANDLE)) ||
      (hFile == GetStdHandle(STD_OUTPUT_HANDLE)) ||
-     (hFile == GetStdHandle(STD_ERROR_HANDLE))) 
+     (hFile == GetStdHandle(STD_ERROR_HANDLE)))
   {
       return FILE_TYPE_CHAR;