[SETUPLIB] Cleanup some partition getters and remove GetDiskOrPartition.

- osdetect.c: Replace usage of GetDiskOrPartition by SelectPartition.
This commit is contained in:
Hermès Bélusca-Maïto 2024-06-20 22:36:16 +02:00
parent 63935f857f
commit a2777cd828
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 48 additions and 115 deletions

View file

@ -78,7 +78,6 @@ EnumerateInstallations(
ULONG DiskNumber = 0, PartitionNumber = 0;
PCWSTR PathComponent = NULL;
PDISKENTRY DiskEntry = NULL;
PPARTENTRY PartEntry = NULL;
UNICODE_STRING SystemRootPath;
@ -184,10 +183,11 @@ EnumerateInstallations(
DPRINT("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n",
&SystemRootPath, DiskNumber, PartitionNumber, PathComponent);
/* Retrieve the corresponding disk and partition */
if (!GetDiskOrPartition(Data->PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry))
/* Retrieve the corresponding partition */
PartEntry = SelectPartition(Data->PartList, DiskNumber, PartitionNumber);
if (!PartEntry)
{
DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n",
DPRINT1("SelectPartition(disk #%d, partition #%d) failed\n",
DiskNumber, PartitionNumber);
}
}