Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:FSTUB] Minor formatting; put the PAGED_CODE() macros in evidence (instead of being lost in the declarations).

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2020-12-07 22:51:00 +01:00
parent 29615feeb6
commit fd053237cb
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
ntoskrnl/fstub/fstubex.c
View file

@ -167,6 +167,7 @@ FstubAdjustPartitionCount(IN ULONG SectorSize,
IN OUT PULONG PartitionCount) IN OUT PULONG PartitionCount)
{ {
ULONG Count; ULONG Count;
PAGED_CODE(); PAGED_CODE();
ASSERT(SectorSize); ASSERT(SectorSize);
@ -205,6 +206,7 @@ FstubAllocateDiskInformation(IN PDEVICE_OBJECT DeviceObject,
{ {
NTSTATUS Status; NTSTATUS Status;
PDISK_INFORMATION DiskInformation; PDISK_INFORMATION DiskInformation;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -265,6 +267,7 @@ FstubConvertExtendedToLayout(IN PDRIVE_LAYOUT_INFORMATION_EX LayoutEx)
{ {
ULONG i; ULONG i;
PDRIVE_LAYOUT_INFORMATION DriveLayout; PDRIVE_LAYOUT_INFORMATION DriveLayout;
PAGED_CODE(); PAGED_CODE();
ASSERT(LayoutEx); ASSERT(LayoutEx);
@ -335,6 +338,7 @@ FstubCreateDiskMBR(IN PDEVICE_OBJECT DeviceObject,
NTSTATUS Status; NTSTATUS Status;
PDISK_INFORMATION Disk = NULL; PDISK_INFORMATION Disk = NULL;
PMASTER_BOOT_RECORD MasterBootRecord; PMASTER_BOOT_RECORD MasterBootRecord;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -382,6 +386,7 @@ FstubCreateDiskEFI(IN PDEVICE_OBJECT DeviceObject,
PDISK_INFORMATION Disk = NULL; PDISK_INFORMATION Disk = NULL;
ULONGLONG FirstUsableLBA, LastUsableLBA; ULONGLONG FirstUsableLBA, LastUsableLBA;
ULONG MaxPartitionCount, SectorsForPartitions; ULONG MaxPartitionCount, SectorsForPartitions;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -449,6 +454,7 @@ FstubCreateDiskRaw(IN PDEVICE_OBJECT DeviceObject)
PDISK_INFORMATION Disk = NULL; PDISK_INFORMATION Disk = NULL;
PARTITION_STYLE PartitionStyle; PARTITION_STYLE PartitionStyle;
PMASTER_BOOT_RECORD MasterBootRecord; PMASTER_BOOT_RECORD MasterBootRecord;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -546,6 +552,7 @@ FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout)
{ {
ULONG i; ULONG i;
CHAR Guid[EFI_GUID_STRING_SIZE]; CHAR Guid[EFI_GUID_STRING_SIZE];
PAGED_CODE(); PAGED_CODE();
DPRINT("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout); DPRINT("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout);
@ -587,6 +594,7 @@ FstubDbgPrintPartitionEx(IN PPARTITION_INFORMATION_EX PartitionEntry,
IN ULONG PartitionNumber) IN ULONG PartitionNumber)
{ {
CHAR Guid[EFI_GUID_STRING_SIZE]; CHAR Guid[EFI_GUID_STRING_SIZE];
PAGED_CODE(); PAGED_CODE();
DPRINT("Printing partition %lu\n", PartitionNumber); DPRINT("Printing partition %lu\n", PartitionNumber);
@ -626,6 +634,7 @@ FstubDbgPrintSetPartitionEx(IN PSET_PARTITION_INFORMATION_EX PartitionEntry,
IN ULONG PartitionNumber) IN ULONG PartitionNumber)
{ {
CHAR Guid[EFI_GUID_STRING_SIZE]; CHAR Guid[EFI_GUID_STRING_SIZE];
PAGED_CODE(); PAGED_CODE();
DPRINT("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry); DPRINT("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry);
@ -657,6 +666,7 @@ FstubDetectPartitionStyle(IN PDISK_INFORMATION Disk,
{ {
NTSTATUS Status; NTSTATUS Status;
PPARTITION_DESCRIPTOR PartitionDescriptor; PPARTITION_DESCRIPTOR PartitionDescriptor;
PAGED_CODE(); PAGED_CODE();
ASSERT(IS_VALID_DISK_INFO(Disk)); ASSERT(IS_VALID_DISK_INFO(Disk));
@ -715,11 +725,12 @@ NTAPI
FstubGetDiskGeometry(IN PDEVICE_OBJECT DeviceObject, FstubGetDiskGeometry(IN PDEVICE_OBJECT DeviceObject,
OUT PDISK_GEOMETRY_EX Geometry) OUT PDISK_GEOMETRY_EX Geometry)
{ {
PIRP Irp;
NTSTATUS Status; NTSTATUS Status;
PIRP Irp;
PKEVENT Event = NULL; PKEVENT Event = NULL;
PDISK_GEOMETRY_EX DiskGeometry = NULL; PDISK_GEOMETRY_EX DiskGeometry = NULL;
PIO_STATUS_BLOCK IoStatusBlock = NULL; PIO_STATUS_BLOCK IoStatusBlock = NULL;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -814,6 +825,7 @@ FstubReadHeaderEFI(IN PDISK_INFORMATION Disk,
ULONGLONG StartingSector; ULONGLONG StartingSector;
PEFI_PARTITION_HEADER EFIHeader; PEFI_PARTITION_HEADER EFIHeader;
ULONG i, HeaderCRC32, PreviousCRC32, SectoredPartitionEntriesSize, LonelyPartitions; ULONG i, HeaderCRC32, PreviousCRC32, SectoredPartitionEntriesSize, LonelyPartitions;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -954,7 +966,7 @@ NTSTATUS
NTAPI NTAPI
FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk, FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
IN BOOLEAN ReadBackupTable, IN BOOLEAN ReadBackupTable,
OUT struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout) OUT PDRIVE_LAYOUT_INFORMATION_EX* DriveLayout)
{ {
NTSTATUS Status; NTSTATUS Status;
ULONG NumberOfEntries; ULONG NumberOfEntries;
@ -968,6 +980,7 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
#endif #endif
PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL;
ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector; ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -1105,12 +1118,13 @@ NTSTATUS
NTAPI NTAPI
FstubReadPartitionTableMBR(IN PDISK_INFORMATION Disk, FstubReadPartitionTableMBR(IN PDISK_INFORMATION Disk,
IN BOOLEAN ReturnRecognizedPartitions, IN BOOLEAN ReturnRecognizedPartitions,
OUT struct _DRIVE_LAYOUT_INFORMATION_EX** ReturnedDriveLayout) OUT PDRIVE_LAYOUT_INFORMATION_EX* ReturnedDriveLayout)
{ {
ULONG i;
NTSTATUS Status; NTSTATUS Status;
ULONG i;
PDRIVE_LAYOUT_INFORMATION DriveLayout = NULL; PDRIVE_LAYOUT_INFORMATION DriveLayout = NULL;
PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL;
PAGED_CODE(); PAGED_CODE();
ASSERT(IS_VALID_DISK_INFO(Disk)); ASSERT(IS_VALID_DISK_INFO(Disk));
@ -1174,12 +1188,13 @@ FstubReadSector(IN PDEVICE_OBJECT DeviceObject,
IN ULONGLONG StartingSector OPTIONAL, IN ULONGLONG StartingSector OPTIONAL,
OUT PVOID Buffer) OUT PVOID Buffer)
{ {
NTSTATUS Status;
PIRP Irp; PIRP Irp;
KEVENT Event; KEVENT Event;
NTSTATUS Status;
LARGE_INTEGER StartingOffset; LARGE_INTEGER StartingOffset;
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
PIO_STACK_LOCATION IoStackLocation; PIO_STACK_LOCATION IoStackLocation;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -1228,6 +1243,7 @@ FstubSetPartitionInformationEFI(IN PDISK_INFORMATION Disk,
{ {
NTSTATUS Status; NTSTATUS Status;
PDRIVE_LAYOUT_INFORMATION_EX Layout = NULL; PDRIVE_LAYOUT_INFORMATION_EX Layout = NULL;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -1277,6 +1293,7 @@ FstubVerifyPartitionTableEFI(IN PDISK_INFORMATION Disk,
PEFI_PARTITION_HEADER EFIHeader, ReadEFIHeader; PEFI_PARTITION_HEADER EFIHeader, ReadEFIHeader;
BOOLEAN PrimaryValid = FALSE, BackupValid = FALSE, WriteBackup; BOOLEAN PrimaryValid = FALSE, BackupValid = FALSE, WriteBackup;
ULONGLONG ReadPosition, WritePosition, SectorsForPartitions, PartitionIndex; ULONGLONG ReadPosition, WritePosition, SectorsForPartitions, PartitionIndex;
PAGED_CODE(); PAGED_CODE();
EFIHeader = ExAllocatePoolWithTag(NonPagedPool, sizeof(EFI_PARTITION_HEADER), TAG_FSTUB); EFIHeader = ExAllocatePoolWithTag(NonPagedPool, sizeof(EFI_PARTITION_HEADER), TAG_FSTUB);
@ -1404,6 +1421,7 @@ FstubWriteBootSectorEFI(IN PDISK_INFORMATION Disk)
NTSTATUS Status; NTSTATUS Status;
ULONG Signature = 0; ULONG Signature = 0;
PMASTER_BOOT_RECORD MasterBootRecord; PMASTER_BOOT_RECORD MasterBootRecord;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -1458,9 +1476,10 @@ FstubWriteEntryEFI(IN PDISK_INFORMATION Disk,
IN BOOLEAN ForceWrite, IN BOOLEAN ForceWrite,
OUT PULONG PartitionEntryCRC32 OPTIONAL) OUT PULONG PartitionEntryCRC32 OPTIONAL)
{ {
NTSTATUS Status = STATUS_SUCCESS;
ULONG Offset; ULONG Offset;
ULONGLONG FirstEntryLBA; ULONGLONG FirstEntryLBA;
NTSTATUS Status = STATUS_SUCCESS;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -1527,6 +1546,7 @@ FstubWriteHeaderEFI(IN PDISK_INFORMATION Disk,
IN BOOLEAN WriteBackupTable) IN BOOLEAN WriteBackupTable)
{ {
PEFI_PARTITION_HEADER EFIHeader; PEFI_PARTITION_HEADER EFIHeader;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -1617,6 +1637,7 @@ FstubWritePartitionTableEFI(IN PDISK_INFORMATION Disk,
NTSTATUS Status; NTSTATUS Status;
EFI_PARTITION_ENTRY Entry; EFI_PARTITION_ENTRY Entry;
ULONG i, WrittenPartitions, SectoredPartitionEntriesSize, PartitionEntryCRC32; ULONG i, WrittenPartitions, SectoredPartitionEntriesSize, PartitionEntryCRC32;
PAGED_CODE(); PAGED_CODE();
ASSERT(Disk); ASSERT(Disk);
@ -1691,6 +1712,7 @@ FstubWritePartitionTableMBR(IN PDISK_INFORMATION Disk,
{ {
NTSTATUS Status; NTSTATUS Status;
PDRIVE_LAYOUT_INFORMATION DriveLayout; PDRIVE_LAYOUT_INFORMATION DriveLayout;
PAGED_CODE(); PAGED_CODE();
ASSERT(IS_VALID_DISK_INFO(Disk)); ASSERT(IS_VALID_DISK_INFO(Disk));
@ -1722,12 +1744,13 @@ FstubWriteSector(IN PDEVICE_OBJECT DeviceObject,
IN ULONGLONG StartingSector OPTIONAL, IN ULONGLONG StartingSector OPTIONAL,
IN PVOID Buffer) IN PVOID Buffer)
{ {
NTSTATUS Status;
PIRP Irp; PIRP Irp;
KEVENT Event; KEVENT Event;
NTSTATUS Status;
LARGE_INTEGER StartingOffset; LARGE_INTEGER StartingOffset;
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
PIO_STACK_LOCATION IoStackLocation; PIO_STACK_LOCATION IoStackLocation;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -1776,9 +1799,10 @@ FstubWriteSector(IN PDEVICE_OBJECT DeviceObject,
NTSTATUS NTSTATUS
NTAPI NTAPI
IoCreateDisk(IN PDEVICE_OBJECT DeviceObject, IoCreateDisk(IN PDEVICE_OBJECT DeviceObject,
IN struct _CREATE_DISK* Disk) IN PCREATE_DISK Disk)
{ {
PARTITION_STYLE PartitionStyle; PARTITION_STYLE PartitionStyle;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -1807,6 +1831,7 @@ NTAPI
IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation,
IN ULONG Size) IN ULONG Size)
{ {
NTSTATUS Status = STATUS_SUCCESS;
PIRP Irp; PIRP Irp;
KEVENT Event; KEVENT Event;
PLIST_ENTRY NextEntry; PLIST_ENTRY NextEntry;
@ -1816,7 +1841,6 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation,
UNICODE_STRING DeviceStringW; UNICODE_STRING DeviceStringW;
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
CHAR Buffer[128], ArcBuffer[128]; CHAR Buffer[128], ArcBuffer[128];
NTSTATUS Status = STATUS_SUCCESS;
BOOLEAN SingleDisk, IsBootDiskInfoEx; BOOLEAN SingleDisk, IsBootDiskInfoEx;
PARC_DISK_SIGNATURE ArcDiskSignature; PARC_DISK_SIGNATURE ArcDiskSignature;
PARC_DISK_INFORMATION ArcDiskInformation; PARC_DISK_INFORMATION ArcDiskInformation;
@ -1825,6 +1849,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation,
ULONG DiskCount, DiskNumber, Signature, PartitionNumber; ULONG DiskCount, DiskNumber, Signature, PartitionNumber;
ANSI_STRING ArcBootString, ArcSystemString, DeviceStringA, ArcNameStringA; ANSI_STRING ArcBootString, ArcSystemString, DeviceStringA, ArcNameStringA;
extern PLOADER_PARAMETER_BLOCK IopLoaderBlock; extern PLOADER_PARAMETER_BLOCK IopLoaderBlock;
PAGED_CODE(); PAGED_CODE();
/* Get loader block. If it's null, we come to late */ /* Get loader block. If it's null, we come to late */
@ -2139,11 +2164,12 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject,
IN ULONG BytesPerSector, IN ULONG BytesPerSector,
OUT PDISK_SIGNATURE Signature) OUT PDISK_SIGNATURE Signature)
{ {
PUCHAR Buffer;
NTSTATUS Status; NTSTATUS Status;
PUCHAR Buffer;
ULONG HeaderCRC32, i, CheckSum; ULONG HeaderCRC32, i, CheckSum;
PEFI_PARTITION_HEADER EFIHeader; PEFI_PARTITION_HEADER EFIHeader;
PPARTITION_DESCRIPTOR PartitionDescriptor; PPARTITION_DESCRIPTOR PartitionDescriptor;
PAGED_CODE(); PAGED_CODE();
/* Ensure we'll read at least 512 bytes */ /* Ensure we'll read at least 512 bytes */
@ -2242,11 +2268,12 @@ Cleanup:
NTSTATUS NTSTATUS
NTAPI NTAPI
IoReadPartitionTableEx(IN PDEVICE_OBJECT DeviceObject, IoReadPartitionTableEx(IN PDEVICE_OBJECT DeviceObject,
IN struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout) IN PDRIVE_LAYOUT_INFORMATION_EX* DriveLayout)
{ {
NTSTATUS Status; NTSTATUS Status;
PDISK_INFORMATION Disk; PDISK_INFORMATION Disk;
PARTITION_STYLE PartitionStyle; PARTITION_STYLE PartitionStyle;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -2310,11 +2337,12 @@ NTSTATUS
NTAPI NTAPI
IoSetPartitionInformationEx(IN PDEVICE_OBJECT DeviceObject, IoSetPartitionInformationEx(IN PDEVICE_OBJECT DeviceObject,
IN ULONG PartitionNumber, IN ULONG PartitionNumber,
IN struct _SET_PARTITION_INFORMATION_EX* PartitionInfo) IN PSET_PARTITION_INFORMATION_EX PartitionInfo)
{ {
NTSTATUS Status; NTSTATUS Status;
PDISK_INFORMATION Disk; PDISK_INFORMATION Disk;
PARTITION_STYLE PartitionStyle; PARTITION_STYLE PartitionStyle;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -2379,6 +2407,7 @@ IoVerifyPartitionTable(IN PDEVICE_OBJECT DeviceObject,
NTSTATUS Status; NTSTATUS Status;
PDISK_INFORMATION Disk; PDISK_INFORMATION Disk;
PARTITION_STYLE PartitionStyle; PARTITION_STYLE PartitionStyle;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -2426,14 +2455,15 @@ IoVerifyPartitionTable(IN PDEVICE_OBJECT DeviceObject,
NTSTATUS NTSTATUS
NTAPI NTAPI
IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject, IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject,
IN struct _DRIVE_LAYOUT_INFORMATION_EX* DriveLayout) IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout)
{ {
GUID DiskGuid;
NTSTATUS Status; NTSTATUS Status;
GUID DiskGuid;
ULONG NumberOfEntries; ULONG NumberOfEntries;
PDISK_INFORMATION Disk; PDISK_INFORMATION Disk;
PEFI_PARTITION_HEADER EfiHeader; PEFI_PARTITION_HEADER EfiHeader;
ULONGLONG SectorsForPartitions, FirstUsableLBA, LastUsableLBA; ULONGLONG SectorsForPartitions, FirstUsableLBA, LastUsableLBA;
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);