Changeset 1239 for trunk/eraser6/Eraser.Util.FileSystem/Fat32Api.cpp

Timestamp:

9/30/2009 9:01:05 AM (4 years ago)

Author:

lowjoel

Message:

Got rid of the SectorSize? and ClusterSize? fields in the FatApi? class, replacing them with the values straight from the BootSector? field. For the rest of the protected fields, place them into properties to allow ABI compatibility.

File:

• trunk/eraser6/Eraser.Util.FileSystem/Fat32Api.cpp (modified) (2 diffs)

trunk/eraser6/Eraser.Util.FileSystem/Fat32Api.cpp

@@ -65 +65 @@
         unsigned long long sector = BootSector->ReservedSectorCount +               //Reserved area
             BootSector->FatCount * BootSector->Fat32ParameterBlock.SectorsPerFat +  //FAT area
-            (static_cast<unsigned long long>(cluster) - 2) * (ClusterSize / SectorSize);
+            (static_cast<unsigned long long>(cluster) - 2) *  BootSector->SectorsPerCluster;
         return SectorToOffset(sector);
     }
@@ -105 +105 @@
                 throw gcnew ArgumentException(L"Invalid FAT cluster: cluster is marked bad.");
             else if (fatPtr[cluster] >= 0x0FFFFFF8)
-                return result * ClusterSize;
+                return ClusterSizeToSize(result);
             else
                 cluster = fatPtr[cluster];