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

Timestamp:

Sep 30, 2002, 2:53:27 PM (23 years ago)

Author:

sandervl

Message:

Fixes for volume access

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.56 2002-09-27 14:35:56 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.57 2002-09-30 12:53:27 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #define BCDToDec(a) ((a >> 4) * 10 + (a & 0xF))
 
+
+#define UNMOUNTED_VOLUME(a) (a->fPhysicalDisk && (a->StartingOffset.HighPart != 0 || a->StartingOffset.LowPart != 0))
 
 typedef struct
@@ -307 +309 @@
         drvInfo->dwPhysicalDiskNr = dwPhysicalDiskNr;
         drvInfo->StartingOffset   = volext.Extents[0].StartingOffset;
+        drvInfo->CurrentFilePointer = drvInfo->StartingOffset;
         drvInfo->PartitionSize    = volext.Extents[0].ExtentLength;
 
@@ -1730 +1733 @@
     //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))
+    if(UNMOUNTED_VOLUME(drvInfo))
     {
         LARGE_INTEGER distance, result, endpos;
@@ -1771 +1773 @@
     //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)
+    if(UNMOUNTED_VOLUME(drvInfo) && bRC == TRUE)
     {
         LARGE_INTEGER distance, result;
@@ -1832 +1833 @@
     //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))
+    if(UNMOUNTED_VOLUME(drvInfo))
     {
         LARGE_INTEGER distance, result, endpos;
@@ -1851 +1851 @@
         //calculate end position in partition
         Add64(&drvInfo->StartingOffset, &drvInfo->PartitionSize, &endpos);
-        result.HighPart = 0;
-        result.LowPart  = 1;
-        Sub64(&endpos, &result, &endpos);
 
         switch(dwMoveMethod) {
@@ -1886 +1883 @@
                                      (DWORD *)&result.HighPart,
                                      FILE_BEGIN);
-
-        Sub64(&result, &drvInfo->StartingOffset, &drvInfo->CurrentFilePointer);
-        ret = drvInfo->CurrentFilePointer.LowPart;
+        //save new file pointer
+        drvInfo->CurrentFilePointer.HighPart = result.HighPart;
+        drvInfo->CurrentFilePointer.LowPart  = ret;
+
+        //subtract volume start to get relative offset
+        Sub64(&drvInfo->CurrentFilePointer, &drvInfo->StartingOffset, &result);
+        ret = result.LowPart;
         if(lpDistanceToMoveHigh) {
-            *lpDistanceToMoveHigh = drvInfo->CurrentFilePointer.HighPart;
+            *lpDistanceToMoveHigh = result.HighPart;
         }
     }
@@ -1997 +1998 @@
     //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))
+    if(UNMOUNTED_VOLUME(drvInfo))
     {
         LARGE_INTEGER distance, result, endpos;
@@ -2024 +2024 @@
     }
 //  else {
+#if 0
+    bRC = TRUE;
+    *lpNumberOfBytesWritten = nNumberOfBytesToWrite;
+#else
     bRC = OSLibDosWrite(pHMHandleData->hHMHandle,
                             (PVOID)lpRealBuf,
                             nNumberOfBytesToWrite,
                             lpNumberOfBytesWritten);
+#endif
 //  }
 
     //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)
+    if(UNMOUNTED_VOLUME(drvInfo) && bRC == TRUE)
     {
         LARGE_INTEGER distance, result;