Changeset 25963 in vbox

Timestamp:

Jan 22, 2010 12:17:32 AM (15 years ago)

Author:

vboxsync

Message:

VHD: Fix incompatibility with Virtual PC

File:

• trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp

@@ -113 +113 @@
     uint32_t ParentTimeStamp;
     uint32_t Reserved0;
-    uint8_t  ParentUnicodeName[512];
+    uint16_t ParentUnicodeName[256];
     VHDPLE   ParentLocatorEntry[VHD_MAX_LOCATOR_ENTRIES];
     uint8_t  Reserved1[256];
@@ -401 +401 @@
 }
 
-static int vhdFilenameToUtf16(const char *pszFilename, void *pvBuf, uint32_t cbBufSize, uint32_t *pcbActualSize)
+static int vhdFilenameToUtf16(const char *pszFilename, uint16_t *pu16Buf, uint32_t cbBufSize, uint32_t *pcbActualSize, bool fBigEndian)
 {
     int      rc;
@@ -416 +416 @@
         goto out;
     }
-    memcpy(pvBuf, tmp16, cTmp16Len * sizeof(*tmp16));
+
+    if (fBigEndian)
+        for (unsigned i = 0; i < cTmp16Len; i++)
+            pu16Buf[i] = RT_H2BE_U16(tmp16[i]);
+    else
+        memcpy(pu16Buf, tmp16, cTmp16Len * sizeof(*tmp16));
     if (pcbActualSize)
         *pcbActualSize = (uint32_t)(cTmp16Len * sizeof(*tmp16));
@@ -464 +469 @@
         case VHD_PLATFORM_CODE_W2RU:
             /* Update unicode relative name. */
-            rc = vhdFilenameToUtf16(pszFilename, pvBuf, cbMaxLen, &cb);
+            rc = vhdFilenameToUtf16(pszFilename, (uint16_t *)pvBuf, cbMaxLen, &cb, false);
             if (RT_FAILURE(rc))
                 goto out;
@@ -483 +488 @@
                 goto out;
             }
-            rc = vhdFilenameToUtf16(pszTmp, pvBuf, cbMaxLen, &cb);
+            rc = vhdFilenameToUtf16(pszTmp, (uint16_t *)pvBuf, cbMaxLen, &cb, false);
             RTMemTmpFree(pszTmp);
             if (RT_FAILURE(rc))
@@ -530 +535 @@
     {
         rc = vhdFilenameToUtf16(RTPathFilename(pImage->pszParentFilename),
-             ddh.ParentUnicodeName, sizeof(ddh.ParentUnicodeName) - 1, NULL);
+             ddh.ParentUnicodeName, sizeof(ddh.ParentUnicodeName) - 1, NULL, true);
         if (RT_FAILURE(rc))
             return rc;
@@ -1885 +1890 @@
 
     Footer.DataOffset = RT_H2BE_U64(pImage->u64DataOffset);
-    pImage->vhdFooterCopy = Footer;
 
     /* Compute and update the footer checksum. */
     Footer.Checksum = 0;
     Footer.Checksum = RT_H2BE_U32(vhdChecksum(&Footer, sizeof(Footer)));
+
+    pImage->vhdFooterCopy = Footer;
 
     /* Store the footer */