儲存庫 vbox 的更動 67600

時間撮記:

2017-6-26 上午09:18:41 (7 年 以前)

作者:

vboxsync

訊息:

IPRT: More ISO maker code (import + booting).

位置:

trunk

檔案:

• include/iprt/formats/iso9660.h (修改) (1 筆差異)
• src/VBox/Runtime/common/fs/isomakerimport.cpp (修改) (4 筆差異)

trunk/include/iprt/formats/iso9660.h

@@ -901 +901 @@
 typedef ISO9660SYSLINUXINFOTABLE const *PCISO9660SYSLINUXINFOTABLE;
 
+/** The file offset of the isolinux boot info table. */
+#define ISO9660SYSLINUXINFOTABLE_OFFSET     8
+
 /** @} */
 

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

@@ -126 +126 @@
     AVLU32TREE              Block2FileRoot;
 
+    /** The block offset of the primary volume descriptor. */
+    uint32_t                offPrimaryVolDesc;
     /** The primary volume space size in blocks. */
     uint32_t                cBlocksInPrimaryVolumeSpace;
@@ -1326 +1328 @@
 
 /**
+ * Checks out an El Torito boot image to see if it requires info table patching.
+ *
+ * @returns IPRT status code (ignored).
+ * @param   pThis           The ISO importer instance.
+ * @param   idxImageObj     The configuration index of the image.
+ * @param   offBootImage    The block offset of the image.
+ */
+static int rtFsIsoImportProcessElToritoImage(PRTFSISOMKIMPORTER pThis, uint32_t idxImageObj, uint32_t offBootImage)
+{
+    ISO9660SYSLINUXINFOTABLE InfoTable;
+    int rc = RTVfsFileReadAt(pThis->hSrcFile, offBootImage * (uint64_t)ISO9660_SECTOR_SIZE + ISO9660SYSLINUXINFOTABLE_OFFSET,
+                             &InfoTable, sizeof(InfoTable), NULL);
+    if (RT_SUCCESS(rc))
+    {
+        if (   RT_LE2H_U32(InfoTable.offBootFile) == offBootImage
+            && RT_LE2H_U32(InfoTable.offPrimaryVolDesc) == pThis->offPrimaryVolDesc
+            && ASMMemIsAllU8(&InfoTable.auReserved[0], sizeof(InfoTable.auReserved), 0) )
+        {
+            rc = RTFsIsoMakerObjEnableBootInfoTablePatching(pThis->hIsoMaker, idxImageObj, true /*fEnable*/);
+            if (RT_FAILURE(rc))
+                return rtFsIsoImpError(pThis, rc, "RTFsIsoMakerObjEnableBootInfoTablePatching failed: %Rrc", rc);
+        }
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Processes a boot catalog default or section entry.
  *
@@ -1513 +1543 @@
                                             pEntry->bSelectionCriteriaType, pbSelCrit, cbSelCrit);
     if (RT_SUCCESS(rc))
+    {
         pThis->pResults->cBootCatEntries += 1 + *pcSkip;
+        rc = rtFsIsoImportProcessElToritoImage(pThis, idxImageObj, offBootImage);
+    }
     else
         rtFsIsoImpError(pThis, rc, "RTFsIsoMakerBootCatSetSectionEntry failed for entry #%#x: %Rrc", iEntry, rc);
@@ -1778 +1811 @@
                                 cPrimaryVolDescs++;
                                 if (cPrimaryVolDescs == 1)
+                                {
+                                    pThis->offPrimaryVolDesc = _32K / ISO9660_SECTOR_SIZE + iVolDesc;
                                     rtFsIsoImportProcessPrimaryDesc(pThis, &pThis->uSectorBuf.PrimVolDesc);
+                                }
                                 else
                                     rtFsIsoImpError(pThis, VERR_ISOMK_IMPORT_MULTIPLE_PRIMARY_VOL_DESCS,