Changeset 56918 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 10, 2015 3:10:02 PM (10 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: take different partition numbering (MBR) on Windows into account, but it's not worth plastering the code with ifdefs as the additional numbering style is rather cheap

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (9 diffs)

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

@@ -94 +94 @@
     /** partition number */
     unsigned        uIndex;
+    /** partition number (internal only, windows specific numbering) */
+    unsigned        uIndexWin;
     /** partition type */
     unsigned        uType;
@@ -831 +833 @@
                 PHOSTPARTITION pCP = &pPart->aPartitions[pPart->cPartitions++];
                 pCP->uIndex = currentEntry + 1;
+                pCP->uIndexWin = currentEntry + 1;
                 pCP->uType = 0;
                 pCP->uStartCylinder = 0;
@@ -843 +846 @@
                 {
                     pCP->uIndex = 0;
+                    pCP->uIndexWin = 0;
                     --pPart->cPartitions;
                     break;
@@ -867 +871 @@
 
         unsigned uExtended = (unsigned)-1;
+        unsigned uIndexWin = 1;
 
         for (unsigned i = 0; i < 4; i++)
@@ -890 +895 @@
             {
                 if (uExtended == (unsigned)-1)
+                {
                     uExtended = (unsigned)(pCP - pPart->aPartitions);
+                    pCP->uIndexWin = 0;
+                }
                 else
                 {
@@ -896 +904 @@
                     return VERR_INVALID_PARAMETER;
                 }
+            }
+            else
+            {
+                pCP->uIndexWin = uIndexWin;
+                uIndexWin++;
             }
         }
@@ -931 +944 @@
                 PHOSTPARTITION pCP = &pPart->aPartitions[pPart->cPartitions++];
                 pCP->uIndex = uIndex;
+                pCP->uIndexWin = uIndexWin;
                 pCP->uType = p[4];
                 pCP->uStartCylinder = (uint32_t)p[3] + ((uint32_t)(p[2] & 0xc0) << 2);
@@ -954 +968 @@
                 else if (PARTTYPE_IS_EXTENDED(p[4]))
                 {
-                    uExtended = uIndex++;
+                    uExtended = uIndex;
+                    uIndex++;
+                    uIndexWin++;
                     uOffset = RT_MAKE_U32_FROM_U8(p[8], p[9], p[10], p[11]);
                 }
@@ -1658 +1674 @@
                     RTStrAPrintf(&psz, "\\\\.\\Harddisk%sPartition%u",
                                  rawdisk.c_str() + 17,
-                                 partitions.aPartitions[i].uIndex);
+                                 partitions.aPartitions[i].uIndexWin);
                     if (!psz)
                     {
                         vrc = VERR_NO_STR_MEMORY;
-                        RTMsgError("Cannot create reference to individual partition %u, rc=%Rrc",
-                                   partitions.aPartitions[i].uIndex, vrc);
+                        RTMsgError("Cannot create reference to individual partition %u (numbered %u), rc=%Rrc",
+                                   partitions.aPartitions[i].uIndex, partitions.aPartitions[i].uIndexWin, vrc);
                         goto out;
                     }