Changeset 2207 for trunk/eraser

Timestamp:

06/19/10 10:34:05 (3 years ago)

Author:

lowjoel

Message:

Handle spanned drives and other dynamic volumes better. This patch allows basic dynamic volumes to be grouped under the parent physical drive.

Location:

trunk/eraser/Eraser.Util

Files:

• PhysicalDriveInfo.cs (modified) (1 diff)
• VolumeInfo.cs (modified) (2 diffs)

trunk/eraser/Eraser.Util/PhysicalDriveInfo.cs

@@ -88 +88 @@
                 List<VolumeInfo> result = new List<VolumeInfo>();
 
-                //Check every partition index on this drive.
-                for (int i = 1; ; ++i)
-                {
-                    string path = GetPartitionPath(i);
-                    using (SafeFileHandle handle = OpenWin32Device(path,
-                        NativeMethods.FILE_READ_ATTRIBUTES, FileShare.ReadWrite, FileOptions.None))
-                    {
-                        if (handle.IsInvalid)
-                            break;
-                    }
-
-                    //This partition index is valid. Check which VolumeInfo this maps to.
-                    foreach (VolumeInfo info in VolumeInfo.Volumes)
-                    {
-                        //Only check local drives
-                        if (info.VolumeId.Substring(0, 4) == "\\\\?\\")
-                        {
-                            //Check whether the DOS Device maps to the target of the symbolic link
-                            if (NativeMethods.NtQuerySymbolicLink(path) ==
-                                NativeMethods.QueryDosDevice(info.VolumeId.Substring(
-                                    4, info.VolumeId.Length - 5)))
-                            {
-                                //Yes, this volume belongs to this disk
-                                result.Add(info);
-                                break;
-                            }
-                        }
-                    }
+                //Check every volume for which disk it is on.
+                foreach (VolumeInfo info in VolumeInfo.Volumes)
+                {
+                    if (Equals(info.PhysicalDrive))
+                        result.Add(info);
                 }
 

trunk/eraser/Eraser.Util/VolumeInfo.cs

@@ -599 +599 @@
                     {
                         int error = Marshal.GetLastWin32Error();
-                        if (error != Win32ErrorCode.InsufficientBuffer)
+                        if (error == Win32ErrorCode.InvalidFunction)
+                            return null;
+                        else if (error != Win32ErrorCode.MoreData)
                             throw Win32ErrorCode.GetExceptionForWin32Error(error);
 
@@ -629 +631 @@
                         ++i, offset += Marshal.SizeOf(typeof(NativeMethods.DISK_EXTENT)))
                     {
-                        NativeMethods.DISK_EXTENT extent = new NativeMethods.DISK_EXTENT();
-                        Marshal.PtrToStructure(new IntPtr(buffer.ToInt64() + offset), extent);
+                        NativeMethods.DISK_EXTENT extent = (NativeMethods.DISK_EXTENT)
+                            Marshal.PtrToStructure(new IntPtr(buffer.ToInt64() + offset),
+                            typeof(NativeMethods.DISK_EXTENT));
                         extents.Add(extent);
                     }