Changeset 67413 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 14, 2017 9:25:14 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: More ISO maker code. (path table fixes)

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• isomaker.cpp (modified) (9 diffs)
• isomakercmd.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/fs/isomaker.cpp

@@ -87 +87 @@
 
 
-/** Calculates the path table record size given the name length. */
+/** Calculates the path table record size given the name length.
+ * @note  The root directory length is 1 (name byte is 0x00), we make sure this
+ *        is the case in rtFsIsoMakerNormalizeNameForNamespace. */
 #define RTFSISOMAKER_CALC_PATHREC_SIZE(a_cbNameInDirRec) \
-    ( RT_UOFFSETOF(ISO9660PATHREC, achDirId[(a_cbNameInDirRec)]) + ((a_cbNameInDirRec) & 1) )
+    ( RT_UOFFSETOF(ISO9660PATHREC, achDirId[(a_cbNameInDirRec) + ((a_cbNameInDirRec) & 1)]) )
 
 
@@ -1640 +1642 @@
         /*
          * Root special case.
+         *
+         * For ISO-9660 and joliet, we enter it with a length of 1 byte.  The
+         * value byte value is zero.  The path tables we generate won't be
+         * accepted by windows unless we do this.
          */
         *pszDst      = '\0';
         *pcchDst     = 0;
-        *pcbInDirRec = 0;
+        *pcbInDirRec = pNamespace->fNamespace & (RTFSISOMAKER_NAMESPACE_ISO_9660 | RTFSISOMAKER_NAMESPACE_JOLIET) ? 1 : 0;
         AssertReturn(!pParent, VERR_INTERNAL_ERROR_3);
         return VINF_SUCCESS;
@@ -1760 +1766 @@
     if (RT_SUCCESS(rc))
     {
+        Assert(cbNameInDirRec > 0);
+
         size_t cbName = sizeof(RTFSISOMAKERNAME)
                       + cchName + 1
@@ -2903 +2911 @@
 
     int      rc;
-    uint16_t idPathTable = 0;
+    uint16_t idPathTable = 1;
     uint32_t cbPathTable = 0;
     if (pNamespace->pRoot)
@@ -3382 +3390 @@
     pPrimary->cbPathTable.be            = RT_H2BE_U32(pThis->PrimaryIsoDirs.cbPathTable);
     pPrimary->cbPathTable.le            = RT_H2LE_U32(pThis->PrimaryIsoDirs.cbPathTable);
-    pPrimary->offTypeLPathTable         = RT_H2LE_U32(pThis->PrimaryIsoDirs.offPathTableL);
-    pPrimary->offTypeMPathTable         = RT_H2BE_U32(pThis->PrimaryIsoDirs.offPathTableM);
+    pPrimary->offTypeLPathTable         = RT_H2LE_U32(pThis->PrimaryIsoDirs.offPathTableL / RTFSISOMAKER_SECTOR_SIZE);
+    pPrimary->offTypeMPathTable         = RT_H2BE_U32(pThis->PrimaryIsoDirs.offPathTableM / RTFSISOMAKER_SECTOR_SIZE);
     pPrimary->RootDir.DirRec.cbDirRec           = sizeof(pPrimary->RootDir);
     pPrimary->RootDir.DirRec.cExtAttrBlocks     = 0;
@@ -3408 +3416 @@
         pJoliet->cbPathTable.be             = RT_H2BE_U32(pThis->JolietDirs.cbPathTable);
         pJoliet->cbPathTable.le             = RT_H2LE_U32(pThis->JolietDirs.cbPathTable);
-        pJoliet->offTypeLPathTable          = RT_H2LE_U32(pThis->JolietDirs.offPathTableL);
-        pJoliet->offTypeMPathTable          = RT_H2BE_U32(pThis->JolietDirs.offPathTableM);
+        pJoliet->offTypeLPathTable          = RT_H2LE_U32(pThis->JolietDirs.offPathTableL / RTFSISOMAKER_SECTOR_SIZE);
+        pJoliet->offTypeMPathTable          = RT_H2BE_U32(pThis->JolietDirs.offPathTableM / RTFSISOMAKER_SECTOR_SIZE);
         pJoliet->RootDir.DirRec.cbDirRec           = sizeof(pJoliet->RootDir);
         pJoliet->RootDir.DirRec.cExtAttrBlocks     = 0;
@@ -3783 +3791 @@
     {
         pPathRec->offExtent   = RT_H2LE_U32(pName->pDir->offDir / RTFSISOMAKER_SECTOR_SIZE);
-        pPathRec->idParentRec = RT_H2LE_U16(pName->pParent ? pName->pParent->pDir->idPathTable : 0);
+        pPathRec->idParentRec = RT_H2LE_U16(pName->pParent ? pName->pParent->pDir->idPathTable : 1);
     }
     else
     {
         pPathRec->offExtent   = RT_H2BE_U32(pName->pDir->offDir / RTFSISOMAKER_SECTOR_SIZE);
-        pPathRec->idParentRec = RT_H2BE_U16(pName->pParent ? pName->pParent->pDir->idPathTable : 0);
+        pPathRec->idParentRec = RT_H2BE_U16(pName->pParent ? pName->pParent->pDir->idPathTable : 1);
     }
     if (!fUnicode)
@@ -3803 +3811 @@
         int rc = RTStrToUtf16BigEx(pName->szName, RTSTR_MAX, &pwszTmp, pName->cbNameInDirRec / sizeof(RTUTF16) + 1, &cwcResult);
         AssertRC(rc);
-        Assert(cwcResult * sizeof(RTUTF16) == pName->cbNameInDirRec);
+        Assert(   cwcResult * sizeof(RTUTF16) == pName->cbNameInDirRec
+               || (!pName->pParent && cwcResult == 0 && pName->cbNameInDirRec == 1) );
+
     }
     return RTFSISOMAKER_CALC_PATHREC_SIZE(pName->cbNameInDirRec);
@@ -3985 +3995 @@
         int rc = RTStrToUtf16BigEx(pName->szName, RTSTR_MAX, &pwszTmp, RT_ELEMENTS(wszTmp), &cwcResult);
         AssertRC(rc);
-        Assert(cwcResult * sizeof(RTUTF16) == pName->cbNameInDirRec);
+        Assert(   cwcResult * sizeof(RTUTF16) == pName->cbNameInDirRec
+               || (!pName->pParent && cwcResult == 0 && pName->cbNameInDirRec == 1) );
         memcpy(&pDirRec->achFileId[0], pwszTmp, pName->cbNameInDirRec);
         pDirRec->achFileId[pName->cbNameInDirRec] = '\0';

trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp

@@ -93 +93 @@
     RTFSISOMAKERCMD_OPT_RANDOM_OUTPUT_BUFFER_SIZE,
     RTFSISOMAKERCMD_OPT_NAME_SETUP,
+    RTFSISOMAKERCMD_OPT_NO_JOLIET,
 
     /*
@@ -309 +310 @@
     { "--output-buffer-size",           RTFSISOMAKERCMD_OPT_OUTPUT_BUFFER_SIZE,             RTGETOPT_REQ_UINT32  },
     { "--random-output-buffer-size",    RTFSISOMAKERCMD_OPT_RANDOM_OUTPUT_BUFFER_SIZE,      RTGETOPT_REQ_NOTHING },
-    { "--name-setup",                   RTFSISOMAKERCMD_OPT_NAME_SETUP,                     RTGETOPT_REQ_STRING },
+    { "--name-setup",                   RTFSISOMAKERCMD_OPT_NAME_SETUP,                     RTGETOPT_REQ_STRING  },
+    { "--no-joliet",                    RTFSISOMAKERCMD_OPT_NO_JOLIET,                      RTGETOPT_REQ_NOTHING },
 
 
@@ -1197 +1199 @@
                 rc = rtFsIsoMakerCmdOptNameSetup(&Opts, ValueUnion.psz);
                 break;
+            case RTFSISOMAKERCMD_OPT_NO_JOLIET:
+                rc = RTFsIsoMakerSetJolietUcs2Level(Opts.hIsoMaker, 0);
+                if (RT_FAILURE(rc))
+                    rc = rtFsIsoMakerCmdErrorRc(&Opts, rc, "Failed to disable joliet: %Rrc", rc);
+                break;