Changeset 2180 for trunk/eraser/Eraser.Util/PhysicalDriveInfo.cs

Timestamp:

6/18/2010 9:33:10 AM (2 years ago)

Author:

lowjoel

Message:

Better algorithm to find which partitions are on which drives which works on Windows Vista as well. Address #20: Attached Drive Total Wipe

File:

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

trunk/eraser/Eraser.Util/PhysicalDriveInfo.cs

@@ -127 +127 @@
             get
             {
-                //Get all registered DOS Device names.
-                string[] dosDevices = NativeMethods.QueryDosDevices();
+                List<VolumeInfo> result = new List<VolumeInfo>();
 
-                //Get a list of Win32 device names, and map it to DOS Devices.
-                ComLib.Collections.DictionaryMultiValue<string, string> devices =
-                    new ComLib.Collections.DictionaryMultiValue<string, string>();
-                foreach (string dosDevice in dosDevices)
+                //Check every partition index on this drive.
+                for (int i = 1; ; ++i)
                 {
-                    string win32Device = NativeMethods.QueryDosDevice(dosDevice);
-                    if (win32Device != null)
-                        devices.Add(win32Device, dosDevice);
-                }
+                    string path = string.Format(CultureInfo.InvariantCulture,
+                        "\\Device\\Harddisk{0}\\Partition{1}", Index, i);
+                    using (SafeFileHandle handle = OpenWin32Device(path))
+                    {
+                        if (handle.IsInvalid)
+                            break;
+                    }
 
-                List<VolumeInfo> result = new List<VolumeInfo>();
-                foreach (VolumeInfo info in VolumeInfo.Volumes)
-                {
-                    if (info.VolumeId.Substring(0, 4) == "\\\\?\\")
+                    //This partition index is valid. Check which VolumeInfo this maps to.
+                    foreach (VolumeInfo info in VolumeInfo.Volumes)
                     {
-                        string win32Device = NativeMethods.QueryDosDevice(
-                            info.VolumeId.Substring(4, info.VolumeId.Length - 5));
-                        foreach (string dosDevice in devices.Get(win32Device))
+                        //Only check local drives
+                        if (info.VolumeId.Substring(0, 4) == "\\\\?\\")
                         {
-                            Match match = HarddiskPartitionRegex.Match(dosDevice);
-                            if (!match.Success)
-                                continue;
-
-                            //Check the HardDisk ID: if it is the same as our index, it is our partition.
-                            if (Convert.ToInt32(match.Groups[1].Value) == Index)
+                            //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)))
                             {
-                                int partition = Convert.ToInt32(match.Groups[2].Value) - 1;
-                                while (partition >= result.Count)
-                                    result.Add(null);
-
-                                result[partition] = info;
+                                //Yes, this volume belongs to this disk
+                                result.Add(info);
+                                break;
                             }
                         }