lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-03 01:41:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] Improve disk detection (#8074)

Browse Source 
Improve disk detection on UEFI by using PublicBootHandle index

JIRA issue: CORE-11954
This commit is contained in:
Daniel Victor
2025-06-23 20:03:05 -03:00
committed by GitHub
parent 6243d16945
commit 6ed46baf49
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
boot/freeldr/freeldr/arch/uefi/uefidisk.c
View File

@@ -431,30 +431,23 @@ UefiSetupBlockDevices(VOID)
}
else if (handles[i] == PublicBootHandle)
{
ULONG increment = 0;
ULONG i;
/* 3) Grab the offset into the array of handles and decrement per volume (valid partition) */
for (increment = OffsetToBoot; increment > 0; increment--)
GlobalSystemTable->BootServices->HandleProtocol(handles[i], &bioGuid, (void**)&bio);
if (bio->Media->LogicalPartition == FALSE)
{
GlobalSystemTable->BootServices->HandleProtocol(handles[increment], &bioGuid, (void**)&bio);
if (bio->Media->LogicalPartition == FALSE)
ULONG j;
TRACE("Found root at index %u\n", i);
UefiBootRootIdentifier = i;
for (j = 0; j <= PcBiosDiskCount; ++j)
{
TRACE("Found root at increment %u\n", increment);
UefiBootRootIdentifier = increment;
for (i = 0; i <= PcBiosDiskCount; ++i)
/* Now only of the root drive number is equal to this drive we found above */
if (InternalUefiDisk[j].UefiRootNumber == UefiBootRootIdentifier)
{
/* Now only of the root drive number is equal to this drive we found above */
if (InternalUefiDisk[i].UefiRootNumber == UefiBootRootIdentifier)
{
InternalUefiDisk[i].IsThisTheBootDrive = TRUE;
PublicBootArcDisk = i;
TRACE("Found Boot drive\n");
}
InternalUefiDisk[j].IsThisTheBootDrive = TRUE;
PublicBootArcDisk = j;
TRACE("Found Boot drive\n");
}
break;
}
}
}