Changeset 85945 in vbox for trunk/src/VBox/Storage

Timestamp:

Aug 28, 2020 9:14:21 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140140

Message:

Storage/VMDK: Simplify vmdkRawDescWinMakePartitionName by using IOCTL_STORAGE_GET_DEVICE_NUMBER instead of path parsing. bugref:9224

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -3769 +3769 @@
                                            char **ppszRawPartition)
 {
+# if 1
+    /*
+     * Ask the drive handle for its device number rather than mess about extracting
+     * it from the path (discovered this later when doing the path verification).
+     */
+    int                   rc         = VINF_SUCCESS;
+    DWORD                 cbReturned = 0;
+    STORAGE_DEVICE_NUMBER DevNum;
+    RT_ZERO(DevNum);
+    if (DeviceIoControl((HANDLE)RTFileToNative(hRawDrive), IOCTL_STORAGE_GET_DEVICE_NUMBER,
+                        NULL /*pvInBuffer*/, 0 /*cbInBuffer*/, &DevNum, sizeof(DevNum), &cbReturned, NULL /*pOverlapped*/))
+        RTStrAPrintf(ppszRawPartition, "\\\\.\\Harddisk%uPartition%u", DevNum.DeviceNumber, idxPartition);
+    else
+        rc = vdIfError(pImage->pIfError, RTErrConvertFromWin32(GetLastError()), RT_SRC_POS,
+                       N_("VMDK: Image path: '%s'. IOCTL_STORAGE_GET_DEVICE_NUMBER failed on '%s': %u"),
+                       pImage->pszFilename, pszRawDrive, GetLastError());
+    return rc;
+
+# else
     /*
      * First variant is \\.\PhysicalDriveX -> \\.\HarddiskXPartition{idxPartition}
@@ -3829 +3848 @@
                        pImage->pszFilename, pszRawDrive, idxPartition, rc);
     return rc;
+# endif
 }
 #endif /* RT_OS_WINDOWS */