Changeset 2189 for trunk/eraser/Eraser.Util/NtfsApi.cs

Timestamp:

6/18/2010 2:36:03 PM (2 years ago)

Author:

lowjoel

Message:

• Define a VolumeStream? class which is a FileStream? customised for raw volume access. This results in the VolumeLock? class being merged into the VolumeStream? class, automatically handling locking and unlocking of volumes.
• Change all internal OpenHandle? functions to private, since they should not be callable from outside the class.
• Perform error checking in OpenHandle? so that even callers of OpenHandle? gets error checking.

File:

• trunk/eraser/Eraser.Util/NtfsApi.cs (modified) (1 diff)

trunk/eraser/Eraser.Util/NtfsApi.cs

@@ -69 +69 @@
         internal static NativeMethods.NTFS_VOLUME_DATA_BUFFER? GetNtfsVolumeData(VolumeInfo volume)
         {
-            using (SafeFileHandle volumeHandle = volume.OpenHandle(
-                FileAccess.Read, FileShare.ReadWrite, FileOptions.None))
+            using (FileStream stream = volume.Open(FileAccess.Read, FileShare.ReadWrite,
+                FileOptions.None))
+            using (SafeFileHandle handle = stream.SafeFileHandle)
             {
-                if (volumeHandle.IsInvalid)
-                    return null;
-
                 uint resultSize = 0;
                 NativeMethods.NTFS_VOLUME_DATA_BUFFER volumeData =
                     new NativeMethods.NTFS_VOLUME_DATA_BUFFER();
-                if (NativeMethods.DeviceIoControl(volumeHandle,
+                if (NativeMethods.DeviceIoControl(handle,
                     NativeMethods.FSCTL_GET_NTFS_VOLUME_DATA, IntPtr.Zero, 0, out volumeData,
                     (uint)Marshal.SizeOf(volumeData), out resultSize, IntPtr.Zero))