From 8e9627877de933db8870492bd4d17bb019b0b563 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 9 Nov 2019 00:24:17 +0100 Subject: Windows MBR Bootloader: better way to handle displaying write errors in WriteEncryptedSectors function --- src/Boot/Windows/BootEncryptedIo.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/Boot/Windows') diff --git a/src/Boot/Windows/BootEncryptedIo.cpp b/src/Boot/Windows/BootEncryptedIo.cpp index 380d3419..8ca55635 100644 --- a/src/Boot/Windows/BootEncryptedIo.cpp +++ b/src/Boot/Windows/BootEncryptedIo.cpp @@ -108,19 +108,22 @@ BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, byt EncryptDataUnits (SectorBuffer, &dataUnitNo, 1, BootCryptoInfo); } - result = ReadWriteSectors (true, SectorBuffer, drive, sector + writeOffset, 1, false); + result = ReadWriteSectors (true, SectorBuffer, drive, sector + writeOffset, 1, true); if (BiosResultTimeout == result) { - result = ReadWriteSectors (false, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, sector + writeOffset, 8, false); - if (BiosResultSuccess == result) + if (BiosResultSuccess == ReadWriteSectors (false, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, sector + writeOffset, 8, false)) { CopyMemory (SectorBuffer, TC_BOOT_LOADER_BUFFER_SEGMENT,0, TC_LB_SIZE); - result = ReadWriteSectors (true, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, sector + writeOffset, 8, false); + result = ReadWriteSectors (true, TC_BOOT_LOADER_BUFFER_SEGMENT, 0, drive, sector + writeOffset, 8, true); } } if (result != BiosResultSuccess) + { + sector += writeOffset; + PrintDiskError (result, true, drive, §or); break; + } ++sector; ++dataUnitNo; -- cgit v1.2.3