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

Timestamp:

6/19/2010 10:34:05 AM (2 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.

File:

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

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);
                     }