Changeset 9298 for trunk/src/kernel32/hmdisk.cpp

Timestamp:

Sep 26, 2002, 6:06:07 PM (23 years ago)

Author:

sandervl

Message:

lots of fixes/changes for physical disk & volume access

File:

• trunk/src/kernel32/hmdisk.cpp (modified) (13 diffs)

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.52 2002-08-09 13:17:22 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.53 2002-09-26 16:06:06 sandervl Exp $ */
 
 /*
@@ -52 +52 @@
     HFILE     hTemplate;
     BOOL      fPhysicalDisk;
+    DWORD     dwPhysicalDiskNr;
     BOOL      fCDPlaying;
     BOOL      fShareViolation;
@@ -134 +135 @@
     VOLUME_DISK_EXTENTS volext = {0};
     BOOL                fPhysicalDisk = FALSE;
+    DWORD               dwPhysicalDiskNr = 0;
 
     dprintf2(("KERNEL32: HMDeviceDiskClass::CreateFile %s(%s,%08x,%08x,%08x)\n",
@@ -174 +176 @@
                 
                 //Note: this only works on Warp 4.5 and up
-                sprintf(szDiskName, "\\\\.\\Physical_Disk%d", volext.Extents[0].DiskNumber); 
-                fPhysicalDisk = TRUE;
+                sprintf(szDiskName, "\\\\.\\Physical_Disk%d", volext.Extents[0].DiskNumber+1); 
+                fPhysicalDisk    = TRUE;
+                dwPhysicalDiskNr = volext.Extents[0].DiskNumber + 1;
 
                 if(fLVMVolume && (pHMHandleData->dwAccess & GENERIC_WRITE)) {
@@ -199 +202 @@
     {
         //Note: this only works on Warp 4.5 and up
-        sprintf(szDiskName, "\\\\.\\Physical_Disk%c", lpFileName[17]);
-        fPhysicalDisk = TRUE;
+        sprintf(szDiskName, "\\\\.\\Physical_Disk%c", lpFileName[17]+1);
+        fPhysicalDisk    = TRUE;
+        dwPhysicalDiskNr = (DWORD)(lpFileName[17] - '0')+1;
 
         //TODO: could be removable in theory
@@ -285 +289 @@
         //save volume start & length if volume must be accessed through the physical disk 
         //(no other choice for unmounted volumes)
-        drvInfo->fPhysicalDisk  = fPhysicalDisk;
-        drvInfo->StartingOffset = volext.Extents[0].StartingOffset;
-        drvInfo->PartitionSize  = volext.Extents[0].ExtentLength;
+        drvInfo->fPhysicalDisk    = fPhysicalDisk;
+        drvInfo->dwPhysicalDiskNr = dwPhysicalDiskNr;
+        drvInfo->StartingOffset   = volext.Extents[0].StartingOffset;
+        drvInfo->PartitionSize    = volext.Extents[0].ExtentLength;
 
         //save volume name for later (IOCtls)
@@ -891 +896 @@
         }
 
-        if(OSLibDosGetDiskGeometry(pHMHandleData->hHMHandle, drvInfo->driveLetter, pGeom) == FALSE) {
-            dprintf(("!ERROR!: IOCTL_DISK_GET_DRIVE_GEOMETRY: OSLibDosGetDiskGeometry failed!!"));
-            return FALSE;
+        if(drvInfo->fPhysicalDisk) {
+            if(OSLibLVMGetDiskGeometry(drvInfo->dwPhysicalDiskNr, pGeom) == FALSE) {
+                dprintf(("!ERROR!: IOCTL_DISK_GET_DRIVE_GEOMETRY: OSLibDosGetDiskGeometry failed!!"));
+                return FALSE;
+            }
+        }
+        else {
+            if(OSLibDosGetDiskGeometry(pHMHandleData->hHMHandle, drvInfo->driveLetter, pGeom) == FALSE) {
+                dprintf(("!ERROR!: IOCTL_DISK_GET_DRIVE_GEOMETRY: OSLibDosGetDiskGeometry failed!!"));
+                return FALSE;
+            }
         }
         dprintf(("Cylinders         %d", pGeom->Cylinders));
@@ -1649 +1662 @@
     DWORD        offset, bytesread;
     BOOL         bRC;
+    DRIVE_INFO *drvInfo = (DRIVE_INFO*)pHMHandleData->dwUserData;
 
     dprintf2(("KERNEL32: HMDeviceDiskClass::ReadFile %s(%08x,%08x,%08x,%08x,%08x)",
@@ -1671 +1685 @@
     //If we didn't get an OS/2 handle for the disk before, get one now
     if(!pHMHandleData->hHMHandle) {
-        DRIVE_INFO *drvInfo = (DRIVE_INFO*)pHMHandleData->dwUserData;
         pHMHandleData->hHMHandle = OpenDisk(drvInfo);
         if(!pHMHandleData->hHMHandle) {
@@ -1700 +1713 @@
     else  lpRealBuf = (LPVOID)lpBuffer;
 
+    //if unmounted volume, check upper boundary as we're accessing the entire physical drive
+    //instead of just the volume
+    if(drvInfo->fPhysicalDisk && (drvInfo->StartingOffset.HighPart != 0 ||
+       drvInfo->StartingOffset.LowPart != 0))
+    {
+        LARGE_INTEGER distance, result, endpos;
+
+        //calculate end position in partition
+        Add64(&drvInfo->StartingOffset, &drvInfo->PartitionSize, &endpos);
+
+        distance.HighPart = 0;
+        distance.LowPart  = nNumberOfBytesToRead;
+        Add64(&distance, &drvInfo->CurrentFilePointer, &result);
+
+        //check upper boundary
+        if(result.HighPart > endpos.HighPart ||
+           (result.HighPart == endpos.HighPart && result.LowPart > endpos.LowPart) )
+        {
+            Sub64(&endpos, &drvInfo->CurrentFilePointer, &result);
+            nNumberOfBytesToRead = result.LowPart;
+            dprintf(("Read past end of volume; nNumberOfBytesToRead reduced to %d", nNumberOfBytesToRead));
+            DebugInt3();
+        }
+    }
+
     if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         dprintf(("ERROR: Overlapped IO not yet implememented!!"));
@@ -1715 +1753 @@
     }
     else dprintf2(("KERNEL32: HMDeviceDiskClass::ReadFile read %x bytes pos %x", *lpNumberOfBytesRead, SetFilePointer(pHMHandleData, 0, NULL, FILE_CURRENT)));
+
+    //if unmounted volume, add starting offset to position as we're accessing the entire physical drive
+    //instead of just the volume
+    if(drvInfo->fPhysicalDisk && (drvInfo->StartingOffset.HighPart != 0 ||
+       drvInfo->StartingOffset.LowPart != 0) && bRC == TRUE)
+    {
+        LARGE_INTEGER distance, result;
+
+        distance.HighPart = 0;
+        distance.LowPart  = *lpNumberOfBytesRead;
+        Add64(&distance, &drvInfo->CurrentFilePointer, &result);
+        drvInfo->CurrentFilePointer = result;
+
+        dprintf(("New unmounted volume current file pointer %08x%08x", drvInfo->CurrentFilePointer.HighPart, drvInfo->CurrentFilePointer.LowPart));
+    }
 
     return bRC;
@@ -1927 +1980 @@
     else  lpRealBuf = (LPVOID)lpBuffer;
 
+    //if unmounted volume, check upper boundary as we're accessing the entire physical drive
+    //instead of just the volume
+    if(drvInfo->fPhysicalDisk && (drvInfo->StartingOffset.HighPart != 0 ||
+       drvInfo->StartingOffset.LowPart != 0))
+    {
+        LARGE_INTEGER distance, result, endpos;
+
+        //calculate end position in partition
+        Add64(&drvInfo->StartingOffset, &drvInfo->PartitionSize, &endpos);
+
+        distance.HighPart = 0;
+        distance.LowPart  = nNumberOfBytesToWrite;
+        Add64(&distance, &drvInfo->CurrentFilePointer, &result);
+
+        //check upper boundary
+        if(result.HighPart > endpos.HighPart ||
+           (result.HighPart == endpos.HighPart && result.LowPart > endpos.LowPart) )
+        {
+            Sub64(&endpos, &drvInfo->CurrentFilePointer, &result);
+            nNumberOfBytesToWrite = result.LowPart;
+            dprintf(("Write past end of volume; nNumberOfBytesToWrite reduced to %d", nNumberOfBytesToWrite));
+            DebugInt3();
+        }
+    }
+
     if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         dprintf(("ERROR: Overlapped IO not yet implememented!!"));
@@ -1936 +2014 @@
                             lpNumberOfBytesWritten);
 //  }
+
+    //if unmounted volume, add starting offset to position as we're accessing the entire physical drive
+    //instead of just the volume
+    if(drvInfo->fPhysicalDisk && (drvInfo->StartingOffset.HighPart != 0 ||
+       drvInfo->StartingOffset.LowPart != 0) && bRC == TRUE)
+    {
+        LARGE_INTEGER distance, result;
+
+        distance.HighPart = 0;
+        distance.LowPart  = *lpNumberOfBytesWritten;
+        Add64(&distance, &drvInfo->CurrentFilePointer, &result);
+        drvInfo->CurrentFilePointer = result;
+
+        dprintf(("New unmounted volume current file pointer %08x%08x", drvInfo->CurrentFilePointer.HighPart, drvInfo->CurrentFilePointer.LowPart));
+    }
 
     dprintf2(("KERNEL32: HMDeviceDiskClass::WriteFile returned %08xh\n",