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

Timestamp:

Sep 13, 2000, 11:11:00 PM (25 years ago)

Author:

sandervl

Message:

heap corruption fix (initcommandline) + handlemanager class for disks

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.48 2000-09-05 20:35:38 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.49 2000-09-13 21:10:56 sandervl Exp $ */
 
 /*
@@ -50 +50 @@
 #include "HandleManager.H"
 #include "HMDevice.h"
+#include "HMDisk.h"
 #include "HMOpen32.h"
 #include "HMEvent.h"
@@ -128 +129 @@
   HMDeviceHandler        *pHMEvent;        /* static instances of subsystems */
   HMDeviceHandler        *pHMFile;
+  HMDeviceHandler        *pHMDisk;
   HMDeviceHandler        *pHMMutex;
   HMDeviceHandler        *pHMSemaphore;
@@ -172 +174 @@
   PHMDEVICE pHMDevice;                     /* iterator over the device table */
 
-  if (pszDeviceName != NULL)
+  if (pszDeviceName != NULL) {
     for (pHMDevice = TabWin32Devices;  /* loop over all devices in the table */
          pHMDevice != NULL;
@@ -181 +183 @@
         return (pHMDevice->pDeviceHandler);    /* OK, we've found our device */
     }
+  }
+  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 */
@@ -359 +374 @@
     HMGlobals.pHMEvent      = new HMDeviceEventClass("\\\\EVENT\\");
     HMGlobals.pHMFile       = new HMDeviceFileClass("\\\\FILE\\");
+    HMGlobals.pHMDisk       = new HMDeviceDiskClass("\\\\DISK\\");
     HMGlobals.pHMMutex      = new HMDeviceMutexClass("\\\\MUTEX\\");
     HMGlobals.pHMSemaphore  = new HMDeviceSemaphoreClass("\\\\SEM\\");
@@ -387 +403 @@
   /* @@@PH we could deallocate the device list here */
 
-  delete HMGlobals.pHMOpen32;
-  delete HMGlobals.pHMEvent;
-  delete HMGlobals.pHMFile;
-  delete HMGlobals.pHMMutex;
-  delete HMGlobals.pHMSemaphore;
-  delete HMGlobals.pHMFileMapping;
-  delete HMGlobals.pHMComm;
+  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);