Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 23:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed the calculation of the start for a partition within an extended partition.

Browse source 
svn path=/trunk/; revision=9430
This commit is contained in:
Hartmut Birr 2004-05-17 20:20:17 +00:00
parent 3128a0aff7
commit d462152e6d
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
freeldr/freeldr/disk/partition.c
View file

@ -81,7 +81,7 @@ BOOL DiskGetPartitionEntry(U32 DriveNumber, U32 PartitionNumber, PPARTITION_TABL
MASTER_BOOT_RECORD MasterBootRecord; MASTER_BOOT_RECORD MasterBootRecord;
PARTITION_TABLE_ENTRY ExtendedPartitionTableEntry; PARTITION_TABLE_ENTRY ExtendedPartitionTableEntry;
U32 ExtendedPartitionNumber; U32 ExtendedPartitionNumber;
U32 ExtendedPartitionRelativeOffset; U32 ExtendedPartitionOffset;
U32 Index; U32 Index;
// Read master boot record // Read master boot record
@ -113,7 +113,7 @@ BOOL DiskGetPartitionEntry(U32 DriveNumber, U32 PartitionNumber, PPARTITION_TABL
// Set the initial relative starting sector to 0 // Set the initial relative starting sector to 0
// This is because extended partition starting // This is because extended partition starting
// sectors a numbered relative to their parent // sectors a numbered relative to their parent
ExtendedPartitionRelativeOffset = 0; ExtendedPartitionOffset = 0;
for (Index=0; Index<=ExtendedPartitionNumber; Index++) for (Index=0; Index<=ExtendedPartitionNumber; Index++)
{ {
@ -124,10 +124,14 @@ BOOL DiskGetPartitionEntry(U32 DriveNumber, U32 PartitionNumber, PPARTITION_TABL
} }
// Adjust the relative starting sector of the partition // Adjust the relative starting sector of the partition
ExtendedPartitionRelativeOffset += ExtendedPartitionTableEntry.SectorCountBeforePartition; ExtendedPartitionTableEntry.SectorCountBeforePartition += ExtendedPartitionOffset;
if (ExtendedPartitionOffset == 0)
{
// Set the start of the parrent extended partition
ExtendedPartitionOffset = ExtendedPartitionTableEntry.SectorCountBeforePartition;
}
// Read the partition boot record // Read the partition boot record
if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionRelativeOffset, &MasterBootRecord)) if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionTableEntry.SectorCountBeforePartition, &MasterBootRecord))
{ {
return FALSE; return FALSE;
} }
@ -139,7 +143,7 @@ BOOL DiskGetPartitionEntry(U32 DriveNumber, U32 PartitionNumber, PPARTITION_TABL
} }
// Now correct the start sector of the partition // Now correct the start sector of the partition
PartitionTableEntry->SectorCountBeforePartition += ExtendedPartitionRelativeOffset; PartitionTableEntry->SectorCountBeforePartition += ExtendedPartitionTableEntry.SectorCountBeforePartition;
} }
// When we get here we should have the correct entry // When we get here we should have the correct entry