Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
UpdateDiskLayout:
- Set the proper HiddenSectors value.
- Fix counting the PartitonaNumber.
UpdatePartitionNumbers() has become obsolete. Remove it.

svn path=/trunk/; revision=68226
This commit is contained in:
Eric Kohl 2015-06-21 08:55:43 +00:00
parent e9138ce35a
commit 38638f5766
1 changed files with 3 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
reactos/base/setup/usetup/partlist.c
View file

@ -206,52 +206,6 @@ AssignDriveLetters(
}
static
VOID
UpdatePartitionNumbers(
PDISKENTRY DiskEntry)
{
PPARTENTRY PartEntry;
PLIST_ENTRY Entry;
// ULONG PartitionNumber = 1;
ULONG PartitionIndex = 0;
Entry = DiskEntry->PrimaryPartListHead.Flink;
while (Entry != &DiskEntry->PrimaryPartListHead)
{
PartEntry = CONTAINING_RECORD(Entry,
PARTENTRY,
ListEntry);
if (PartEntry->IsPartitioned == FALSE)
{
// PartEntry->PartitionNumber = 0;
PartEntry->PartitionIndex = (ULONG)-1;
}
else
{
if (IsContainerPartition(PartEntry->PartitionType))
{
// PartEntry->PartitionNumber = 0;
}
else if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED &&
PartEntry->SectorCount.QuadPart == 0ULL)
{
// PartEntry->PartitionNumber = 0;
}
else
{
// PartEntry->PartitionNumber = PartitionNumber++;
}
PartEntry->PartitionIndex = PartitionIndex++;
}
Entry = Entry->Flink;
}
}
NTSTATUS
NTAPI
DiskIdentifierQueryRoutine(
@ -2297,7 +2251,7 @@ UpdateDiskLayout(
PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector;
PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
PartitionInfo->HiddenSectors = 0;
PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart;
PartitionInfo->PartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0;
PartitionInfo->PartitionType = PartEntry->PartitionType;
PartitionInfo->BootIndicator = PartEntry->BootIndicator;
@ -2306,13 +2260,10 @@ UpdateDiskLayout(
PartEntry->PartitionNumber = PartitionNumber;
PartEntry->PartitionIndex = Index;
}
if (!IsContainerPartition(PartEntry->PartitionType))
PartitionNumber++;
}
else if (!IsEmptyLayoutEntry(PartitionInfo))
{
PartitionNumber++;
}
Index++;
}
@ -2480,8 +2431,6 @@ CreatePrimaryPartition(
DiskEntry->Dirty = TRUE;
UpdatePartitionNumbers(DiskEntry);
AssignDriveLetters(List);
}
@ -2625,8 +2574,6 @@ CreateExtendedPartition(
DiskEntry->Dirty = TRUE;
UpdatePartitionNumbers(DiskEntry);
AssignDriveLetters(List);
}
@ -2712,8 +2659,6 @@ CreateLogicalPartition(
DiskEntry->Dirty = TRUE;
UpdatePartitionNumbers(DiskEntry);
AssignDriveLetters(List);
}
@ -2823,8 +2768,6 @@ DeleteCurrentPartition(
DiskEntry->Dirty = TRUE;
UpdatePartitionNumbers(DiskEntry);
AssignDriveLetters(List);
}