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

Timestamp:

9/30/2009 2:40:17 AM (4 years ago)

Author:

lowjoel

Message:

-Abstract the FatDirectory? class to a FatDirectoryBase? class which contains interfaces to parse the given FatDirectory? list, but no capability to read/write from disk since the Root directory in FAT12 and FAT16 are different from the Root directory in FAT32.
-Rename ::FatDirectory? to ::FatDirectoryEntry? since that's what it really is.

File:

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

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

@@ -21 +21 @@
 
 #include <stdafx.h>
-#include <windows.h>
-#include <atlstr.h>
-
 #include "FatApi.h"
 
@@ -50 +47 @@
 
         //Seek to the FAT
-        VolumeStream->Seek(SectorSizeToSize(BootSector->ReservedSectorCount), SeekOrigin::Begin);
+        VolumeStream->Seek(SectorToOffset(BootSector->ReservedSectorCount), SeekOrigin::Begin);
 
         //Read the FAT
@@ -58 +55 @@
     }
 
-    FatDirectory^ Fat32Api::LoadDirectory(unsigned cluster, String^ name, FatDirectory^ parent)
+    FatDirectoryBase^ Fat32Api::LoadDirectory(unsigned cluster, String^ name,
+        FatDirectoryBase^ parent)
     {
         return gcnew Directory(name, parent, cluster, this);
@@ -126 +124 @@
         //Traverse the directories until we get the cluster we want.
         unsigned cluster = BootSector->Fat32ParameterBlock.RootDirectoryCluster;
-        FatDirectory^ parentDir = nullptr;
+        FatDirectoryBase^ parentDir = nullptr;
         for each (String^ component in components)
         {
@@ -140 +138 @@
     }
 
-    Fat32Api::Directory::Directory(String^ name, FatDirectory^ parent, unsigned cluster, Fat32Api^ api)
+    Fat32Api::Directory::Directory(String^ name, FatDirectoryBase^ parent, unsigned cluster, Fat32Api^ api)
         : FatDirectory(name, parent, cluster, api)
     {
     }
 
-    unsigned Fat32Api::Directory::GetStartCluster(::FatDirectory& directory)
+    unsigned Fat32Api::Directory::GetStartCluster(::FatDirectoryEntry& directory)
     {
         if (directory.Short.Attributes == 0x0F)