Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/04: [KMTESTS] Add more tests for CcCopyWrite
by Jérôme Gardou 08 Dec '20

08 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08cf040dd593d22e9aab1… commit 08cf040dd593d22e9aab12b80cd2b895ba8f39ca Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 8 09:02:28 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 8 11:48:00 2020 +0100 [KMTESTS] Add more tests for CcCopyWrite --- modules/rostests/kmtests/ntos_cc/CcCopyWrite_drv.c | 162 +++++++++++++++++++-- .../rostests/kmtests/ntos_cc/CcCopyWrite_user.c | 13 +- 2 files changed, 158 insertions(+), 17 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcCopyWrite_drv.c b/modules/rostests/kmtests/ntos_cc/CcCopyWrite_drv.c index 9404be1c143..b8487fa6c74 100644 --- a/modules/rostests/kmtests/ntos_cc/CcCopyWrite_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcCopyWrite_drv.c @@ -22,6 +22,11 @@ static PFILE_OBJECT TestFileObject; static PDEVICE_OBJECT TestDeviceObject; static KMT_IRP_HANDLER TestIrpHandler; static FAST_IO_DISPATCH TestFastIoDispatch; +static BOOLEAN InBehaviourTest; + +BOOLEAN ReadCalled; +LARGE_INTEGER ReadOffset; +ULONG ReadLength; static BOOLEAN @@ -169,6 +174,101 @@ MapAndLockUserBuffer( return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); } +static +void +reset_read(void) +{ + ReadCalled = FALSE; + ReadOffset.QuadPart = MAXLONGLONG; + ReadLength = MAXULONG; +} + +#define ok_read_called(_Offset, _Length) do { \ + ok(ReadCalled, "CcCopyWrite should have triggerred a read.\n"); \ + ok_eq_longlong(ReadOffset.QuadPart, _Offset); \ + ok_eq_ulong(ReadLength, _Length); \ +}while(0) + +#define ok_read_not_called() ok(!ReadCalled, "CcCopyWrite shouldn't have triggered a read.\n") + +static +VOID +Test_CcCopyWrite(PFILE_OBJECT FileObject) +{ + + BOOLEAN Ret; + LARGE_INTEGER Offset; + CHAR Buffer[10]; + + memset(Buffer, 0xAC, 10); + + /* Test bogus file object & file offset */ + Ret = 'x'; + KmtStartSeh() + Ret = CcCopyWrite(FileObject, NULL, 0, FALSE, NULL); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_char(Ret, 'x'); + + Ret = 'x'; + Offset.QuadPart = 0; + KmtStartSeh() + Ret = CcCopyWrite(NULL, &Offset, 10, FALSE, Buffer); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_char(Ret, 'x'); + + /* What happens on invalid buffer */ + Ret = 'x'; + Offset.QuadPart = 0; + reset_read(); + KmtStartSeh() + Ret = CcCopyWrite(FileObject, &Offset, 0, TRUE, NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_bool_true(Ret, "CcCopyWrite(0, NULL) should succeed\n"); + /* When there is nothing to write, there is no reason to read */ + ok_read_not_called(); + + Ret = 'x'; + Offset.QuadPart = 0; + reset_read(); + KmtStartSeh() + Ret = CcCopyWrite(FileObject, &Offset, 10, TRUE, NULL); + KmtEndSeh(STATUS_INVALID_USER_BUFFER); + ok_eq_char(Ret, 'x'); + /* This raises an exception, but it actually triggered a read */ + ok_read_called(0, PAGE_SIZE); + + /* So this one succeeds, as the page is now resident */ + Ret = 'x'; + Offset.QuadPart = 0; + reset_read(); + KmtStartSeh() + Ret = CcCopyWrite(FileObject, &Offset, 10, FALSE, Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok_bool_true(Ret, "CcCopyWrite should succeed\n"); + /* But there was no read triggered, as the page is already resident. */ + ok_read_not_called(); + + /* But this one doesn't */ + Ret = 'x'; + Offset.QuadPart = PAGE_SIZE; + reset_read(); + KmtStartSeh() + Ret = CcCopyWrite(FileObject, &Offset, 10, FALSE, Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok_bool_false(Ret, "CcCopyWrite should fail\n"); + /* But it triggered a read anyway. */ + ok_read_called(PAGE_SIZE, PAGE_SIZE); + + /* Of course, waiting for it succeeds and triggers the read */ + Ret = 'x'; + Offset.QuadPart = PAGE_SIZE * 2; + reset_read(); + KmtStartSeh() + Ret = CcCopyWrite(FileObject, &Offset, 10, TRUE, Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok_bool_true(Ret, "CcCopyWrite should succeed\n"); + ok_read_called(PAGE_SIZE * 2, PAGE_SIZE); +} static NTSTATUS @@ -238,7 +338,7 @@ TestIrpHandler( IoStack->FileObject->FsContext = Fcb; IoStack->FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; - CcInitializeCacheMap(IoStack->FileObject, + CcInitializeCacheMap(IoStack->FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, FALSE, &Callbacks, NULL); @@ -264,6 +364,10 @@ TestIrpHandler( ok((Offset.QuadPart == 0 || Offset.QuadPart == 4096 || Offset.QuadPart == 8192), "Unexpected offset: %I64i\n", Offset.QuadPart); ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); + ReadCalled = TRUE; + ReadOffset = Offset; + ReadLength = Length; + ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); Buffer = MapAndLockUserBuffer(Irp, Length); ok(Buffer != NULL, "Null pointer!\n"); @@ -287,40 +391,64 @@ TestIrpHandler( ULONG Length; PVOID Buffer; LARGE_INTEGER Offset; + static const UNICODE_STRING BehaviourTestFileName = RTL_CONSTANT_STRING(L"\\BehaviourTestFile"); Offset = IoStack->Parameters.Read.ByteOffset; Length = IoStack->Parameters.Read.Length; Fcb = IoStack->FileObject->FsContext; + ok_bool_false(InBehaviourTest, "Shouldn't trigger write from CcCopyWrite\n"); + /* Check special file name */ + InBehaviourTest = RtlCompareUnicodeString(&IoStack->FileObject->FileName, &BehaviourTestFileName, TRUE) == 0; + if (!FlagOn(Irp->Flags, IRP_NOCACHE)) { BOOLEAN Ret; ok_irql(PASSIVE_LEVEL); - Buffer = Irp->AssociatedIrp.SystemBuffer; - ok(Buffer != NULL, "Null pointer!\n"); - - Fcb->WriteLength = Length; - - _SEH2_TRY + if (InBehaviourTest) { - Ret = CcCopyWrite(IoStack->FileObject, &Offset, Length, TRUE, Buffer); - ok_bool_true(Ret, "CcCopyWrite"); + Test_CcCopyWrite(IoStack->FileObject); + Status = Irp->IoStatus.Status = STATUS_SUCCESS; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + else { - Irp->IoStatus.Status = _SEH2_GetExceptionCode(); + Buffer = Irp->AssociatedIrp.SystemBuffer; + ok(Buffer != NULL, "Null pointer!\n"); + + Fcb->WriteLength = Length; + + _SEH2_TRY + { + Ret = CcCopyWrite(IoStack->FileObject, &Offset, Length, TRUE, Buffer); + ok_bool_true(Ret, "CcCopyWrite"); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Irp->IoStatus.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + Status = Irp->IoStatus.Status; } - _SEH2_END; - - Status = Irp->IoStatus.Status; } else { ok_irql(PASSIVE_LEVEL); - ok((Offset.QuadPart == 0 || Offset.QuadPart == 4096), "Unexpected offset: %I64i\n", Offset.QuadPart); - ok_eq_ulong(Length, ROUND_TO_PAGES(Fcb->WriteLength)); + + if (InBehaviourTest) + { + /* We wrote only to the 1st and 3rd page */ + ok((Offset.QuadPart == 0) || (Offset.QuadPart == PAGE_SIZE * 2), "Expected a non-cached write on 1st or 3rd page\n"); + /* We wrote that much with CcCopyWrite */ + ok_eq_ulong(Length, PAGE_SIZE); + } + else + { + ok((Offset.QuadPart == 0 || Offset.QuadPart == 4096), "Unexpected offset: %I64i\n", Offset.QuadPart); + ok_eq_ulong(Length, ROUND_TO_PAGES(Fcb->WriteLength)); + } ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); Buffer = MapAndLockUserBuffer(Irp, Length); @@ -335,6 +463,8 @@ TestIrpHandler( ok((Mdl->MdlFlags & MDL_IO_PAGE_READ) == 0, "MDL for read paging IO\n"); ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); } + + InBehaviourTest = FALSE; } else if (IoStack->MajorFunction == IRP_MJ_FLUSH_BUFFERS) { diff --git a/modules/rostests/kmtests/ntos_cc/CcCopyWrite_user.c b/modules/rostests/kmtests/ntos_cc/CcCopyWrite_user.c index 1b5f8d61876..3626cc16d0f 100644 --- a/modules/rostests/kmtests/ntos_cc/CcCopyWrite_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcCopyWrite_user.c @@ -19,7 +19,8 @@ START_TEST(CcCopyWrite) UNICODE_STRING SmallFile = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-CcCopyWrite\\SmallFile"); UNICODE_STRING VerySmallFile = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-CcCopyWrite\\VerySmallFile"); UNICODE_STRING NormalFile = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-CcCopyWrite\\NormalFile"); - + UNICODE_STRING BehaviourTestFile = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-CcCopyWrite\\BehaviourTestFile"); + KmtLoadDriver(L"CcCopyWrite", FALSE); KmtOpenDriver(); @@ -88,6 +89,16 @@ START_TEST(CcCopyWrite) NtClose(Handle); + InitializeObjectAttributes(&ObjectAttributes, &BehaviourTestFile, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, 0, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + ok_eq_hex(Status, STATUS_SUCCESS); + + ByteOffset.QuadPart = 4097; + Status = NtWriteFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 4097, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + NtClose(Handle); + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); KmtCloseDriver(); KmtUnloadDriver();

1 0

[reactos] 01/01: [NTOS:CONFIG] Release the lock in a failure case in CmLoadKey
by Victor Perevertkin 08 Dec '20

08 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=016dc28793aafe95029f3… commit 016dc28793aafe95029f3e9c462d2be56ab3c32d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 8 13:44:27 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 8 13:44:27 2020 +0300 [NTOS:CONFIG] Release the lock in a failure case in CmLoadKey This is a workaround, the real issue is still not resolved CORE-17263 --- ntoskrnl/config/cmapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index ee801a64aae..25daeb46c57 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -2130,6 +2130,7 @@ CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, DPRINT1("CmpLinkHiveToMaster failed, Status %lx\n", Status); /* FIXME: TODO */ // ASSERT(FALSE); see CORE-17263 + ExReleasePushLock(&CmpLoadHiveLock); } /* Is this first profile load? */

1 0

[reactos] 01/01: [SCSIPORT] Fix setting the "Driver" field in the DeviceMap\Scsi registry key
by Victor Perevertkin 07 Dec '20

07 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da1f4ed6af0e12669c05b… commit da1f4ed6af0e12669c05b1335b4e23af46946565 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 8 01:32:15 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 8 01:32:15 2020 +0300 [SCSIPORT] Fix setting the "Driver" field in the DeviceMap\Scsi registry key --- drivers/storage/port/scsiport/registry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/scsiport/registry.c b/drivers/storage/port/scsiport/registry.c index 3b9e235d752..24b197a81ef 100644 --- a/drivers/storage/port/scsiport/registry.c +++ b/drivers/storage/port/scsiport/registry.c @@ -212,13 +212,16 @@ RegistryInitAdapterKey( } /* Set 'Driver' (REG_SZ) value */ - PUNICODE_STRING driverNameU = &DeviceExtension->Common.DeviceObject->DriverObject->DriverName; + PUNICODE_STRING driverNameU = &DeviceExtension->Common.DeviceObject->DriverObject + ->DriverExtension->ServiceKeyName; + PWCHAR driverName = ExAllocatePoolWithTag(PagedPool, driverNameU->Length + sizeof(UNICODE_NULL), TAG_SCSIPORT); if (!driverName) { DPRINT("Failed to allocate driverName!\n"); + ZwClose(ScsiPortKey); return STATUS_INSUFFICIENT_RESOURCES; }

1 0

[reactos] 01/01: Implement the StorageCoInstaller and configure it for CD-ROM and Disk devices
by Eric Kohl 07 Dec '20

07 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9e20ae3fe8e687018127… commit d9e20ae3fe8e68701812782b35a3e9da8c30feef Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 7 23:16:39 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 7 23:17:29 2020 +0100 Implement the StorageCoInstaller and configure it for CD-ROM and Disk devices This sets the friendly name for CD-ROM and Disk devices. --- boot/bootdata/hivesys.inf | 4 +-- dll/win32/syssetup/classinst.c | 73 +++++++++++++++++++++++++++++++++++++++--- dll/win32/syssetup/install.c | 4 +-- dll/win32/syssetup/precomp.h | 1 + 4 files changed, 74 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index e5aba999df0..bbb94bc2ffd 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -402,8 +402,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955A ; Class Co-Installers HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E965-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" -HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E967-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E965-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,StorageCoInstaller","syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E967-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,StorageCoInstaller","syssetup.dll,CriticalDeviceCoInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96A-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96B-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96F-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" diff --git a/dll/win32/syssetup/classinst.c b/dll/win32/syssetup/classinst.c index d7ea97e1d0a..9ba49989ed2 100644 --- a/dll/win32/syssetup/classinst.c +++ b/dll/win32/syssetup/classinst.c @@ -377,7 +377,7 @@ ScsiClassInstaller( /* - * @unimplemented + * @implemented */ DWORD WINAPI @@ -387,12 +387,77 @@ StorageCoInstaller( IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN OUT PCOINSTALLER_CONTEXT_DATA Context) { - switch (InstallFunction) + ULONG ulStatus, ulProblem; + DWORD dwBufferSize = 0; + PWSTR pszDeviceDescription; + CONFIGRET ret; + + DPRINT("StorageCoInstaller(%u %p %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData, Context); + + if (InstallFunction != DIF_INSTALLDEVICE) + return ERROR_SUCCESS; + + if (Context->PostProcessing) { - default: - DPRINT1("Install function %u ignored\n", InstallFunction); + if (Context->PrivateData != NULL) + { + pszDeviceDescription = (PWSTR)Context->PrivateData; + + /* Store the device description as the friendly name */ + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_FRIENDLYNAME, + (PBYTE)pszDeviceDescription, + (wcslen(pszDeviceDescription) + 1) * sizeof(WCHAR)); + + /* Free the device description */ + HeapFree(GetProcessHeap(), 0, Context->PrivateData); + Context->PrivateData = NULL; + } + } + else + { + if (DeviceInfoData == NULL) + return ERROR_SUCCESS; + + ret = CM_Get_DevNode_Status(&ulStatus, &ulProblem, DeviceInfoData->DevInst, 0); + if (ret != CR_SUCCESS) + return ERROR_SUCCESS; + + if (ulStatus & DN_ROOT_ENUMERATED) return ERROR_SUCCESS; + + /* Get the device description size */ + SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_DEVICEDESC, + NULL, + NULL, + 0, + &dwBufferSize); + if (dwBufferSize == 0) + return ERROR_SUCCESS; + + /* Allocate the device description buffer */ + pszDeviceDescription = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwBufferSize); + if (pszDeviceDescription == NULL) + return ERROR_SUCCESS; + + /* Get the device description */ + SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_DEVICEDESC, + NULL, + (PBYTE)pszDeviceDescription, + dwBufferSize, + &dwBufferSize); + + Context->PrivateData = (PVOID)pszDeviceDescription; + return ERROR_DI_POSTPROCESSING_REQUIRED; } + + return ERROR_SUCCESS; } diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 5f5f92bcf7f..348ca43d663 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -26,8 +26,8 @@ #define NDEBUG #include <debug.h> -DWORD WINAPI -CMP_WaitNoPendingInstallEvents(DWORD dwTimeout); +//DWORD WINAPI +//CMP_WaitNoPendingInstallEvents(DWORD dwTimeout); DWORD WINAPI SetupStartService(LPCWSTR lpServiceName, BOOL bWait); diff --git a/dll/win32/syssetup/precomp.h b/dll/win32/syssetup/precomp.h index 18fdf66d807..e1e4c3f352c 100644 --- a/dll/win32/syssetup/precomp.h +++ b/dll/win32/syssetup/precomp.h @@ -17,6 +17,7 @@ #include <setupapi.h> #include <syssetup/syssetup.h> #include <pseh/pseh2.h> +#include <cfgmgr32.h> #include "globals.h" #include "resource.h"

1 0

[reactos] 02/02: [NTOS:FSTUB] Addendum to 29615fee and 8d2fe541: Further remove useless casts.
by Hermès Bélusca-Maïto 07 Dec '20

07 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d980c4a2c8786bfc1a4f… commit 3d980c4a2c8786bfc1a4fd4a48f8c2c5825db1ff Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 7 22:52:42 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 7 22:52:42 2020 +0100 [NTOS:FSTUB] Addendum to 29615fee and 8d2fe541: Further remove useless casts. Also, fix the MBR checksum calculation (missing ~CheckSum + 1), to fix the calculation in accordance with how MS calculates the MBR checksums (and what we do as well in https://github.com/reactos/reactos/blob/master/base/setup/lib/utils/partlis… https://github.com/reactos/reactos/blob/master/boot/freeldr/freeldr/arch/i3… ). --- ntoskrnl/fstub/fstubex.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index 16787bbd4df..84296e0a722 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -909,7 +909,7 @@ FstubReadHeaderEFI(IN PDISK_INFORMATION Disk, Status = FstubReadSector(Disk->DeviceObject, Disk->SectorSize, EFIHeader->PartitionEntryLBA + i, - (PUSHORT)Sector); + Sector); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Sector, TAG_FSTUB); @@ -929,7 +929,7 @@ FstubReadHeaderEFI(IN PDISK_INFORMATION Disk, Status = FstubReadSector(Disk->DeviceObject, Disk->SectorSize, EFIHeader->PartitionEntryLBA + i, - (PUSHORT)Sector); + Sector); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Sector, TAG_FSTUB); @@ -2189,7 +2189,7 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, Status = FstubReadSector(DeviceObject, BytesPerSector, 0ULL, - (PUSHORT)Buffer); + Buffer); if (!NT_SUCCESS(Status)) { goto Cleanup; @@ -2208,7 +2208,7 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, Status = FstubReadSector(DeviceObject, BytesPerSector, 1ULL, - (PUSHORT)Buffer); + Buffer); if (!NT_SUCCESS(Status)) { goto Cleanup; @@ -2245,10 +2245,11 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, else { /* Compute MBR checksum */ - for (i = 0, CheckSum = 0; i < 512; i += sizeof(INT32)) + for (i = 0, CheckSum = 0; i < 512; i += sizeof(UINT32)) { CheckSum += *(PUINT32)&Buffer[i]; } + CheckSum = ~CheckSum + 1; /* Set partition table style to MBR and return signature (offset 440) and checksum */ Signature->PartitionStyle = PARTITION_STYLE_MBR;

1 0

[reactos] 01/02: [NTOS:FSTUB] Minor formatting; put the PAGED_CODE() macros in evidence (instead of being lost in the declarations).
by Hermès Bélusca-Maïto 07 Dec '20

07 Dec '20

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

1 0

[reactos] 01/01: [FSTUB] Fix bugs from 8d2fe54188616fa5869468ecf108bf4af9a8624f
by Victor Perevertkin 07 Dec '20

07 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29615feeb6120ccf2c593… commit 29615feeb6120ccf2c593dc61ca812d769feb870 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Dec 7 19:50:51 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Dec 7 19:50:51 2020 +0300 [FSTUB] Fix bugs from 8d2fe54188616fa5869468ecf108bf4af9a8624f The buffer is now PUCHAR or PVOID everywhere --- ntoskrnl/fstub/disksup.c | 14 +++++++------- ntoskrnl/fstub/fstubex.c | 19 +++++++++---------- ntoskrnl/include/internal/hal.h | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index a685393b143..a27b8c35b8d 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1704,7 +1704,7 @@ xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject, if (NT_SUCCESS(Status)) { /* Validate the MBR Signature */ - if (((PUSHORT)Buffer)[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) + if (*(PUINT16)&Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) { /* Failed */ ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); @@ -1885,7 +1885,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (IsEzDrive && (Offset.QuadPart == 512)) Offset.QuadPart = 0; /* Make sure this is a valid MBR */ - if (((PUSHORT)Buffer)[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) + if (*(PUINT16)&Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) { /* It's not, fail */ DPRINT1("FSTUB: (IoReadPartitionTable) No 0xaa55 found in " @@ -2279,7 +2279,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, if (IsEzDrive && (Offset.QuadPart == 512)) Offset.QuadPart = 0; /* Make sure this is a valid MBR */ - if (((PUSHORT)Buffer)[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) + if (*(PUINT16)&Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) { /* It's not, fail */ Status = STATUS_BAD_MASTER_BOOT_RECORD; @@ -2395,7 +2395,7 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, PIRP Irp; NTSTATUS Status = STATUS_SUCCESS; ULONG BufferSize; - PUSHORT Buffer; + PUCHAR Buffer; PPTE Entry; PPARTITION_TABLE PartitionTable; LARGE_INTEGER Offset, NextOffset, ExtendedOffset, SectorOffset; @@ -2515,7 +2515,7 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, if (!IsSuperFloppy) { /* Set the boot record signature */ - ((PUSHORT)Buffer)[BOOT_SIGNATURE_OFFSET] = BOOT_RECORD_SIGNATURE; + *(PUINT16)&Buffer[BOOT_SIGNATURE_OFFSET] = BOOT_RECORD_SIGNATURE; /* By default, don't require a rewrite */ DoRewrite = FALSE; @@ -2524,10 +2524,10 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, if (!Offset.QuadPart) { /* Check if the signature doesn't match */ - if (*(PUINT32)&Buffer[PARTITION_TABLE_OFFSET] != PartitionBuffer->Signature) + if (*(PUINT32)&Buffer[DISK_SIGNATURE_OFFSET] != PartitionBuffer->Signature) { /* Then write the signature and now we need a rewrite */ - *(PUINT32)&Buffer[PARTITION_TABLE_OFFSET] = PartitionBuffer->Signature; + *(PUINT32)&Buffer[DISK_SIGNATURE_OFFSET] = PartitionBuffer->Signature; DoRewrite = TRUE; } } diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index 5e3a819ae7c..f0285301162 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -19,7 +19,7 @@ typedef struct _DISK_INFORMATION PDEVICE_OBJECT DeviceObject; ULONG SectorSize; DISK_GEOMETRY_EX DiskGeometry; - PUSHORT Buffer; + PUCHAR Buffer; ULONGLONG SectorCount; } DISK_INFORMATION, *PDISK_INFORMATION; @@ -122,7 +122,7 @@ NTAPI FstubReadSector(IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN ULONGLONG StartingSector OPTIONAL, - OUT PUSHORT Buffer + OUT PVOID Buffer ); NTSTATUS @@ -158,7 +158,7 @@ NTAPI FstubWriteSector(IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN ULONGLONG StartingSector OPTIONAL, - IN PUSHORT Buffer + IN PVOID Buffer ); VOID @@ -673,10 +673,9 @@ FstubDetectPartitionStyle(IN PDISK_INFORMATION Disk, } /* Get the partition descriptor array */ - PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(Disk->Buffer[PARTITION_TABLE_OFFSET / sizeof(Disk->Buffer[0])]); + PartitionDescriptor = (PPARTITION_DESCRIPTOR)&Disk->Buffer[PARTITION_TABLE_OFFSET]; /* If we have not the 0xAA55 then it's raw partition */ - if (Disk->Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) + if (*(PUINT16)&Disk->Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) { *PartitionStyle = PARTITION_STYLE_RAW; } @@ -865,7 +864,7 @@ FstubReadHeaderEFI(IN PDISK_INFORMATION Disk, /* Then zero the one in EFI header. This is needed to compute header checksum */ EFIHeader->HeaderCRC32 = 0; /* Compute header checksum and compare with the one present in partition table */ - if (RtlComputeCrc32(0, (PUCHAR)Disk->Buffer, sizeof(EFI_PARTITION_HEADER)) != HeaderCRC32) + if (RtlComputeCrc32(0, Disk->Buffer, sizeof(EFI_PARTITION_HEADER)) != HeaderCRC32) { DPRINT("EFI::Not matching header checksum!\n"); return STATUS_DISK_CORRUPT_ERROR; @@ -1173,7 +1172,7 @@ NTAPI FstubReadSector(IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN ULONGLONG StartingSector OPTIONAL, - OUT PUSHORT Buffer) + OUT PVOID Buffer) { PIRP Irp; KEVENT Event; @@ -1721,7 +1720,7 @@ NTAPI FstubWriteSector(IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN ULONGLONG StartingSector OPTIONAL, - IN PUSHORT Buffer) + IN PVOID Buffer) { PIRP Irp; KEVENT Event; @@ -2220,7 +2219,7 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, else { /* Compute MBR checksum */ - for (i = 0, CheckSum = 0; i < BytesPerSector / sizeof(UINT32); i++) + for (i = 0, CheckSum = 0; i < 512; i += sizeof(INT32)) { CheckSum += *(PUINT32)&Buffer[i]; } diff --git a/ntoskrnl/include/internal/hal.h b/ntoskrnl/include/internal/hal.h index b02b7575a60..d7e0e47b57d 100644 --- a/ntoskrnl/include/internal/hal.h +++ b/ntoskrnl/include/internal/hal.h @@ -242,7 +242,7 @@ xKdUnmapVirtualAddress( // #define DISK_SIGNATURE_OFFSET 0x1B8 #define PARTITION_TABLE_OFFSET 0x1BE -#define BOOT_SIGNATURE_OFFSET ((0x200 / sizeof(INT16)) - 1) +#define BOOT_SIGNATURE_OFFSET (0x200 - 2) #define BOOT_RECORD_SIGNATURE 0xAA55 #define NUM_PARTITION_TABLE_ENTRIES 4

1 0

[reactos] 01/01: [FSTUB] Fix out of bounds access in IoReadDiskSignature
by Victor Perevertkin 07 Dec '20

07 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d2fe54188616fa586946… commit 8d2fe54188616fa5869468ecf108bf4af9a8624f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Dec 7 14:43:34 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Dec 7 14:43:34 2020 +0300 [FSTUB] Fix out of bounds access in IoReadDiskSignature - Convert PARTITION_TABLE_OFFSET to the number of bytes instead of (number of bytes) / 2. This avoids many confusing casts - Use a cache aligned buffer for MBR --- ntoskrnl/fstub/disksup.c | 31 ++++++++++++------------------- ntoskrnl/fstub/fstubex.c | 12 ++++++------ ntoskrnl/include/internal/hal.h | 7 ++++--- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index 71d51873f94..a685393b143 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1712,8 +1712,7 @@ xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject, } /* Get the partition entry */ - PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(((PUSHORT)Buffer)[PARTITION_TABLE_OFFSET]); + PartitionDescriptor = (PPARTITION_DESCRIPTOR)&Buffer[PARTITION_TABLE_OFFSET]; /* Make sure it's what the caller wanted */ if (PartitionDescriptor->PartitionType != MbrTypeIdentifier) @@ -1831,7 +1830,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, DiskGeometryEx.DiskSize, MaxSector); /* Allocate our buffer */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, InputSize, TAG_FILE_SYSTEM); + Buffer = ExAllocatePoolWithTag(NonPagedPoolCacheAligned, InputSize, TAG_FILE_SYSTEM); if (!Buffer) { /* Fail, free the input buffer */ @@ -1901,12 +1900,11 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (!Offset.QuadPart) { /* Then read the signature off the disk */ - (*PartitionBuffer)->Signature = ((PULONG)Buffer)[PARTITION_TABLE_OFFSET / 2 - 1]; + (*PartitionBuffer)->Signature = *(PUINT32)&Buffer[DISK_SIGNATURE_OFFSET]; } /* Get the partition descriptor array */ - PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(((PUSHORT)Buffer)[PARTITION_TABLE_OFFSET]); + PartitionDescriptor = (PPARTITION_DESCRIPTOR)&Buffer[PARTITION_TABLE_OFFSET]; /* Start looping partitions */ j++; @@ -2091,8 +2089,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, Offset.QuadPart = 0; /* Go back to the descriptor array and loop it */ - PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(((PUSHORT)Buffer)[PARTITION_TABLE_OFFSET]); + PartitionDescriptor = (PPARTITION_DESCRIPTOR)&Buffer[PARTITION_TABLE_OFFSET]; for (Entry = 1; Entry <= NUM_PARTITION_TABLE_ENTRIES; Entry++, PartitionDescriptor++) { /* Check if this is a container partition, since we skipped them */ @@ -2237,7 +2234,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, } /* Allocate our partition buffer */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_FILE_SYSTEM); + Buffer = ExAllocatePoolWithTag(NonPagedPoolCacheAligned, PAGE_SIZE, TAG_FILE_SYSTEM); if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; /* Initialize the event we'll use and loop partitions */ @@ -2290,8 +2287,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, } /* Get the partition descriptors and loop them */ - PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(((PUSHORT)Buffer)[PARTITION_TABLE_OFFSET]); + PartitionDescriptor = (PPARTITION_DESCRIPTOR)&Buffer[PARTITION_TABLE_OFFSET]; for (Entry = 1; Entry <= NUM_PARTITION_TABLE_ENTRIES; Entry++, PartitionDescriptor++) { /* Check if it's unused or a container partition */ @@ -2352,8 +2348,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, if (Entry <= NUM_PARTITION_TABLE_ENTRIES) break; /* Nothing found yet, get the partition array again */ - PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(((PUSHORT)Buffer)[PARTITION_TABLE_OFFSET]); + PartitionDescriptor = (PPARTITION_DESCRIPTOR)&Buffer[PARTITION_TABLE_OFFSET]; for (Entry = 1; Entry <= NUM_PARTITION_TABLE_ENTRIES; Entry++, PartitionDescriptor++) { /* Check if this was a container partition (we skipped these) */ @@ -2469,7 +2464,7 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, DiskLayout->TableCount = (PartitionBuffer->PartitionCount + NUM_PARTITION_TABLE_ENTRIES - 1) / NUM_PARTITION_TABLE_ENTRIES; /* Allocate our partition buffer */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_FILE_SYSTEM); + Buffer = ExAllocatePoolWithTag(NonPagedPoolCacheAligned, PAGE_SIZE, TAG_FILE_SYSTEM); if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; /* Loop the entries */ @@ -2520,7 +2515,7 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, if (!IsSuperFloppy) { /* Set the boot record signature */ - Buffer[BOOT_SIGNATURE_OFFSET] = BOOT_RECORD_SIGNATURE; + ((PUSHORT)Buffer)[BOOT_SIGNATURE_OFFSET] = BOOT_RECORD_SIGNATURE; /* By default, don't require a rewrite */ DoRewrite = FALSE; @@ -2529,12 +2524,10 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, if (!Offset.QuadPart) { /* Check if the signature doesn't match */ - if (((PULONG)Buffer)[PARTITION_TABLE_OFFSET / 2 - 1] != - PartitionBuffer->Signature) + if (*(PUINT32)&Buffer[PARTITION_TABLE_OFFSET] != PartitionBuffer->Signature) { /* Then write the signature and now we need a rewrite */ - ((PULONG)Buffer)[PARTITION_TABLE_OFFSET / 2 - 1] = - PartitionBuffer->Signature; + *(PUINT32)&Buffer[PARTITION_TABLE_OFFSET] = PartitionBuffer->Signature; DoRewrite = TRUE; } } diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index c1ef4cdd47c..5e3a819ae7c 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -674,7 +674,7 @@ FstubDetectPartitionStyle(IN PDISK_INFORMATION Disk, /* Get the partition descriptor array */ PartitionDescriptor = (PPARTITION_DESCRIPTOR) - &(Disk->Buffer[PARTITION_TABLE_OFFSET]); + &(Disk->Buffer[PARTITION_TABLE_OFFSET / sizeof(Disk->Buffer[0])]); /* If we have not the 0xAA55 then it's raw partition */ if (Disk->Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) { @@ -2140,7 +2140,7 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, IN ULONG BytesPerSector, OUT PDISK_SIGNATURE Signature) { - PULONG Buffer; + PUCHAR Buffer; NTSTATUS Status; ULONG HeaderCRC32, i, CheckSum; PEFI_PARTITION_HEADER EFIHeader; @@ -2207,7 +2207,7 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, /* Then zero the one in EFI header. This is needed to compute header checksum */ EFIHeader->HeaderCRC32 = 0; /* Compute header checksum and compare with the one present in partition table */ - if (RtlComputeCrc32(0, (PUCHAR)Buffer, sizeof(EFI_PARTITION_HEADER)) != HeaderCRC32) + if (RtlComputeCrc32(0, Buffer, sizeof(EFI_PARTITION_HEADER)) != HeaderCRC32) { Status = STATUS_DISK_CORRUPT_ERROR; goto Cleanup; @@ -2220,14 +2220,14 @@ IoReadDiskSignature(IN PDEVICE_OBJECT DeviceObject, else { /* Compute MBR checksum */ - for (i = 0, CheckSum = 0; i < 512 / sizeof(ULONG) ; i++) + for (i = 0, CheckSum = 0; i < BytesPerSector / sizeof(UINT32); i++) { - CheckSum += Buffer[i]; + CheckSum += *(PUINT32)&Buffer[i]; } /* Set partition table style to MBR and return signature (offset 440) and checksum */ Signature->PartitionStyle = PARTITION_STYLE_MBR; - Signature->Mbr.Signature = Buffer[PARTITION_TABLE_OFFSET / 2 - 1]; + Signature->Mbr.Signature = *(PUINT32)&Buffer[DISK_SIGNATURE_OFFSET]; Signature->Mbr.CheckSum = CheckSum; } diff --git a/ntoskrnl/include/internal/hal.h b/ntoskrnl/include/internal/hal.h index 1e61d138eac..b02b7575a60 100644 --- a/ntoskrnl/include/internal/hal.h +++ b/ntoskrnl/include/internal/hal.h @@ -240,9 +240,10 @@ xKdUnmapVirtualAddress( // // Various offsets in the boot record // -#define PARTITION_TABLE_OFFSET (0x1BE / 2) -#define BOOT_SIGNATURE_OFFSET ((0x200 / 2) - 1) -#define BOOT_RECORD_RESERVED 0x1BC +#define DISK_SIGNATURE_OFFSET 0x1B8 +#define PARTITION_TABLE_OFFSET 0x1BE +#define BOOT_SIGNATURE_OFFSET ((0x200 / sizeof(INT16)) - 1) + #define BOOT_RECORD_SIGNATURE 0xAA55 #define NUM_PARTITION_TABLE_ENTRIES 4

1 0

[reactos] 01/01: [CMAKE] Add a NO_REACTOS_BUILDNO option
by Jérôme Gardou 07 Dec '20

07 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d4ece342c418eb85cb71… commit 5d4ece342c418eb85cb718d4b77e7bec15eb7611 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 30 14:43:26 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Dec 7 11:32:37 2020 +0100 [CMAKE] Add a NO_REACTOS_BUILDNO option This allows to not generate buildno.h and version.h after each commit and trigger the relinking of the complete module list --- sdk/include/reactos/version.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 0ca632f2b7c..4566a6a0ef7 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -1,4 +1,10 @@ -string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) +option(NO_REACTOS_BUILDNO "If true, disables the generation of buildno.h and version.h for each configure" OFF) + +if (NOT NO_REACTOS_BUILDNO) + string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) +else() + set(KERNEL_VERSION_BUILD "custom") +endif() set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") @@ -24,7 +30,7 @@ endif() set(COMMIT_HASH "unknown-hash") set(REVISION "unknown-revision") -if(EXISTS "${REACTOS_SOURCE_DIR}/.git") +if((EXISTS "${REACTOS_SOURCE_DIR}/.git") AND (NOT NO_REACTOS_BUILDNO)) find_package(Git) if(GIT_FOUND) execute_process(

1 0

[reactos] 01/01: [PSDK] Re-arrange DISK/DRIVE/PARTITION layout-related structures in ntdddisk.h and winioctl.h. Add few missing structures in winioctl.h.
by Hermès Bélusca-Maïto 06 Dec '20

06 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ae3d530dbd5ec7f5adff… commit 7ae3d530dbd5ec7f5adffdd14da6863c95f0af2c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 6 23:42:58 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 6 23:44:10 2020 +0100 [PSDK] Re-arrange DISK/DRIVE/PARTITION layout-related structures in ntdddisk.h and winioctl.h. Add few missing structures in winioctl.h. --- sdk/include/psdk/ntdddisk.h | 226 ++++++++++++++++---------------- sdk/include/psdk/winioctl.h | 309 +++++++++++++++++++++++++------------------- 2 files changed, 295 insertions(+), 240 deletions(-) diff --git a/sdk/include/psdk/ntdddisk.h b/sdk/include/psdk/ntdddisk.h index 3fe648c4cc3..b1b22d53f40 100644 --- a/sdk/include/psdk/ntdddisk.h +++ b/sdk/include/psdk/ntdddisk.h @@ -355,7 +355,10 @@ extern "C" { ((PartitionType) == PARTITION_XINT13)) #endif -#if(_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= 0x0500) +/* Actually it should be > 0x0500, since this is not present in Windows 2000; + * however we keep >= 0x0500 for compatibility with MS PSDK. */ + #define GPT_ATTRIBUTE_PLATFORM_REQUIRED 0x00000001 #define GPT_BASIC_DATA_ATTRIBUTE_READ_ONLY 0x10000000 #define GPT_BASIC_DATA_ATTRIBUTE_SHADOW_COPY 0x20000000 @@ -398,6 +401,69 @@ typedef enum _MEDIA_TYPE { F3_32M_512 } MEDIA_TYPE, *PMEDIA_TYPE; +typedef struct _DISK_GEOMETRY { + LARGE_INTEGER Cylinders; + MEDIA_TYPE MediaType; + ULONG TracksPerCylinder; + ULONG SectorsPerTrack; + ULONG BytesPerSector; +} DISK_GEOMETRY, *PDISK_GEOMETRY; + +typedef struct _PARTITION_INFORMATION { + LARGE_INTEGER StartingOffset; + LARGE_INTEGER PartitionLength; + ULONG HiddenSectors; + ULONG PartitionNumber; + UCHAR PartitionType; + BOOLEAN BootIndicator; + BOOLEAN RecognizedPartition; + BOOLEAN RewritePartition; +} PARTITION_INFORMATION, *PPARTITION_INFORMATION; + +typedef struct _DRIVE_LAYOUT_INFORMATION { + ULONG PartitionCount; + ULONG Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; + +typedef struct _SET_PARTITION_INFORMATION { + UCHAR PartitionType; +} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION; + +#if (_WIN32_WINNT >= 0x0500) +/* Actually it should be > 0x0500, since this is not present in Windows 2000; + * however we keep >= 0x0500 for compatibility with MS PSDK. */ + +typedef enum _PARTITION_STYLE { + PARTITION_STYLE_MBR, + PARTITION_STYLE_GPT, + PARTITION_STYLE_RAW, +#ifdef __REACTOS__ + /* ReactOS custom partition handlers */ + PARTITION_STYLE_BRFR = 128 /* Xbox-BRFR partitioning scheme */ +#endif +} PARTITION_STYLE; + +typedef struct _CREATE_DISK_GPT +{ + GUID DiskId; + ULONG MaxPartitionCount; +} CREATE_DISK_GPT, *PCREATE_DISK_GPT; + +typedef struct _CREATE_DISK_MBR +{ + ULONG Signature; +} CREATE_DISK_MBR, *PCREATE_DISK_MBR; + +typedef struct _CREATE_DISK +{ + PARTITION_STYLE PartitionStyle; + union { + CREATE_DISK_MBR Mbr; + CREATE_DISK_GPT Gpt; + }; +} CREATE_DISK, *PCREATE_DISK; + typedef enum _DETECTION_TYPE { DetectNone, DetectInt13, @@ -434,13 +500,19 @@ typedef struct _DISK_DETECTION_INFO { } DUMMYUNIONNAME; } DISK_DETECTION_INFO, *PDISK_DETECTION_INFO; -typedef struct _DISK_GEOMETRY { - LARGE_INTEGER Cylinders; - MEDIA_TYPE MediaType; - ULONG TracksPerCylinder; - ULONG SectorsPerTrack; - ULONG BytesPerSector; -} DISK_GEOMETRY, *PDISK_GEOMETRY; +typedef struct _DISK_PARTITION_INFO { + ULONG SizeOfPartitionInfo; + PARTITION_STYLE PartitionStyle; + _ANONYMOUS_UNION union { + struct { + ULONG Signature; + ULONG CheckSum; + } Mbr; + struct { + GUID DiskId; + } Gpt; + } DUMMYUNIONNAME; +} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO; typedef struct _DISK_GEOMETRY_EX { DISK_GEOMETRY Geometry; @@ -464,17 +536,6 @@ typedef struct _DISK_GEOMETRY_EX { DiskGeometryGetPartition(Geometry)->SizeOfPartitionInfo))) #endif -typedef struct _PARTITION_INFORMATION { - LARGE_INTEGER StartingOffset; - LARGE_INTEGER PartitionLength; - ULONG HiddenSectors; - ULONG PartitionNumber; - UCHAR PartitionType; - BOOLEAN BootIndicator; - BOOLEAN RecognizedPartition; - BOOLEAN RewritePartition; -} PARTITION_INFORMATION, *PPARTITION_INFORMATION; - typedef struct _PARTITION_INFORMATION_GPT { GUID PartitionType; GUID PartitionId; @@ -482,45 +543,6 @@ typedef struct _PARTITION_INFORMATION_GPT { WCHAR Name [36]; } PARTITION_INFORMATION_GPT, *PPARTITION_INFORMATION_GPT; -typedef enum _PARTITION_STYLE { - PARTITION_STYLE_MBR, - PARTITION_STYLE_GPT, - PARTITION_STYLE_RAW, -#ifdef __REACTOS__ - /* ReactOS custom partition handlers */ - PARTITION_STYLE_BRFR = 128 /* Xbox-BRFR partitioning scheme */ -#endif -} PARTITION_STYLE; - -typedef struct _DISK_PARTITION_INFO { - ULONG SizeOfPartitionInfo; - PARTITION_STYLE PartitionStyle; - _ANONYMOUS_UNION union { - struct { - ULONG Signature; - ULONG CheckSum; - } Mbr; - struct { - GUID DiskId; - } Gpt; - } DUMMYUNIONNAME; -} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO; - -typedef struct _DISK_PERFORMANCE { - LARGE_INTEGER BytesRead; - LARGE_INTEGER BytesWritten; - LARGE_INTEGER ReadTime; - LARGE_INTEGER WriteTime; - LARGE_INTEGER IdleTime; - ULONG ReadCount; - ULONG WriteCount; - ULONG QueueDepth; - ULONG SplitCount; - LARGE_INTEGER QueryTime; - ULONG StorageDeviceNumber; - WCHAR StorageManagerName[8]; -} DISK_PERFORMANCE, *PDISK_PERFORMANCE; - typedef struct _PARTITION_INFORMATION_MBR { UCHAR PartitionType; BOOLEAN BootIndicator; @@ -543,19 +565,6 @@ typedef struct _PARTITION_INFORMATION_EX { } DUMMYUNIONNAME; } PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX; -typedef struct _DRIVE_LAYOUT_INFORMATION { - ULONG PartitionCount; - ULONG Signature; - PARTITION_INFORMATION PartitionEntry[1]; -} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; - -typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { - ULONG Signature; -#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) - ULONG CheckSum; -#endif -} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; - typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { GUID DiskId; LARGE_INTEGER StartingUsableOffset; @@ -563,6 +572,13 @@ typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { ULONG MaxPartitionCount; } DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT; +typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { + ULONG Signature; +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) + ULONG CheckSum; +#endif +} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; + typedef struct _DRIVE_LAYOUT_INFORMATION_EX { ULONG PartitionStyle; ULONG PartitionCount; @@ -573,6 +589,34 @@ typedef struct _DRIVE_LAYOUT_INFORMATION_EX { PARTITION_INFORMATION_EX PartitionEntry[1]; } DRIVE_LAYOUT_INFORMATION_EX, *PDRIVE_LAYOUT_INFORMATION_EX; +typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR; +typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT; + +typedef struct _SET_PARTITION_INFORMATION_EX { + PARTITION_STYLE PartitionStyle; + _ANONYMOUS_UNION union { + SET_PARTITION_INFORMATION_MBR Mbr; + SET_PARTITION_INFORMATION_GPT Gpt; + } DUMMYUNIONNAME; +} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX; + +#endif // (_WIN32_WINNT >= 0x0500) + +typedef struct _DISK_PERFORMANCE { + LARGE_INTEGER BytesRead; + LARGE_INTEGER BytesWritten; + LARGE_INTEGER ReadTime; + LARGE_INTEGER WriteTime; + LARGE_INTEGER IdleTime; + ULONG ReadCount; + ULONG WriteCount; + ULONG QueueDepth; + ULONG SplitCount; + LARGE_INTEGER QueryTime; + ULONG StorageDeviceNumber; + WCHAR StorageManagerName[8]; +} DISK_PERFORMANCE, *PDISK_PERFORMANCE; + typedef struct _FORMAT_EX_PARAMETERS { MEDIA_TYPE MediaType; ULONG StartCylinderNumber; @@ -608,21 +652,6 @@ typedef struct _REASSIGN_BLOCKS_EX { LARGE_INTEGER BlockNumber[1]; } REASSIGN_BLOCKS_EX, *PREASSIGN_BLOCKS_EX; -typedef struct _SET_PARTITION_INFORMATION { - UCHAR PartitionType; -} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION; - -typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR; -typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT; - -typedef struct _SET_PARTITION_INFORMATION_EX { - PARTITION_STYLE PartitionStyle; - _ANONYMOUS_UNION union { - SET_PARTITION_INFORMATION_MBR Mbr; - SET_PARTITION_INFORMATION_GPT Gpt; - } DUMMYUNIONNAME; -} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX; - typedef struct _VERIFY_INFORMATION { LARGE_INTEGER StartingOffset; ULONG Length; @@ -733,30 +762,7 @@ typedef struct _MAPPED_ADDRESS { } MAPPED_ADDRESS, *PMAPPED_ADDRESS; - -#if(_WIN32_WINNT >= 0x0500) - -typedef struct _CREATE_DISK_GPT -{ - GUID DiskId; - ULONG MaxPartitionCount; -} CREATE_DISK_GPT, *PCREATE_DISK_GPT; - -typedef struct _CREATE_DISK_MBR -{ - ULONG Signature; -} CREATE_DISK_MBR, *PCREATE_DISK_MBR; - - -typedef struct _CREATE_DISK -{ - PARTITION_STYLE PartitionStyle; - union { - CREATE_DISK_MBR Mbr; - CREATE_DISK_GPT Gpt; - }; -} CREATE_DISK, *PCREATE_DISK; - +#if (_WIN32_WINNT >= 0x0500) typedef enum { EqualPriority, diff --git a/sdk/include/psdk/winioctl.h b/sdk/include/psdk/winioctl.h index 0ba8f1be885..f10c4b41678 100644 --- a/sdk/include/psdk/winioctl.h +++ b/sdk/include/psdk/winioctl.h @@ -237,50 +237,87 @@ typedef struct _BIN_RESULTS { DWORD NumberOfBins; BIN_COUNT BinCounts[1]; } BIN_RESULTS,*PBIN_RESULTS; + +typedef enum _MEDIA_TYPE { + Unknown, + F5_1Pt2_512, + F3_1Pt44_512, + F3_2Pt88_512, + F3_20Pt8_512, + F3_720_512, + F5_360_512, + F5_320_512, + F5_320_1024, + F5_180_512, + F5_160_512, + RemovableMedia, + FixedMedia, + F3_120M_512, + F3_640_512, + F5_640_512, + F5_720_512, + F3_1Pt2_512, + F3_1Pt23_1024, + F5_1Pt23_1024, + F3_128Mb_512, + F3_230Mb_512, + F8_256_128, + F3_200Mb_512, + F3_240M_512, + F3_32M_512 +} MEDIA_TYPE,*PMEDIA_TYPE; + +typedef struct _DISK_GEOMETRY { + LARGE_INTEGER Cylinders; + MEDIA_TYPE MediaType; + DWORD TracksPerCylinder; + DWORD SectorsPerTrack; + DWORD BytesPerSector; +} DISK_GEOMETRY,*PDISK_GEOMETRY; +typedef struct _PARTITION_INFORMATION { + LARGE_INTEGER StartingOffset; + LARGE_INTEGER PartitionLength; + DWORD HiddenSectors; + DWORD PartitionNumber; + BYTE PartitionType; + BOOLEAN BootIndicator; + BOOLEAN RecognizedPartition; + BOOLEAN RewritePartition; +} PARTITION_INFORMATION,*PPARTITION_INFORMATION; +typedef struct _DRIVE_LAYOUT_INFORMATION { + DWORD PartitionCount; + DWORD Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; +typedef struct _SET_PARTITION_INFORMATION { + BYTE PartitionType; +} SET_PARTITION_INFORMATION,*PSET_PARTITION_INFORMATION; + +#if (_WIN32_WINNT >= 0x0500) +/* Actually it should be > 0x0500, since this is not present in Windows 2000; + * however we keep >= 0x0500 for compatibility with MS PSDK. */ + typedef enum _PARTITION_STYLE { PARTITION_STYLE_MBR, PARTITION_STYLE_GPT, PARTITION_STYLE_RAW } PARTITION_STYLE; -typedef struct { + +typedef struct _CREATE_DISK_GPT { GUID DiskId; DWORD MaxPartitionCount; } CREATE_DISK_GPT,*PCREATE_DISK_GPT; -typedef struct { +typedef struct _CREATE_DISK_MBR { DWORD Signature; } CREATE_DISK_MBR,*PCREATE_DISK_MBR; -typedef struct { +typedef struct _CREATE_DISK { PARTITION_STYLE PartitionStyle; _ANONYMOUS_UNION union { CREATE_DISK_MBR Mbr; CREATE_DISK_GPT Gpt; }; } CREATE_DISK,*PCREATE_DISK; -typedef enum { - EqualPriority, - KeepPrefetchedData, - KeepReadData -} DISK_CACHE_RETENTION_PRIORITY; -typedef struct _DISK_CACHE_INFORMATION { - BOOLEAN ParametersSavable; - BOOLEAN ReadCacheEnabled; - BOOLEAN WriteCacheEnabled; - DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority; - DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority; - WORD DisablePrefetchTransferLength; - BOOLEAN PrefetchScalar; - _ANONYMOUS_UNION union { - struct { - WORD Minimum; - WORD Maximum; - WORD MaximumBlocks; - } ScalarPrefetch; - struct { - WORD Minimum; - WORD Maximum; - } BlockPrefetch; - }; -} DISK_CACHE_INFORMATION,*PDISK_CACHE_INFORMATION; + typedef enum _DETECTION_TYPE { DetectNone, DetectInt13, @@ -313,62 +350,133 @@ typedef struct _DISK_DETECTION_INFO { }; }; } DISK_DETECTION_INFO,*PDISK_DETECTION_INFO; -typedef enum _MEDIA_TYPE { - Unknown, - F5_1Pt2_512, - F3_1Pt44_512, - F3_2Pt88_512, - F3_20Pt8_512, - F3_720_512, - F5_360_512, - F5_320_512, - F5_320_1024, - F5_180_512, - F5_160_512, - RemovableMedia, - FixedMedia, - F3_120M_512, - F3_640_512, - F5_640_512, - F5_720_512, - F3_1Pt2_512, - F3_1Pt23_1024, - F5_1Pt23_1024, - F3_128Mb_512, - F3_230Mb_512, - F8_256_128, - F3_200Mb_512, - F3_240M_512, - F3_32M_512 -} MEDIA_TYPE,*PMEDIA_TYPE; -typedef struct _DISK_GEOMETRY { - LARGE_INTEGER Cylinders; - MEDIA_TYPE MediaType; - DWORD TracksPerCylinder; - DWORD SectorsPerTrack; - DWORD BytesPerSector; -} DISK_GEOMETRY,*PDISK_GEOMETRY; +typedef struct _DISK_PARTITION_INFO { + DWORD SizeOfPartitionInfo; + PARTITION_STYLE PartitionStyle; + _ANONYMOUS_UNION union { + struct { + DWORD Signature; + DWORD CheckSum; + } Mbr; + struct { + GUID DiskId; + } Gpt; + }; +} DISK_PARTITION_INFO,*PDISK_PARTITION_INFO; typedef struct _DISK_GEOMETRY_EX { DISK_GEOMETRY Geometry; LARGE_INTEGER DiskSize; BYTE Data[1]; } DISK_GEOMETRY_EX,*PDISK_GEOMETRY_EX; + +#if (NTDDI_VERSION < NTDDI_WS03) +#define DiskGeometryGetPartition(Geometry) \ + ((PDISK_PARTITION_INFO)((Geometry) + 1)) + +#define DiskGeometryGetDetect(Geometry)\ + ((PDISK_DETECTION_INFO)(((PBYTE)DiskGeometryGetPartition(Geometry) + \ + DiskGeometryGetPartition(Geometry)->SizeOfPartitionInfo))) +#else +#define DiskGeometryGetPartition(Geometry) \ + ((PDISK_PARTITION_INFO)((Geometry)->Data)) + +#define DiskGeometryGetDetect(Geometry)\ + ((PDISK_DETECTION_INFO)(((ULONG_PTR)DiskGeometryGetPartition(Geometry) + \ + DiskGeometryGetPartition(Geometry)->SizeOfPartitionInfo))) +#endif + +typedef struct _PARTITION_INFORMATION_GPT { + GUID PartitionType; + GUID PartitionId; + DWORD64 Attributes; + WCHAR Name[36]; +} PARTITION_INFORMATION_GPT; +typedef struct _PARTITION_INFORMATION_MBR { + BYTE PartitionType; + BOOLEAN BootIndicator; + BOOLEAN RecognizedPartition; + DWORD HiddenSectors; +} PARTITION_INFORMATION_MBR; +typedef struct _PARTITION_INFORMATION_EX { + PARTITION_STYLE PartitionStyle; + LARGE_INTEGER StartingOffset; + LARGE_INTEGER PartitionLength; + DWORD PartitionNumber; + BOOLEAN RewritePartition; +#if (NTDDI_VERSION >= NTDDI_WIN10_RS3) + BOOLEAN IsServicePartition; +#endif + _ANONYMOUS_UNION union { + PARTITION_INFORMATION_MBR Mbr; + PARTITION_INFORMATION_GPT Gpt; + }; +} PARTITION_INFORMATION_EX; + +typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { + GUID DiskId; + LARGE_INTEGER StartingUsableOffset; + LARGE_INTEGER UsableLength; + DWORD MaxPartitionCount; +} DRIVE_LAYOUT_INFORMATION_GPT,*PDRIVE_LAYOUT_INFORMATION_GPT; +typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { + DWORD Signature; +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) + DWORD CheckSum; +#endif +} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; +typedef struct _DRIVE_LAYOUT_INFORMATION_EX { + DWORD PartitionStyle; + DWORD PartitionCount; + _ANONYMOUS_UNION union { + DRIVE_LAYOUT_INFORMATION_MBR Mbr; + DRIVE_LAYOUT_INFORMATION_GPT Gpt; + }; + PARTITION_INFORMATION_EX PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION_EX,*PDRIVE_LAYOUT_INFORMATION_EX; + +typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR; +typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT; + +typedef struct _SET_PARTITION_INFORMATION_EX { + PARTITION_STYLE PartitionStyle; + _ANONYMOUS_UNION union { + SET_PARTITION_INFORMATION_MBR Mbr; + SET_PARTITION_INFORMATION_GPT Gpt; + } DUMMYUNIONNAME; +} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX; + +#endif // (_WIN32_WINNT >= 0x0500) + typedef struct _DISK_GROW_PARTITION { DWORD PartitionNumber; LARGE_INTEGER BytesToGrow; } DISK_GROW_PARTITION, *PDISK_GROW_PARTITION; -typedef struct _DISK_PARTITION_INFO { - DWORD SizeOfPartitionInfo; - PARTITION_STYLE PartitionStyle; +typedef enum { + EqualPriority, + KeepPrefetchedData, + KeepReadData +} DISK_CACHE_RETENTION_PRIORITY; +typedef struct _DISK_CACHE_INFORMATION { + BOOLEAN ParametersSavable; + BOOLEAN ReadCacheEnabled; + BOOLEAN WriteCacheEnabled; + DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority; + DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority; + WORD DisablePrefetchTransferLength; + BOOLEAN PrefetchScalar; _ANONYMOUS_UNION union { struct { - DWORD Signature; - } Mbr; + WORD Minimum; + WORD Maximum; + WORD MaximumBlocks; + } ScalarPrefetch; struct { - GUID DiskId; - } Gpt; + WORD Minimum; + WORD Maximum; + } BlockPrefetch; }; -} DISK_PARTITION_INFO,*PDISK_PARTITION_INFO; +} DISK_CACHE_INFORMATION,*PDISK_CACHE_INFORMATION; + typedef struct _DISK_PERFORMANCE { LARGE_INTEGER BytesRead; LARGE_INTEGER BytesWritten; @@ -448,62 +556,6 @@ typedef struct _VOLUME_DISK_EXTENTS { DWORD NumberOfDiskExtents; DISK_EXTENT Extents[1]; } VOLUME_DISK_EXTENTS,*PVOLUME_DISK_EXTENTS; -typedef struct _PARTITION_INFORMATION { - LARGE_INTEGER StartingOffset; - LARGE_INTEGER PartitionLength; - DWORD HiddenSectors; - DWORD PartitionNumber; - BYTE PartitionType; - BOOLEAN BootIndicator; - BOOLEAN RecognizedPartition; - BOOLEAN RewritePartition; -} PARTITION_INFORMATION,*PPARTITION_INFORMATION; -typedef struct _DRIVE_LAYOUT_INFORMATION { - DWORD PartitionCount; - DWORD Signature; - PARTITION_INFORMATION PartitionEntry[1]; -} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; -typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { - GUID DiskId; - LARGE_INTEGER StartingUsableOffset; - LARGE_INTEGER UsableLength; - ULONG MaxPartitionCount; -} DRIVE_LAYOUT_INFORMATION_GPT,*PDRIVE_LAYOUT_INFORMATION_GPT; -typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { - ULONG Signature; -} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; -typedef struct _PARTITION_INFORMATION_MBR { - BYTE PartitionType; - BOOLEAN BootIndicator; - BOOLEAN RecognizedPartition; - DWORD HiddenSectors; -} PARTITION_INFORMATION_MBR; -typedef struct _PARTITION_INFORMATION_GPT { - GUID PartitionType; - GUID PartitionId; - DWORD64 Attributes; - WCHAR Name[36]; -} PARTITION_INFORMATION_GPT; -typedef struct _PARTITION_INFORMATION_EX { - PARTITION_STYLE PartitionStyle; - LARGE_INTEGER StartingOffset; - LARGE_INTEGER PartitionLength; - DWORD PartitionNumber; - BOOLEAN RewritePartition; - _ANONYMOUS_UNION union { - PARTITION_INFORMATION_MBR Mbr; - PARTITION_INFORMATION_GPT Gpt; - }; -} PARTITION_INFORMATION_EX; -typedef struct _DRIVE_LAYOUT_INFORMATION_EX { - DWORD PartitionStyle; - DWORD PartitionCount; - _ANONYMOUS_UNION union { - DRIVE_LAYOUT_INFORMATION_MBR Mbr; - DRIVE_LAYOUT_INFORMATION_GPT Gpt; - }; - PARTITION_INFORMATION_EX PartitionEntry[1]; -} DRIVE_LAYOUT_INFORMATION_EX,*PDRIVE_LAYOUT_INFORMATION_EX; typedef struct { HANDLE FileHandle; LARGE_INTEGER StartingVcn; @@ -535,9 +587,6 @@ typedef struct _REASSIGN_BLOCKS { WORD Count; DWORD BlockNumber[1]; } REASSIGN_BLOCKS,*PREASSIGN_BLOCKS; -typedef struct _SET_PARTITION_INFORMATION { - BYTE PartitionType; -} SET_PARTITION_INFORMATION,*PSET_PARTITION_INFORMATION; typedef struct { LARGE_INTEGER StartingLcn; } STARTING_LCN_INPUT_BUFFER,*PSTARTING_LCN_INPUT_BUFFER;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs