Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-05 02:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:IO] arcname.c: Minor formatting fixes and comments improvements

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2024-06-11 22:32:27 +02:00
parent 29a56f326a
commit 85d338ed65
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ntoskrnl/io/iomgr/arcname.c
View file

@ -526,7 +526,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
Status = IoStatusBlock.Status; Status = IoStatusBlock.Status;
} }
/* If we didn't get the appriopriate data, just skip that disk */ /* If we didn't get the appropriate data, just skip that disk */
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ObDereferenceObject(FileObject); ObDereferenceObject(FileObject);
@ -715,7 +715,8 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
(DriveLayout->PartitionStyle == PARTITION_STYLE_MBR)) (DriveLayout->PartitionStyle == PARTITION_STYLE_MBR))
{ {
/* Create device name */ /* Create device name */
sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", (DeviceNumber.DeviceNumber != ULONG_MAX) ? DeviceNumber.DeviceNumber : DiskNumber); sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0",
(DeviceNumber.DeviceNumber != ULONG_MAX) ? DeviceNumber.DeviceNumber : DiskNumber);
RtlInitAnsiString(&DeviceStringA, Buffer); RtlInitAnsiString(&DeviceStringA, Buffer);
Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -736,15 +737,16 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
/* Link both */ /* Link both */
IoAssignArcName(&ArcNameStringW, &DeviceStringW); IoAssignArcName(&ArcNameStringW, &DeviceStringW);
/* And release resources */ /* And release strings */
RtlFreeUnicodeString(&ArcNameStringW); RtlFreeUnicodeString(&ArcNameStringW);
RtlFreeUnicodeString(&DeviceStringW); RtlFreeUnicodeString(&DeviceStringW);
/* Now, browse for every partition */ /* Now, browse each partition */
for (i = 1; i <= DriveLayout->PartitionCount; i++) for (i = 1; i <= DriveLayout->PartitionCount; i++)
{ {
/* Create device name */ /* Create device name */
sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu", (DeviceNumber.DeviceNumber != ULONG_MAX) ? DeviceNumber.DeviceNumber : DiskNumber, i); sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu",
(DeviceNumber.DeviceNumber != ULONG_MAX) ? DeviceNumber.DeviceNumber : DiskNumber, i);
RtlInitAnsiString(&DeviceStringA, Buffer); RtlInitAnsiString(&DeviceStringA, Buffer);
Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -949,47 +951,40 @@ IopVerifyDiskSignature(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout,
IN PARC_DISK_SIGNATURE ArcDiskSignature, IN PARC_DISK_SIGNATURE ArcDiskSignature,
OUT PULONG Signature) OUT PULONG Signature)
{ {
/* First condition: having a valid partition table */ /* Fail if the partition table is invalid */
if (!ArcDiskSignature->ValidPartitionTable) if (!ArcDiskSignature->ValidPartitionTable)
{
return FALSE; return FALSE;
}
/* If that partition table is the MBR */ /* If the partition style is MBR */
if (DriveLayout->PartitionStyle == PARTITION_STYLE_MBR) if (DriveLayout->PartitionStyle == PARTITION_STYLE_MBR)
{ {
/* Then check MBR signature */ /* Check the MBR signature */
if (DriveLayout->Mbr.Signature == ArcDiskSignature->Signature) if (DriveLayout->Mbr.Signature == ArcDiskSignature->Signature)
{ {
/* And return it */ /* And return it */
if (Signature) if (Signature)
{
*Signature = DriveLayout->Mbr.Signature; *Signature = DriveLayout->Mbr.Signature;
}
return TRUE; return TRUE;
} }
} }
/* If that partition table is the GPT */ /* If the partition style is GPT */
else if (DriveLayout->PartitionStyle == PARTITION_STYLE_GPT) else if (DriveLayout->PartitionStyle == PARTITION_STYLE_GPT)
{ {
/* Check we are using GPT and compare GUID */ /* Verify whether the signature is GPT and compare the GUID */
if (ArcDiskSignature->IsGpt && if (ArcDiskSignature->IsGpt &&
(((PULONG)ArcDiskSignature->GptSignature)[0] == DriveLayout->Gpt.DiskId.Data1 && (((PULONG)ArcDiskSignature->GptSignature)[0] == DriveLayout->Gpt.DiskId.Data1 &&
((PUSHORT)ArcDiskSignature->GptSignature)[2] == DriveLayout->Gpt.DiskId.Data2 && ((PUSHORT)ArcDiskSignature->GptSignature)[2] == DriveLayout->Gpt.DiskId.Data2 &&
((PUSHORT)ArcDiskSignature->GptSignature)[3] == DriveLayout->Gpt.DiskId.Data3 && ((PUSHORT)ArcDiskSignature->GptSignature)[3] == DriveLayout->Gpt.DiskId.Data3 &&
((PULONGLONG)ArcDiskSignature->GptSignature)[1] == ((PULONGLONG)DriveLayout->Gpt.DiskId.Data4)[0])) ((PULONGLONG)ArcDiskSignature->GptSignature)[1] == ((PULONGLONG)DriveLayout->Gpt.DiskId.Data4)[0]))
{ {
/* There's no signature to give, so we just zero output */ /* There is no signature to return, just zero it */
if (Signature) if (Signature)
{
*Signature = 0; *Signature = 0;
}
return TRUE; return TRUE;
} }
} }
/* If we fall here, it means that something went wrong, so return that */ /* If we get there, something went wrong, so fail */
return FALSE; return FALSE;
} }