Changeset 8969 in vbox for trunk

Timestamp:

May 20, 2008 6:07:25 PM (17 years ago)

Author:

vboxsync

Message:

Disk size ioctl fix for createrawvmdk.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxInternalManage.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -32 +32 @@
                          $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
                          $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,)
+VBoxManage_DEFS.win.x86 = _WIN32_WINNT=0x0500
 VBoxManage_SOURCES     = \
         VBoxManage.cpp \

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -788 +788 @@
     uint64_t cbSize = 0;
 #ifdef RT_OS_WINDOWS
+    /* Windows NT has no IOCTL_DISK_GET_LENGTH_INFORMATION ioctl. This was
+     * added to Windows XP, so we have to use the available info from DriveGeo.
+     * Note that we cannot simply use IOCTL_DISK_GET_DRIVE_GEOMETRY as it
+     * yields a slightly different result than IOCTL_DISK_GET_LENGTH_INFO.
+     * We call IOCTL_DISK_GET_DRIVE_GEOMETRY first as we need to check the media
+     * type anyway, and if IOCTL_DISK_GET_LENGTH_INFORMATION is supported
+     * we will later override cbSize.
+     */
     DISK_GEOMETRY DriveGeo;
     DWORD cbDriveGeo;
-    /* Windows NT has no IOCTL_DISK_GET_LENGTH_INFORMATION ioctl. This was
-     * added to Windows XP, so use the available info from DriveGeo. */
     if (DeviceIoControl((HANDLE)RawFile,
                         IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0,
@@ -805 +811 @@
         else
             return VERR_MEDIA_NOT_RECOGNIZED;
+
+        GET_LENGTH_INFORMATION DiskLenInfo;
+        DWORD junk;
+        if (DeviceIoControl((HANDLE)RawFile,
+                            IOCTL_DISK_GET_LENGTH_INFO, NULL, 0,
+                            &DiskLenInfo, sizeof(DiskLenInfo), &junk, (LPOVERLAPPED)NULL))
+        {
+            /* IOCTL_DISK_GET_LENGTH_INFO is supported -- override cbSize. */
+            cbSize = DiskLenInfo.Length.QuadPart;
+        }
     }
     else