儲存庫 vbox 的更動 67539

時間撮記:

2017-6-21 下午12:54:41 (7 年 以前)

作者:

vboxsync

訊息:

IPRT: More ISO maker code (import related).

位置:

trunk/src/VBox/Runtime/common/fs

檔案:

• isomaker.cpp (修改) (1 筆差異)
• isomakerimport.cpp (修改) (3 筆差異)

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

@@ -3203 +3203 @@
                  * Just morph pFile into a boot catalog file.
                  */
-                if (pFile->enmSrcType)
+                if (pFile->enmSrcType == RTFSISOMAKERSRCTYPE_VFS_FILE)
                 {
                     RTVfsFileRelease(pFile->u.hVfsFile);

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

@@ -1138 +1138 @@
                                             pEntry->uLoadSeg, pEntry->cEmulatedSectorsToLoad,
                                             pEntry->bSelectionCriteriaType, pbSelCrit, cbSelCrit);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+        pThis->pResults->cBootCatEntries += 1 + *pcSkip;
+    else
         rtFsIsoImpError(pThis, rc, "RTFsIsoMakerBootCatSetSectionEntry failed for entry #%#x: %Rrc", iEntry, rc);
     return rc;
@@ -1169 +1171 @@
     int rc = RTFsIsoMakerBootCatSetSectionHeaderEntry(pThis->hIsoMaker, iEntry, RT_LE2H_U16(pEntry->cEntries),
                                                       pEntry->bPlatformId, pszId);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+        pThis->pResults->cBootCatEntries++;
+    else
         rtFsIsoImpError(pThis, rc,
                         "RTFsIsoMakerBootCatSetSectionHeaderEntry failed for entry #%#x (bPlatformId=%#x cEntries=%#x): %Rrc",
@@ -1258 +1262 @@
         return rtFsIsoImpError(pThis, rc, "RTFsIsoMakerBootCatSetValidationEntry(,%#x,%s) failed: %Rrc",
                                pValEntry->bPlatformId, pszId);
+    Assert(pThis->pResults->cBootCatEntries == UINT32_MAX);
+    pThis->pResults->cBootCatEntries = 0;
 
     /*