Changeset 1843

Timestamp:

2/17/2010 9:38:16 AM (2 years ago)

Author:

lowjoel

Message:

Use VolumeInfo?.OpenHandle? to query a volume for NTFS information instead as that has better error handling.

Location:

trunk/eraser6/Eraser.Util

Files:

• NtfsApi.cs (modified) (2 diffs)
• VolumeInfo.cs (modified) (2 diffs)

trunk/eraser6/Eraser.Util/NtfsApi.cs

@@ -25 +25 @@
 using Microsoft.Win32.SafeHandles;
 using System.Runtime.InteropServices;
+using System.IO;
 
 namespace Eraser.Util
@@ -59 +60 @@
         internal static NativeMethods.NTFS_VOLUME_DATA_BUFFER GetNtfsVolumeData(VolumeInfo volume)
         {
-            using (SafeFileHandle volumeHandle = NativeMethods.CreateFile(
-                volume.VolumeId.Remove(volume.VolumeId.Length - 1),
-                NativeMethods.FILE_READ_ATTRIBUTES, NativeMethods.FILE_SHARE_READ |
-                NativeMethods.FILE_SHARE_WRITE, IntPtr.Zero, NativeMethods.OPEN_EXISTING,
-                0, IntPtr.Zero))
+            using (SafeFileHandle volumeHandle = volume.OpenHandle(
+                NativeMethods.FILE_READ_ATTRIBUTES, FileShare.ReadWrite, FileOptions.None))
             {
                 uint resultSize = 0;

trunk/eraser6/Eraser.Util/VolumeInfo.cs

@@ -626 +626 @@
         }
 
-        private SafeFileHandle OpenHandle(FileAccess access, FileShare share, FileOptions options)
+        internal SafeFileHandle OpenHandle(FileAccess access, FileShare share, FileOptions options)
         {
             //Access mode
@@ -646 +646 @@
         }
 
-        private SafeFileHandle OpenHandle(uint access, FileShare share, FileOptions options)
+        internal SafeFileHandle OpenHandle(uint access, FileShare share, FileOptions options)
         {
             //Sharing mode