--- truecrypt/boot/windows/bootdiskio.cpp	2018/04/24 16:58:53	1.1.1.4
+++ truecrypt/boot/windows/bootdiskio.cpp	2018/04/24 17:12:26	1.1.1.9
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2008 TrueCrypt Foundation. All rights reserved.
+ Copyright (c) 2008-2011 TrueCrypt Developers Association. All rights reserved.
 
- Governed by the TrueCrypt License 2.6 the full text of which is contained
- in the file License.txt included in TrueCrypt binary and source code
- distribution packages.
+ Governed by the TrueCrypt License 3.0 the full text of which is contained in
+ the file License.txt included in TrueCrypt binary and source code distribution
+ packages.
 */
 
 #include "Bios.h"
@@ -70,7 +70,7 @@ void PrintDiskError (BiosResult error, b
 	Print (write ? "Write" : "Read"); Print (" error:");
 	Print (error);
 	Print (" Drive:");
-	Print (drive < TC_FIRST_BIOS_DRIVE ? drive : drive - TC_FIRST_BIOS_DRIVE);
+	Print (drive ^ 0x80);
 
 	if (sector)
 	{
@@ -115,27 +115,38 @@ BiosResult ReadWriteSectors (bool write,
 	byte function = write ? 0x03 : 0x02;
 
 	BiosResult result;
-	__asm
-	{
-		push es
-		mov ax, bufferSegment
-		mov	es, ax
-		mov	bx, bufferOffset
-		mov dl, drive
-		mov ch, cylinderLow
-		mov si, chs
-		mov dh, [si].Head
-		mov cl, sector
-		mov	al, sectorCount
-		mov	ah, function
-		int	0x13
-		mov	result, ah
-		pop es
-	}
+	byte tryCount = TC_MAX_BIOS_DISK_IO_RETRIES;
 
-	if (result == BiosResultEccCorrected)
+	do
+	{
 		result = BiosResultSuccess;
 
+		__asm
+		{
+			push es
+			mov ax, bufferSegment
+			mov	es, ax
+			mov	bx, bufferOffset
+			mov dl, drive
+			mov ch, cylinderLow
+			mov si, chs
+			mov dh, [si].Head
+			mov cl, sector
+			mov	al, sectorCount
+			mov	ah, function
+			int	0x13
+			jnc ok				// If CF=0, ignore AH to prevent issues caused by potential bugs in BIOSes
+			mov	result, ah
+		ok:
+			pop es
+		}
+
+		if (result == BiosResultEccCorrected)
+			result = BiosResultSuccess;
+
+	// Some BIOSes report I/O errors prematurely in some cases
+	} while (result != BiosResultSuccess && --tryCount != 0);
+
 	if (!silent && result != BiosResultSuccess)
 		PrintDiskError (result, write, drive, nullptr, &chs);
 
@@ -188,20 +199,31 @@ static BiosResult ReadWriteSectors (bool
 	byte function = write ? 0x43 : 0x42;
 	
 	BiosResult result;
-	__asm
-	{
-		mov	bx, 0x55aa
-		mov	dl, drive
-		mov si, [dapPacket]
-		mov	ah, function
-		xor al, al
-		int	0x13
-		mov	result, ah
-	}
+	byte tryCount = TC_MAX_BIOS_DISK_IO_RETRIES;
 
-	if (result == BiosResultEccCorrected)
+	do
+	{
 		result = BiosResultSuccess;
 
+		__asm
+		{
+			mov	bx, 0x55aa
+			mov	dl, drive
+			mov si, [dapPacket]
+			mov	ah, function
+			xor al, al
+			int	0x13
+			jnc ok				// If CF=0, ignore AH to prevent issues caused by potential bugs in BIOSes
+			mov	result, ah
+		ok:
+		}
+
+		if (result == BiosResultEccCorrected)
+			result = BiosResultSuccess;
+
+	// Some BIOSes report I/O errors prematurely in some cases
+	} while (result != BiosResultSuccess && --tryCount != 0);
+
 	if (!silent && result != BiosResultSuccess)
 		PrintDiskError (result, write, drive, &sector);
 
@@ -280,8 +302,11 @@ BiosResult GetDriveGeometry (byte drive,
 	}
 	else if (!silent)
 	{
-		PrintError ("Cannot get geometry of drive ", true, false);
-		PrintHex (drive);
+		Print ("Drive ");
+		Print (drive ^ 0x80);
+		Print (" not found: ");
+		PrintErrorNoEndl ("");
+		Print (result);
 		PrintEndl();
 	}
 
@@ -298,10 +323,10 @@ void ChsToLba (const DriveGeometry &geom
 
 void LbaToChs (const DriveGeometry &geometry, const uint64 &lba, ChsAddress &chs)
 {
-	chs.Sector = (lba.LowPart % geometry.Sectors) + 1;
+	chs.Sector = (byte) ((lba.LowPart % geometry.Sectors) + 1);
 	uint32 ch = lba.LowPart / geometry.Sectors;
-	chs.Head = ch % geometry.Heads;
-	chs.Cylinder = ch / geometry.Heads;
+	chs.Head = (byte) (ch % geometry.Heads);
+	chs.Cylinder = (uint16) (ch / geometry.Heads);
 }
 
 
@@ -447,20 +472,16 @@ BiosResult GetDrivePartitions (byte driv
 }
 
 
-bool GetActiveAndFollowingPartition (byte drive)
+bool GetActivePartition (byte drive)
 {
 	size_t partCount;
 
-	// Find active partition
 	if (GetDrivePartitions (drive, &ActivePartition, 1, partCount, true) != BiosResultSuccess || partCount < 1)
 	{
 		ActivePartition.Drive = TC_INVALID_BIOS_DRIVE;
 		PrintError (TC_BOOT_STR_NO_BOOT_PARTITION);
 		return false;
 	}
-
-	// Find partition following the active one
-	GetDrivePartitions (drive, &PartitionFollowingActive, 1, partCount, false, &ActivePartition);
-
+	
 	return true;
 }