ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:FSTUB] Simplify GUID comparisons and partition info saving

Browse Source
This commit is contained in:
Hermès Bélusca-Maïto
2026-04-11 18:16:24 +02:00
parent bb30c56d6f
commit f2e0e63ee5
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ntoskrnl/fstub/disksup.c
+2 -4
View File
@@ -243,10 +243,8 @@ HalpQueryPartitionType(
return STATUS_SUCCESS;
}
/* Check whether that's data partition */
if (RtlCompareMemory(&PartitionInfo.Gpt.PartitionType,
&PARTITION_BASIC_DATA_GUID,
sizeof(GUID)) == sizeof(GUID))
/* Check whether this is a data partition */
if (IsEqualGUID(&PartitionInfo.Gpt.PartitionType, &PARTITION_BASIC_DATA_GUID))
{
*PartitionType = DataPartition;
return STATUS_SUCCESS;
ntoskrnl/fstub/fstubex.c
+17 -25
View File
@@ -986,6 +986,7 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
ULONGLONG PartitionEntryLBA;
#endif
PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL;
PPARTITION_INFORMATION_EX PartitionInfo;
ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector;
PAGED_CODE();
@@ -1077,28 +1078,24 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
PartitionEntry = ((PEFI_PARTITION_ENTRY)Disk->Buffer)[PartitionIndex];
PartitionIndex++;
/* If partition GUID is 00000000-0000-0000-0000-000000000000, then it's unused, skip it */
if (PartitionEntry.PartitionType.Data1 == 0 &&
PartitionEntry.PartitionType.Data2 == 0 &&
PartitionEntry.PartitionType.Data3 == 0 &&
((PULONGLONG)PartitionEntry.PartitionType.Data4)[0] == 0)
{
/* Skip unused partition */
if (IsEqualGUID(&PartitionEntry.PartitionType, &PARTITION_ENTRY_UNUSED_GUID))
continue;
}
/* Write data to structure. Don't forget GPT is using sectors, Windows offsets */
DriveLayoutEx->PartitionEntry[PartitionCount].StartingOffset.QuadPart = PartitionEntry.StartingLBA * Disk->SectorSize;
DriveLayoutEx->PartitionEntry[PartitionCount].PartitionLength.QuadPart = (PartitionEntry.EndingLBA -
PartitionEntry.StartingLBA + 1) *
Disk->SectorSize;
PartitionInfo = &DriveLayoutEx->PartitionEntry[PartitionCount];
PartitionInfo->StartingOffset.QuadPart = PartitionEntry.StartingLBA * Disk->SectorSize;
PartitionInfo->PartitionLength.QuadPart = (PartitionEntry.EndingLBA -
PartitionEntry.StartingLBA + 1) * Disk->SectorSize;
/* This number starts from 1 */
DriveLayoutEx->PartitionEntry[PartitionCount].PartitionNumber = PartitionCount + 1;
DriveLayoutEx->PartitionEntry[PartitionCount].RewritePartition = FALSE;
DriveLayoutEx->PartitionEntry[PartitionCount].PartitionStyle = PARTITION_STYLE_GPT;
DriveLayoutEx->PartitionEntry[PartitionCount].Gpt.PartitionType = PartitionEntry.PartitionType;
DriveLayoutEx->PartitionEntry[PartitionCount].Gpt.PartitionId = PartitionEntry.UniquePartition;
DriveLayoutEx->PartitionEntry[PartitionCount].Gpt.Attributes = PartitionEntry.Attributes;
RtlCopyMemory(DriveLayoutEx->PartitionEntry[PartitionCount].Gpt.Name,
PartitionInfo->PartitionNumber = PartitionCount + 1;
PartitionInfo->RewritePartition = FALSE;
PartitionInfo->PartitionStyle = PARTITION_STYLE_GPT;
PartitionInfo->Gpt.PartitionType = PartitionEntry.PartitionType;
PartitionInfo->Gpt.PartitionId = PartitionEntry.UniquePartition;
PartitionInfo->Gpt.Attributes = PartitionEntry.Attributes;
RtlCopyMemory(PartitionInfo->Gpt.Name,
PartitionEntry.Name, sizeof(PartitionEntry.Name));
/* Update partition count */
@@ -1657,14 +1654,9 @@ FstubWritePartitionTableEFI(IN PDISK_INFORMATION Disk,
for (i = 0, WrittenPartitions = 0; i < PartitionCount; i++)
{
/* If partition GUID is 00000000-0000-0000-0000-000000000000, then it's unused, skip it */
if (PartitionEntries[i].Gpt.PartitionType.Data1 == 0 &&
PartitionEntries[i].Gpt.PartitionType.Data2 == 0 &&
PartitionEntries[i].Gpt.PartitionType.Data3 == 0 &&
((PULONGLONG)PartitionEntries[i].Gpt.PartitionType.Data4)[0] == 0)
{
/* Skip unused partition */
if (IsEqualGUID(&PartitionEntries[i].Gpt.PartitionType, &PARTITION_ENTRY_UNUSED_GUID))
continue;
}
/* Copy the entry in the partition entry format */
FstubCopyEntryEFI(&Entry, &PartitionEntries[i], Disk->SectorSize);