From 4be14ab92ed6456e6d5bec5777fe7df5738112e7 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 3 Jan 2025 12:07:39 +0100 Subject: FIX: Fix implementation of the HFS traversal algorithm. FIX: Fix SysChk, by removing unused handover header in code. Signed-off-by: Amlal El Mahrouss --- dev/Boot/BootKit/BootKit.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'dev/Boot/BootKit/BootKit.h') diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index 095fb0ac..09313830 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -279,8 +279,8 @@ namespace Boot /// Fill catalog kind. catalogKind.Kind = blob->fKind; - catalogKind.Flags = kNeFSFlagCreated; - catalogKind.Status = kNeFSStatusUnlocked; + catalogKind.Flags |= kNeFSFlagCreated; + catalogKind.CatalogFlags = kNeFSStatusUnlocked; --partBlock.FreeCatalog; --partBlock.FreeSectors; @@ -372,22 +372,9 @@ namespace Boot fDiskDev.Write((Char*)&epm_boot, sizeof(BOOT_BLOCK_STRUCT)); - /// if we can write a root catalog, then write the partition block. - if (this->WriteRootCatalog(blob_list, blob_cnt, partBlock)) - { - BTextWriter writer; - writer.Write(L"BootZ: Drive has been formatted Successfully.\r"); - - return true; - } - else - { - fb_init(); - FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); - - EFI::ThrowError(L"Filesystem-Failure-Part", L"Filesystem couldn't be partitioned, this drive cannot be formatted as an explicit partition map."); - } + BTextWriter writer; + writer.Write(L"BootZ: Drive has been formatted Successfully.\r"); - return false; + return YES; } } // namespace Boot -- cgit v1.2.3