Changeset 1242

Timestamp:

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

Author:

lowjoel

Message:

Use cli::array<Byte> instead of std::vector<char> as a buffer type for I/O operations.

Location:

trunk/eraser6/Eraser.Util.FileSystem

Files:

• FatApi.cpp (modified) (6 diffs)
• FatApi.h (modified) (3 diffs)
• Stdafx.h (modified) (1 diff)

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

@@ -21 +21 @@
 
 #include <stdafx.h>
+#include <vector>
 #include <windows.h>
 
@@ -50 +51 @@
     }
 
-    FatApi::FatApi(VolumeInfo^ info, Stream^ stream)
+    FatApi::FatApi(VolumeInfo^, Stream^ stream)
     {
         BootSector = new FatBootSector();
@@ -96 +97 @@
     }
 
-    std::vector<char> FatApi::GetFileContents(unsigned cluster)
+    array<Byte>^ FatApi::GetFileContents(unsigned cluster)
     {
         if (!IsClusterAllocated(cluster))
             throw gcnew ArgumentException(L"The specified cluster is not used.");
 
-        std::vector<char> result;
-        result.reserve(FileSize(cluster));
-        array<Byte>^ buffer = gcnew array<Byte>(ClusterSizeToSize(1));
+        array<Byte>^ result = gcnew array<Byte>(FileSize(cluster));
+        const int clusterSize = ClusterSizeToSize(1);
+        int nextIndex = 0;
 
         do
         {
             VolumeStream->Seek(ClusterToOffset(cluster), SeekOrigin::Begin);
-            VolumeStream->Read(buffer, 0, buffer->Length);
-
-            result.insert(result.end(), buffer->Length, 0);
-            Marshal::Copy(buffer, 0, static_cast<IntPtr>(&result.back() - buffer->Length + 1),
-                buffer->Length);
+            VolumeStream->Read(result, nextIndex, clusterSize);
+            nextIndex += clusterSize;
         }
         while ((cluster = GetNextCluster(cluster)) != 0xFFFFFFFF);
@@ -119 +117 @@
     }
 
-    void FatApi::SetFileContents(const void* data, size_t length, unsigned cluster)
+    void FatApi::SetFileContents(array<Byte>^ buffer, unsigned cluster)
     {
         if (!IsClusterAllocated(cluster))
             throw gcnew ArgumentException(L"The specified cluster is not used.");
-        if (length != FileSize(cluster))
+        if (static_cast<unsigned>(buffer->Length) != FileSize(cluster))
             throw gcnew ArgumentException(L"The provided file contents will not fit in the " +
                 gcnew String(L"allocated file."));
 
         size_t clusterSize = ClusterSizeToSize(1);
-        array<Byte>^ buffer = gcnew array<Byte>(clusterSize);
-        for (size_t i = 0; i < length; i += clusterSize)
-        {
-            Marshal::Copy(static_cast<IntPtr>(reinterpret_cast<intptr_t>(static_cast<const char*>(data) + i)),
-                buffer, 0, clusterSize);
+        for (int i = 0; i < buffer->Length; i += clusterSize)
+        {
             VolumeStream->Seek(ClusterToOffset(cluster), SeekOrigin::Begin);
-            VolumeStream->Write(buffer, 0, clusterSize);
+            VolumeStream->Write(buffer, i, clusterSize);
             cluster = GetNextCluster(cluster);
         }
@@ -351 +346 @@
     void FatDirectory::ReadDirectory()
     {
-        std::vector<char> dir = Api->GetFileContents(Cluster);
-        DirectorySize = dir.size() / sizeof(::FatDirectoryEntry);
+        array<Byte>^ dir = Api->GetFileContents(Cluster);
+        DirectorySize = dir->Length / sizeof(::FatDirectoryEntry);
         Directory = new ::FatDirectoryEntry[DirectorySize];
-        memcpy(Directory, &dir.front(), dir.size());
+        Marshal::Copy(dir, 0, static_cast<IntPtr>(Directory), dir->Length);
 
         ParseDirectory();
@@ -361 +356 @@
     void FatDirectory::WriteDirectory()
     {
-        Api->SetFileContents(Directory, Api->FileSize(Cluster), Cluster);
+        array<Byte>^ buffer = gcnew array<Byte>(DirectorySize * sizeof(::FatDirectoryEntry));
+        Marshal::Copy(static_cast<IntPtr>(Directory), buffer, 0, buffer->Length);
+        Api->SetFileContents(buffer, Cluster);
     }
 }

trunk/eraser6/Eraser.Util.FileSystem/FatApi.h

@@ -22 +22 @@
 #pragma once
 
-#include <vector>
 #include "Fat.h"
 
@@ -95 +94 @@
 
         /// Gets the contents of the file starting at the given cluster.
-        std::vector<char> GetFileContents(unsigned cluster);
+        array<Byte>^ GetFileContents(unsigned cluster);
 
         /// Set the contents of the file starting at the given cluster. The length
@@ -101 +100 @@
         /// 
         /// \param[in] buffer  The data to write.
-        /// \param[in] length  The amount of data to write.
         /// \param[in] cluster The cluster to begin writing to.
-        void SetFileContents(const void* buffer, size_t length, unsigned cluster);
+        void SetFileContents(array<Byte>^ buffer, unsigned cluster);
 
         /// Resolves a directory to the position on-disk

trunk/eraser6/Eraser.Util.FileSystem/Stdafx.h

@@ -21 +21 @@
 
 #pragma once
+#include <vector>
+
 #include <windows.h>