Changeset 2187 for trunk/eraser/Eraser.Util/VolumeInfo.cs

Timestamp:

6/18/2010 11:33:59 AM (3 years ago)

Author:

lowjoel

Message:

Allow us to query the size of non-ready partitions and disks (for more informative UIs)

File:

• trunk/eraser/Eraser.Util/VolumeInfo.cs (modified) (2 diffs)

trunk/eraser/Eraser.Util/VolumeInfo.cs

@@ -463 +463 @@
             get
             {
-                if (!IsReady)
-                    throw new InvalidOperationException("The volume has not been mounted or is not " +
-                        "currently ready.");
-
                 ulong result, dummy;
                 if (NativeMethods.GetDiskFreeSpaceEx(VolumeId, out dummy, out result, out dummy))
@@ -473 +469 @@
                 }
 
+                //Try the alternative method
+                using (SafeFileHandle handle = OpenHandle(NativeMethods.GENERIC_READ,
+                    FileShare.ReadWrite, FileOptions.None))
+                {
+                    if (handle.IsInvalid)
+                        throw Win32ErrorCode.GetExceptionForWin32Error(Marshal.GetLastWin32Error());
+
+                    long result2;
+                    uint returned = 0;
+                    if (NativeMethods.DeviceIoControl(handle,
+                        NativeMethods.IOCTL_DISK_GET_LENGTH_INFO, IntPtr.Zero, 0, out result2,
+                        out returned, IntPtr.Zero))
+                    {
+                        return result2;
+                    }
+                }
+
+                //Otherwise, throw
                 throw Win32ErrorCode.GetExceptionForWin32Error(Marshal.GetLastWin32Error());
             }