Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

03/03: [FREELDR] Reduce the timeout during serial mouse detection. CORE-14280
by Thomas Faber 05 Feb '18

05 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76c20454341345baca657… commit 76c20454341345baca657fc426aca3c974aa86f0 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jan 30 20:50:05 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Feb 5 11:49:12 2018 +0100 [FREELDR] Reduce the timeout during serial mouse detection. CORE-14280 --- boot/freeldr/freeldr/arch/i386/machpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 94b295ad03..64b6a43a86 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -340,12 +340,12 @@ DetectSerialMouse(PUCHAR Port) StallExecutionProcessor(10000); /* Read first four bytes, which contains Microsoft Mouse signs */ - TimeOut = 200; + TimeOut = 20; for (i = 0; i < 4; i++) { while ((READ_PORT_UCHAR(Port + 5) & 1) == 0) { - StallExecutionProcessor(1000); + StallExecutionProcessor(100); --TimeOut; if (TimeOut == 0) return MOUSE_TYPE_NONE;

1 0

02/03: [FREELDR] Remove unnecessary checks. CORE-14280
by Thomas Faber 05 Feb '18

05 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d811a2f97ef3bd39ca6c… commit 4d811a2f97ef3bd39ca6c876d561a67ad28fd8b6 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jan 30 20:48:25 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Feb 5 11:49:10 2018 +0100 [FREELDR] Remove unnecessary checks. CORE-14280 --- boot/freeldr/freeldr/arch/i386/hardware.c | 2 -- boot/freeldr/freeldr/arch/i386/machpc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hardware.c b/boot/freeldr/freeldr/arch/i386/hardware.c index f9aa78dedb..a94ab48e32 100644 --- a/boot/freeldr/freeldr/arch/i386/hardware.c +++ b/boot/freeldr/freeldr/arch/i386/hardware.c @@ -112,8 +112,6 @@ HalpCalibrateStallExecution(VOID) /* Stage 1: Coarse calibration */ - WaitFor8254Wraparound(); - delay_count = 1; do diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index c846bf80ae..94b295ad03 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -343,7 +343,7 @@ DetectSerialMouse(PUCHAR Port) TimeOut = 200; for (i = 0; i < 4; i++) { - while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) + while ((READ_PORT_UCHAR(Port + 5) & 1) == 0) { StallExecutionProcessor(1000); --TimeOut;

1 0

01/03: [FREELDR] Display an additional status message for hardware detection. CORE-14280
by Thomas Faber 05 Feb '18

05 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79ea0ae09e9349f322b8f… commit 79ea0ae09e9349f322b8ffc2a4e544942bbced26 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jan 30 20:47:12 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Feb 5 11:49:07 2018 +0100 [FREELDR] Display an additional status message for hardware detection. CORE-14280 --- boot/freeldr/freeldr/ntldr/winldr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 3ecda6be92..aaf1d9da56 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -794,6 +794,8 @@ LoadAndBootWindowsCommon( SystemRoot = strstr(BootPath, "\\"); /* Detect hardware */ + UiDrawBackdrop(); + UiDrawProgressBarCenter(20, 100, "Detecting hardware..."); LoaderBlock->ConfigurationRoot = MachHwDetect(); if (OperatingSystemVersion == 0)

1 0

01/01: [NTOS:MM] Make x64 address space layout more like Vista+ - Change MM_SYSTEM_SPACE_START to 0xFFFFF88000000000 - Move MI_DEBUG_MAPPING to the end of the system PTE range - Add MI_SYSTEM_CACHE_START and MI_SYSTEM_CACHE_END, which is in the range that Vista uses as dynamic VA space for cache and other allocations - Wrap x86 specific code that makes now invalid assumptions about the address space layout in #ifdef _M_IX86
by Timo Kreuzer 05 Feb '18

05 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dae88fb828426f692a5ad… commit dae88fb828426f692a5ad3fd946f888311409e49 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 28 17:45:41 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Feb 5 01:09:32 2018 +0100 [NTOS:MM] Make x64 address space layout more like Vista+ - Change MM_SYSTEM_SPACE_START to 0xFFFFF88000000000 - Move MI_DEBUG_MAPPING to the end of the system PTE range - Add MI_SYSTEM_CACHE_START and MI_SYSTEM_CACHE_END, which is in the range that Vista uses as dynamic VA space for cache and other allocations - Wrap x86 specific code that makes now invalid assumptions about the address space layout in #ifdef _M_IX86 --- ntoskrnl/include/internal/amd64/mm.h | 24 +++++++++++++++--------- ntoskrnl/mm/ARM3/mminit.c | 5 +++++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index 3b0b217bd9..7d339a1b71 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -5,22 +5,28 @@ #define _MI_PAGING_LEVELS 4 -/* Memory layout base addresses */ +/* Memory layout base addresses (This is based on Vista!) */ #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL #define MI_REAL_SYSTEM_RANGE_START 0xFFFF800000000000ULL -#define HYPER_SPACE 0xFFFFF70000000000ULL +//#define MI_PAGE_TABLE_BASE 0xFFFFF68000000000ULL // 512 GB page tables +#define HYPER_SPACE 0xFFFFF70000000000ULL // 512 GB hyper space [MiVaProcessSpace] #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL -#define MI_SYSTEM_CACHE_WS_START 0xFFFFF78000001000ULL -#define MI_PAGED_POOL_START (PVOID)0xFFFFF8A000000000ULL -//#define MI_PAGED_POOL_END 0xFFFFF8BFFFFFFFFFULL -//#define MI_SESSION_SPACE_START 0xFFFFF90000000000ULL +//#define MI_SHARED_SYSTEM_PAGE 0xFFFFF78000000000ULL +#define MI_SYSTEM_CACHE_WS_START 0xFFFFF78000001000ULL // 512 GB - 4 KB system cache working set +//#define MI_LOADER_MAPPINGS 0xFFFFF80000000000ULL // 512 GB loader mappings aka KSEG0_BASE (NDK) [MiVaBootLoaded] +#define MM_SYSTEM_SPACE_START 0xFFFFF88000000000ULL // 128 GB system PTEs [MiVaSystemPtes] +#define MI_DEBUG_MAPPING (PVOID)0xFFFFF89FFFFFF000ULL // FIXME should be allocated from System PTEs +#define MI_PAGED_POOL_START (PVOID)0xFFFFF8A000000000ULL // 128 GB paged pool [MiVaPagedPool] +//#define MI_PAGED_POOL_END 0xFFFFF8BFFFFFFFFFULL +//#define MI_SESSION_SPACE_START 0xFFFFF90000000000ULL // 512 GB session space [MiVaSessionSpace] #define MI_SESSION_VIEW_END 0xFFFFF97FFF000000ULL #define MI_SESSION_SPACE_END 0xFFFFF97FFFFFFFFFULL -#define MM_SYSTEM_SPACE_START 0xFFFFF98000000000ULL -#define MI_PFN_DATABASE 0xFFFFFA8000000000ULL -#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME +#define MI_SYSTEM_CACHE_START 0xFFFFF98000000000ULL // 1 TB system cache (on Vista+ this is dynamic VA space) [MiVaSystemCache,MiVaSpecialPoolPaged,MiVaSpecialPoolNonPaged] +#define MI_SYSTEM_CACHE_END 0xFFFFFA7FFFFFFFFFULL +#define MI_PFN_DATABASE 0xFFFFFA8000000000ULL // up to 5.5 TB PFN database followed by non paged pool [MiVaPfnDatabase/MiVaNonPagedPool] #define MI_NONPAGED_POOL_END (PVOID)0xFFFFFFFFFFBFFFFFULL +//#define MM_HAL_VA_START 0xFFFFFFFFFFC00000ULL // 4 MB HAL mappings, defined in NDK [MiVaHal] #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL #define MmSystemRangeStart ((PVOID)MI_REAL_SYSTEM_RANGE_START) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 44f50b085b..76d4a4bee8 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -1779,6 +1779,8 @@ MiBuildPagedPool(VOID) TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory[0]; MI_WRITE_VALID_PTE(PointerPte, TempPte); #endif + +#ifdef _M_IX86 // // Let's get back to paged pool work: size it up. // By default, it should be twice as big as nonpaged pool. @@ -1795,6 +1797,7 @@ MiBuildPagedPool(VOID) MmSizeOfPagedPoolInBytes = (ULONG_PTR)MmNonPagedSystemStart - (ULONG_PTR)MmPagedPoolStart; } +#endif // _M_IX86 // // Get the size in pages and make sure paged pool is at least 32MB. @@ -1814,11 +1817,13 @@ MiBuildPagedPool(VOID) MmSizeOfPagedPoolInBytes = Size * PAGE_SIZE * 1024; MmSizeOfPagedPoolInPages = MmSizeOfPagedPoolInBytes >> PAGE_SHIFT; +#ifdef _M_IX86 // // Let's be really sure this doesn't overflow into nonpaged system VA // ASSERT((MmSizeOfPagedPoolInBytes + (ULONG_PTR)MmPagedPoolStart) <= (ULONG_PTR)MmNonPagedSystemStart); +#endif // _M_IX86 // // This is where paged pool ends

1 0

01/01: [ROSLOAD]: Continue work on target preparation OslPrepareTarget 2/104. [ROSLOAD]: Stubplement OslpCheckForcedFailure, OslpGetSetBootStatusData, OslSetBootStatusData, OslGetBootStatusData. [ROSLOAD]: Stub OslpInitializeBootStatusDataLog, OslpReadWriteBootStatusData. [BOOTLIB]: Fix BlAppendBootOptionString to accept an actual BCD ID instead of hardcoding LibraryPath. [BOOTLIB]: Fix BlAppendBootOptionBoolean to accept an actual BOOLEAN value instead of hardcoding TRUE. [BOOTLIB]: Implement B
by Alex Ionescu 05 Feb '18

05 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ec85c29e31206918868e… commit 9ec85c29e31206918868e05beff71fa4ecb47559 Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Feb 4 16:01:38 2018 -0800 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Feb 4 16:01:38 2018 -0800 [ROSLOAD]: Continue work on target preparation OslPrepareTarget 2/104. [ROSLOAD]: Stubplement OslpCheckForcedFailure, OslpGetSetBootStatusData, OslSetBootStatusData, OslGetBootStatusData. [ROSLOAD]: Stub OslpInitializeBootStatusDataLog, OslpReadWriteBootStatusData. [BOOTLIB]: Fix BlAppendBootOptionString to accept an actual BCD ID instead of hardcoding LibraryPath. [BOOTLIB]: Fix BlAppendBootOptionBoolean to accept an actual BOOLEAN value instead of hardcoding TRUE. [BOOTLIB]: Implement BlDeviceIsVirtualPartitionDevice. [BOOTLIB]: Add missing BcdOSLoaderInteger_ForceFailure BCD value. Add BCDE_OSLOADER_TYPE_BOOT_STATUS_POLICY based on BcdEdit.exe and Geoff Chappel site. --- boot/environ/app/bootmgr/bootmgr.c | 18 +- boot/environ/app/rosload/rosload.c | 554 ++++++++++++++++++++++++++++++++++++- boot/environ/app/rosload/rosload.h | 6 + boot/environ/include/bcd.h | 20 +- boot/environ/include/bl.h | 14 +- boot/environ/lib/io/device.c | 33 +++ boot/environ/lib/misc/bcdopt.c | 8 +- 7 files changed, 632 insertions(+), 21 deletions(-) diff --git a/boot/environ/app/bootmgr/bootmgr.c b/boot/environ/app/bootmgr/bootmgr.c index b63e63b201..85d501b310 100644 --- a/boot/environ/app/bootmgr/bootmgr.c +++ b/boot/environ/app/bootmgr/bootmgr.c @@ -1357,7 +1357,9 @@ BmpPopulateBootEntryList ( L"\\Windows\\System32\\winload.efi"; /* Add the path to the boot entry */ - Status = BlAppendBootOptionString(BootEntry, LoaderPath); + Status = BlAppendBootOptionString(BootEntry, + BcdLibraryString_ApplicationPath, + LoaderPath); if (!NT_SUCCESS(Status)) { goto Quickie; @@ -2511,7 +2513,8 @@ TryAgain: { /* Set the option this once */ BlAppendBootOptionBoolean(BootEntry, - BcdLibraryBoolean_DisplayAdvancedOptions); + BcdLibraryBoolean_DisplayAdvancedOptions, + TRUE); } else { @@ -2536,7 +2539,8 @@ TryAgain: { /* Set the option this once */ BlAppendBootOptionBoolean(BootEntry, - BcdLibraryBoolean_DisplayOptionsEdit); + BcdLibraryBoolean_DisplayOptionsEdit, + TRUE); } else { @@ -2686,12 +2690,16 @@ Quickie: case AdvancedOptions: /* Show the advanced options next iteration */ - BlAppendBootOptionBoolean(BootEntry, BcdOSLoaderBoolean_AdvancedOptionsOneTime); + BlAppendBootOptionBoolean(BootEntry, + BcdOSLoaderBoolean_AdvancedOptionsOneTime, + TRUE); goto TryAgain; case BootOptions: /* Show the options editor next iteration */ - BlAppendBootOptionBoolean(BootEntry, BcdOSLoaderBoolean_OptionsEditOneTime); + BlAppendBootOptionBoolean(BootEntry, + BcdOSLoaderBoolean_OptionsEditOneTime, + TRUE); goto TryAgain; case Recover: diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 9eda2d31fe..65fa445c77 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -50,6 +50,88 @@ BOOLEAN OslImcProcessingValid; ULONG OslFreeMemoryDesctiptorsListSize; PVOID OslMemoryDescriptorBuffer; +BcdObjectType BlpSbdiCurrentApplicationType; + +PRTL_BSD_DATA BsdBootStatusData; + +OSL_BSD_ITEM_TABLE_ENTRY OslpBootStatusFields[RtlBsdItemMax] = +{ + { + FIELD_OFFSET(RTL_BSD_DATA, Version), + sizeof(&BsdBootStatusData->Version) + }, // RtlBsdItemVersionNumber + { + FIELD_OFFSET(RTL_BSD_DATA, ProductType), + sizeof(&BsdBootStatusData->ProductType) + }, // RtlBsdItemProductType + { + FIELD_OFFSET(RTL_BSD_DATA, AabEnabled), + sizeof(&BsdBootStatusData->AabEnabled) + }, // RtlBsdItemAabEnabled + { + FIELD_OFFSET(RTL_BSD_DATA, AabTimeout), + sizeof(&BsdBootStatusData->AabTimeout) + }, // RtlBsdItemAabTimeout + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootSucceeded), + sizeof(&BsdBootStatusData->LastBootSucceeded) + }, // RtlBsdItemBootGood + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootShutdown), + sizeof(&BsdBootStatusData->LastBootShutdown) + }, // RtlBsdItemBootShutdown + { + FIELD_OFFSET(RTL_BSD_DATA, SleepInProgress), + sizeof(&BsdBootStatusData->SleepInProgress) + }, // RtlBsdSleepInProgress + { + FIELD_OFFSET(RTL_BSD_DATA, PowerTransition), + sizeof(&BsdBootStatusData->PowerTransition) + }, // RtlBsdPowerTransition + { + FIELD_OFFSET(RTL_BSD_DATA, BootAttemptCount), + sizeof(&BsdBootStatusData->BootAttemptCount) + }, // RtlBsdItemBootAttemptCount + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootCheckpoint), + sizeof(&BsdBootStatusData->LastBootCheckpoint) + }, // RtlBsdItemBootCheckpoint + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootId), + sizeof(&BsdBootStatusData->LastBootId) + }, // RtlBsdItemBootId + { + FIELD_OFFSET(RTL_BSD_DATA, LastSuccessfulShutdownBootId), + sizeof(&BsdBootStatusData->LastSuccessfulShutdownBootId) + }, // RtlBsdItemShutdownBootId + { + FIELD_OFFSET(RTL_BSD_DATA, LastReportedAbnormalShutdownBootId), + sizeof(&BsdBootStatusData->LastReportedAbnormalShutdownBootId) + }, // RtlBsdItemReportedAbnormalShutdownBootId + { + FIELD_OFFSET(RTL_BSD_DATA, ErrorInfo), + sizeof(&BsdBootStatusData->ErrorInfo) + }, // RtlBsdItemErrorInfo + { + FIELD_OFFSET(RTL_BSD_DATA, PowerButtonPressInfo), + sizeof(&BsdBootStatusData->PowerButtonPressInfo) + }, // RtlBsdItemPowerButtonPressInfo + { + FIELD_OFFSET(RTL_BSD_DATA, Checksum), + sizeof(&BsdBootStatusData->Checksum) + }, // RtlBsdItemChecksum +}; + +ULONG OslBootAttemptCount; +ULONG OslBootCountUpdateRequestForAbort; +ULONG OslBootAttemptMaximum; + +ULONG OslBootCountUpdateIncrement; + +BOOLEAN OslCurrentBootCheckpoint; +BOOLEAN OslCurrentBootSucceeded; +BOOLEAN OslCurrentBootShutdown; + /* FUNCTIONS *****************************************************************/ VOID @@ -139,8 +221,8 @@ OslpRemoveInternalApplicationOptions ( _wcsupr(LoadString); /* Remove the existing one */ - //BlRemoveBootOption(BlpApplicationEntry.BcdData, - // BcdLibraryString_LoadOptionsString); + BlRemoveBootOption(BlpApplicationEntry.BcdData, + BcdLibraryString_LoadOptionsString); /* Sanitize strings we don't want */ OslpSanitizeLoadOptionsString(LoadString, L"DISABLE_INTEGRITY_CHECKS"); @@ -148,9 +230,9 @@ OslpRemoveInternalApplicationOptions ( OslpSanitizeLoadOptionsString(LoadString, L"DISABLEELAMDRIVERS"); /* Add the sanitized one back */ - //Status = BlAppendBootOptionsString(&BlpApplicationEntry, - // BcdLibraryString_LoadOptionsString, - // LoadString); + Status = BlAppendBootOptionString(&BlpApplicationEntry, + BcdLibraryString_LoadOptionsString, + LoadString); /* Free the original BCD one */ BlMmFreeHeap(LoadString); @@ -163,6 +245,288 @@ OslpRemoveInternalApplicationOptions ( return Status; } +NTSTATUS +OslpCheckForcedFailure ( + VOID + ) +{ + ULONG64 ForceReason; + NTSTATUS Status; + + /* Read the option */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdOSLoaderInteger_ForceFailure, + &ForceReason); + if (NT_SUCCESS(Status) && (ForceReason < 4)) + { + /* For reasons above 3, don't actually do anything */ + if (ForceReason > 3) + { + return STATUS_SUCCESS; + } + } + + /* If the option isn't there or invalid, always return success */ + return STATUS_SUCCESS; +} + +VOID +OslpInitializeBootStatusDataLog ( + VOID + ) +{ + /* TODO */ + return; +} + +NTSTATUS +OslpReadWriteBootStatusData ( + _In_ BOOLEAN WriteAccess + ) +{ + /* Are you trying to write? */ + if (WriteAccess) + { + /* Have we already read? */ + if (!BsdBootStatusData) + { + /* No -- fail */ + return STATUS_UNSUCCESSFUL; + } + } + else if (BsdBootStatusData) + { + /* No -- you're trying to read and we already have the data: no-op */ + return STATUS_SUCCESS; + } + + /* TODO */ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +OslpGetSetBootStatusData ( + _In_ BOOLEAN Read, + _In_ RTL_BSD_ITEM_TYPE DataClass, + _Out_ PVOID Buffer, + _Inout_ PULONG Size + ) +{ + NTSTATUS Status; + ULONG Length, Offset; + + /* No data has been read yet, fail */ + if (!BsdBootStatusData) + { + return STATUS_UNSUCCESSFUL; + } + + /* Invalid data item, fail */ + if (DataClass >= RtlBsdItemMax) + { + return STATUS_INVALID_PARAMETER; + } + + /* Capture the length and offset */ + Length = OslpBootStatusFields[DataClass].Size; + Offset = OslpBootStatusFields[DataClass].Offset; + + /* Make sure it doesn't overflow past the structure we've read */ + if ((Length + Offset) > BsdBootStatusData->Version) + { + return STATUS_REVISION_MISMATCH; + } + + /* Make sure we have enough space */ + if (*Size >= Length) + { + /* We do -- is this a read? */ + if (Read) + { + /* Yes, copy into the caller's buffer */ + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)BsdBootStatusData + Offset), + Length); + } + else + { + /* It's a write, copy from caller's buffer */ + RtlCopyMemory((PVOID)((ULONG_PTR)BsdBootStatusData + Offset), + Buffer, + Length); + } + + /* Set success */ + Status = STATUS_SUCCESS; + } + else + { + /* Return size needed and failure code */ + *Size = Length; + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* All good */ + return Status; +} + +NTSTATUS +OslSetBootStatusData ( + _In_ BOOLEAN LastBootGood, + _In_ BOOLEAN LastBootShutdown, + _In_ BOOLEAN LastBootCheckpoint, + _In_ ULONG UpdateIncrement, + _In_ ULONG BootAttemptCount + ) +{ + NTSTATUS Status; + ULONG Size; + + /* Capture the BSD data in our globals, if needed */ + Status = OslpReadWriteBootStatusData(FALSE); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write last boot shutdown */ + Size = sizeof(LastBootShutdown); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootShutdown, + &LastBootShutdown, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write last boot good */ + Size = sizeof(LastBootGood); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootGood, + &LastBootGood, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write last boot checkpoint */ + Size = sizeof(LastBootCheckpoint); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootCheckpoint, + &LastBootCheckpoint, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write boot attempt count */ + Size = sizeof(BootAttemptCount); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootAttemptCount, + &BootAttemptCount, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* TODO: Update Boot ID*/ + + /* Now write the data */ + Status = OslpReadWriteBootStatusData(TRUE); + +Quickie: + return Status; +} + +NTSTATUS +OslGetBootStatusData ( + _Out_ PBOOLEAN LastBootGood, + _Out_ PBOOLEAN LastBootShutdown, + _Out_ PBOOLEAN LastBootCheckpoint, + _Out_ PULONG LastBootId, + _Out_ PBOOLEAN BootGood, + _Out_ PBOOLEAN BootShutdown + ) +{ + NTSTATUS Status; + ULONG Size; + ULONG64 BootStatusPolicy; + BOOLEAN localBootShutdown, localBootGood; + + /* Capture the BSD data in our globals, if needed */ + Status = OslpReadWriteBootStatusData(FALSE); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Read the last boot ID */ + Size = sizeof(*LastBootId); + Status = OslpGetSetBootStatusData(TRUE, RtlBsdItemBootId, LastBootId, &Size); + if (!NT_SUCCESS(Status)) + { + /* Set to zero if we couldn't find it */ + *LastBootId = 0; + } + + /* Get the boot status policy */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdOSLoaderInteger_BootStatusPolicy, + &BootStatusPolicy); + if (!NT_SUCCESS(Status)) + { + /* Apply a default if none exists */ + BootStatusPolicy = IgnoreShutdownFailures; + } + + /* Check if this was a good shutdown */ + Size = sizeof(localBootShutdown); + Status = OslpGetSetBootStatusData(TRUE, + RtlBsdItemBootShutdown, + &localBootShutdown, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Tell the caller */ + *BootShutdown = localBootShutdown; + + /* Check if this was a good boot */ + Size = sizeof(localBootGood); + Status = OslpGetSetBootStatusData(TRUE, + RtlBsdItemBootGood, + &localBootGood, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Tell the caller*/ + *BootGood = localBootGood; + + /* TODO: Additional logic for checkpoints and such */ + Status = STATUS_NOT_IMPLEMENTED; + +Quickie: + return Status; +} + +BOOLEAN +OslpAdvancedOptionsRequested ( + VOID + ) +{ + /* TODO */ + return FALSE; +} + NTSTATUS OslPrepareTarget ( _Out_ PULONG ReturnFlags, @@ -176,6 +540,16 @@ OslPrepareTarget ( SIZE_T RootLength, RootLengthWithSep; ULONG i; ULONG64 StartPerf, EndPerf; + RTL_BSD_DATA_POWER_TRANSITION PowerTransitionData; + PRTL_BSD_DATA_POWER_TRANSITION PowerBuffer; + ULONG OsDeviceHandle; + BOOLEAN LastBootGood, LastBootShutdown, LastBootCheckpoint; + ULONG BootId; + BOOLEAN BootGood, BootShutdown; + ULONG BsdSize; + + /* Initialize locals */ + PowerBuffer = NULL; /* Assume no flags */ *ReturnFlags = 0; @@ -214,9 +588,14 @@ OslPrepareTarget ( /* Capture the current TSC */ StartPerf = BlArchGetPerformanceCounter(); -#ifdef BL_TPM_SUPPORT - BlpSbdiCurrentApplicationType = 0x10200003; -#endif + /* Set our application type for SecureBoot/TPM purposes */ + BlpSbdiCurrentApplicationType.Application.ObjectCode = + BCD_OBJECT_TYPE_APPLICATION; + BlpSbdiCurrentApplicationType.Application.ImageCode = + BCD_IMAGE_TYPE_BOOT_APP; + BlpSbdiCurrentApplicationType.Application.ApplicationCode = + BCD_APPLICATION_TYPE_OSLOADER; + BlpSbdiCurrentApplicationType.Application.Reserved = 0; /* Register an error handler */ BlpStatusErrorHandler = OslBlStatusErrorHandler; @@ -237,6 +616,7 @@ OslPrepareTarget ( Status = OslpRemoveInternalApplicationOptions(); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -247,6 +627,7 @@ OslPrepareTarget ( 0); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -265,6 +646,7 @@ OslPrepareTarget ( &SystemRoot); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -286,6 +668,7 @@ OslPrepareTarget ( { /* Bail out if we're out of memory */ Status = STATUS_NO_MEMORY; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -297,7 +680,162 @@ OslPrepareTarget ( BlMmFreeHeap(SystemRoot); } + /* Initialize access to the BSD */ + OslpInitializeBootStatusDataLog(); + + /* Check if we're supposed to fail on purpose */ + Status = OslpCheckForcedFailure(); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* Always disable VGA mode */ + Status = BlAppendBootOptionBoolean(&BlpApplicationEntry, + BcdOSLoaderBoolean_DisableVgaMode, + TRUE); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* Get telemetry data from the last boot */ + Status = OslGetBootStatusData(&LastBootGood, + &LastBootShutdown, + &LastBootCheckpoint, + &BootId, + &BootGood, + &BootShutdown); + if (!NT_SUCCESS(Status)) + { + /* Assume this is the very first boot and everything went well */ + BootId = 0; + LastBootGood = TRUE; + LastBootShutdown = TRUE; + LastBootCheckpoint = TRUE; + BootGood = TRUE; + BootShutdown = TRUE; + + /* Set 0 boot attempts */ + OslBootAttemptCount = 0; + } + + /* Set more attempt variables to their initial state */ + OslResetBootStatus = TRUE; + OslBootCountUpdateRequestForAbort = 0; + + /* Read the current BSD data into the global buffer */ + Status = OslpReadWriteBootStatusData(FALSE); + if (NT_SUCCESS(Status)) + { + /* Get the power transition buffer from the BSD */ + BsdSize = sizeof(PowerTransitionData); + Status = OslpGetSetBootStatusData(TRUE, + RtlBsdPowerTransition, + &PowerTransitionData, + &BsdSize); + if (NT_SUCCESS(Status)) + { + /* Save the buffer */ + PowerBuffer = &PowerTransitionData; + } + } + + /* Check if this is VHD boot, which gets 3 boot attempts instead of 2 */ + OslBootAttemptMaximum = 2; + OslBootAttemptMaximum += BlDeviceIsVirtualPartitionDevice(OslLoadDevice, NULL); + + /* Check if the user wants to see the advanced menu */ + if (!OslpAdvancedOptionsRequested()) + { + /* The last boot failed more than the maximum */ + if (!(LastBootGood) && + (OslBootAttemptCount >= OslBootAttemptMaximum)) + { + /* Return failure due to boot -- launch recovery */ + *ReturnFlags |= 8; + + /* Update the attempt count and status variables */ + OslBootAttemptCount = OslBootAttemptMaximum - 1; + OslCurrentBootCheckpoint = LastBootCheckpoint; + OslCurrentBootSucceeded = FALSE; + OslCurrentBootShutdown = LastBootShutdown; + + /* Crash with code 15 and abort boot */ + OslFatalErrorEx(15, 0, 0, 0); + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* We never made it far enough, more than the maximum */ + if (!(LastBootCheckpoint) && + (OslBootAttemptCount >= OslBootAttemptMaximum)) + { + /* Return crash/dirty shutdown during boot attempt */ + *ReturnFlags |= 0x10; + + /* Update the attempt count and status variables */ + OslBootAttemptCount = OslBootAttemptMaximum - 1; + OslCurrentBootSucceeded = LastBootGood; + OslCurrentBootShutdown = LastBootShutdown; + OslCurrentBootCheckpoint = FALSE; + + /* Crash with code 16 and abort boot */ + OslFatalErrorEx(16, 0, 0, 0); + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* We failed to shutdown cleanly, and haven't booted yet */ + if (!(LastBootShutdown) && !(OslBootAttemptCount)) + { + /* Return crash/dirty shutdown */ + *ReturnFlags |= 0x10; + + /* There's no boot attempt, so only update shutdown variables */ + OslCurrentBootSucceeded = LastBootGood; + OslCurrentBootShutdown = TRUE; + OslCurrentBootCheckpoint = LastBootCheckpoint; + + /* Crash with code 16 and abort boot */ + OslFatalErrorEx(16, 0, 0, 0); + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + } + + /* Officially increment the number of boot attempts */ + OslBootAttemptCount++; + + /* No success yet, write to boot status file */ + OslCurrentBootCheckpoint = FALSE; + OslCurrentBootSucceeded = FALSE; + OslCurrentBootShutdown = FALSE; + OslSetBootStatusData(FALSE, + FALSE, + FALSE, + OslBootCountUpdateIncrement, + OslBootAttemptCount); + + /* Open the OS Loader Device for Read/Write access */ + Status = BlpDeviceOpen(OslLoadDevice, + BL_DEVICE_READ_ACCESS | BL_DEVICE_WRITE_ACCESS, + 0, + &OsDeviceHandle); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* That's all for now, folks */ Status = STATUS_NOT_IMPLEMENTED; + DBG_UNREFERENCED_LOCAL_VARIABLE(PowerBuffer); /* Printf perf */ EndPerf = BlArchGetPerformanceCounter(); diff --git a/boot/environ/app/rosload/rosload.h b/boot/environ/app/rosload/rosload.h index 5b19b4f161..c5cad3a493 100644 --- a/boot/environ/app/rosload/rosload.h +++ b/boot/environ/app/rosload/rosload.h @@ -34,6 +34,12 @@ /* STRUCTURES ****************************************************************/ +typedef struct _OSL_BSD_ITEM_TABLE_ENTRY +{ + ULONG Offset; + ULONG Size; +} OSL_BSD_ITEM_TABLE_ENTRY; + /* FUNCTIONS *****************************************************************/ VOID diff --git a/boot/environ/include/bcd.h b/boot/environ/include/bcd.h index cee8a0c79e..d0b8641cd3 100644 --- a/boot/environ/include/bcd.h +++ b/boot/environ/include/bcd.h @@ -150,8 +150,9 @@ typedef enum BcdOSLoaderElementTypes BcdOSLoaderBoolean_UsePlatformClock = 0x260000A2, BcdOSLoaderBoolean_ForceLegacyPlatform = 0x260000A3, BcdOSLoaderInteger_TscSyncPolicy = 0x250000A6, - BcdOSLoaderBoolean_EmsEnabled = 0x260000b0, - BcdOSLoaderInteger_DriverLoadFailurePolicy = 0x250000c1, + BcdOSLoaderBoolean_EmsEnabled = 0x260000B0, + BcdOSLoaderInteger_ForceFailure = 0x250000C0, + BcdOSLoaderInteger_DriverLoadFailurePolicy = 0x250000C1, BcdOSLoaderInteger_BootMenuPolicy = 0x250000C2, BcdOSLoaderBoolean_AdvancedOptionsOneTime = 0x260000C3, BcdOSLoaderBoolean_OptionsEditOneTime = 0x260000C4, /* Undocumented */ @@ -195,7 +196,8 @@ typedef enum BcdBootMgrElementTypes BcdBootMgrBoolean_PersistBootSequence = 0x26000031 } BcdBootMgrElementTypes; -typedef enum _BcdResumeElementTypes { +typedef enum _BcdResumeElementTypes +{ Reserved1 = 0x21000001, Reserved2 = 0x22000002, BcdResumeBoolean_UseCustomSettings = 0x26000003, @@ -204,6 +206,18 @@ typedef enum _BcdResumeElementTypes { BcdResumeInteger_BootMenuPolicy = 0x25000008 } BcdResumeElementTypes; +typedef enum _BCDE_OSLOADER_TYPE_BOOT_STATUS_POLICY +{ + DisplayAllFailures, + IgnoreAllFailures, + IgnoreShutdownFailures, + IgnoreBootFailures, + IgnoreCheckpointFailures, + DisplayShutdownFailures, + DisplayBootFailures, + DisplayCheckpointFailures +} BCDE_OSLOADER_TYPE_BOOT_STATUS_POLICY; + /* Undocumented */ typedef enum BcdStartupElementTypes { diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 0e31deb8e9..82edfbcb00 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -923,7 +923,7 @@ typedef struct _BL_HARDDISK_DEVICE typedef struct _BL_LOCAL_DEVICE { - ULONG Type; + BL_LOCAL_DEVICE_TYPE Type; union { struct @@ -933,6 +933,8 @@ typedef struct _BL_LOCAL_DEVICE BL_HARDDISK_DEVICE HardDisk; + BL_HARDDISK_DEVICE VirtualHardDisk; + struct { PHYSICAL_ADDRESS ImageBase; @@ -2008,7 +2010,8 @@ BlCopyBootOptions ( NTSTATUS BlAppendBootOptionBoolean ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, - _In_ ULONG OptionId + _In_ ULONG OptionId, + _In_ BOOLEAN Value ); NTSTATUS @@ -2021,6 +2024,7 @@ BlAppendBootOptionInteger ( NTSTATUS BlAppendBootOptionString ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId, _In_ PWCHAR OptionString ); @@ -2430,6 +2434,12 @@ BlDeviceClose ( _In_ ULONG DeviceId ); +BOOLEAN +BlDeviceIsVirtualPartitionDevice ( + _In_ PBL_DEVICE_DESCRIPTOR InputDevice, + _Outptr_ PBL_DEVICE_DESCRIPTOR* VirtualDevice + ); + NTSTATUS BlpDeviceOpen ( _In_ PBL_DEVICE_DESCRIPTOR Device, diff --git a/boot/environ/lib/io/device.c b/boot/environ/lib/io/device.c index 76dbed0674..b4fd38e178 100644 --- a/boot/environ/lib/io/device.c +++ b/boot/environ/lib/io/device.c @@ -608,6 +608,39 @@ BlockIoGetInformation ( return STATUS_SUCCESS; } +BOOLEAN +BlDeviceIsVirtualPartitionDevice ( + _In_ PBL_DEVICE_DESCRIPTOR InputDevice, + _Outptr_ PBL_DEVICE_DESCRIPTOR* VirtualDevice + ) +{ + BOOLEAN IsVirtual; + PBL_LOCAL_DEVICE ParentDisk; + + /* Assume it isn't */ + IsVirtual = FALSE; + + /* Check if this is a partition device */ + if ((InputDevice->DeviceType == LegacyPartitionDevice) || + (InputDevice->DeviceType == PartitionDevice)) + { + /* Check if the parent disk is a VHD */ + ParentDisk = &InputDevice->Partition.Disk; + if (ParentDisk->Type == VirtualDiskDevice) + { + /* This is a virtual partition device -- does the caller want it? */ + IsVirtual = TRUE; + if (VirtualDevice) + { + *VirtualDevice = (PBL_DEVICE_DESCRIPTOR)(&ParentDisk->VirtualHardDisk + 1); + } + } + } + + /* Return */ + return IsVirtual; +} + NTSTATUS BlDeviceSetInformation ( _In_ ULONG DeviceId, diff --git a/boot/environ/lib/misc/bcdopt.c b/boot/environ/lib/misc/bcdopt.c index 0b4f82e467..1b1600182c 100644 --- a/boot/environ/lib/misc/bcdopt.c +++ b/boot/environ/lib/misc/bcdopt.c @@ -624,7 +624,8 @@ BlCopyBootOptions ( NTSTATUS BlAppendBootOptionBoolean ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, - _In_ ULONG OptionId + _In_ ULONG OptionId, + _In_ BOOLEAN Value ) { NTSTATUS Status; @@ -642,7 +643,7 @@ BlAppendBootOptionBoolean ( Option->DataSize = sizeof(USHORT); Option->Type = OptionId; Option->DataOffset = sizeof(*Option); - *(PBOOLEAN)(Option + 1) = TRUE; + *(PBOOLEAN)(Option + 1) = Value; /* Append it */ Status = BlAppendBootOptions(AppEntry, Option); @@ -687,6 +688,7 @@ BlAppendBootOptionInteger ( NTSTATUS BlAppendBootOptionString ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId, _In_ PWCHAR OptionString ) { @@ -719,7 +721,7 @@ BlAppendBootOptionString ( /* Initialize it and copy the string value */ RtlZeroMemory(Option, sizeof(*Option) + StringSize); Option->DataSize = StringSize; - Option->Type = BcdLibraryString_ApplicationPath; + Option->Type = OptionId; Option->DataOffset = sizeof(*Option); wcsncpy((PWCHAR)Option + 1, OptionString, StringSize / sizeof(WCHAR));

1 0

01/01: [SERVICES] Remove the synchronous service control pipe code
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0c7db730c23a9201ef84… commit f0c7db730c23a9201ef84f29c7c7e60a5023d8b8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 22:30:33 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 22:30:33 2018 +0100 [SERVICES] Remove the synchronous service control pipe code Remove the synchronous service control pipe code because we are using the asynchronous service control pipe code for years. --- base/system/services/database.c | 116 ---------------------------------------- 1 file changed, 116 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index aa176c0885..9822d6048e 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -19,12 +19,6 @@ #define NDEBUG #include <debug.h> -/* - * Uncomment the line below to use asynchronous IO operations - * on the service control pipes. - */ -#define USE_ASYNCHRONOUS_IO - /* GLOBALS *******************************************************************/ @@ -98,11 +92,7 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) DPRINT("PipeName: %S\n", szControlPipeName); pServiceImage->hControlPipe = CreateNamedPipeW(szControlPipeName, -#ifdef USE_ASYNCHRONOUS_IO PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, -#else - PIPE_ACCESS_DUPLEX, -#endif PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 100, 8000, @@ -1072,9 +1062,7 @@ ScmControlService(PSERVICE Service, PWSTR Ptr; DWORD dwError = ERROR_SUCCESS; BOOL bResult; -#ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; -#endif DPRINT("ScmControlService() called\n"); @@ -1106,7 +1094,6 @@ ScmControlService(PSERVICE Service, ControlPacket->dwArgumentsCount = 0; ControlPacket->dwArgumentsOffset = 0; -#ifdef USE_ASYNCHRONOUS_IO bResult = WriteFile(Service->lpImage->hControlPipe, ControlPacket, PacketSize, @@ -1212,43 +1199,6 @@ ScmControlService(PSERVICE Service, } } -#else - /* Send the control packet */ - bResult = WriteFile(Service->lpImage->hControlPipe, - ControlPacket, - PacketSize, - &dwWriteCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("WriteFile() failed (Error %lu)\n", dwError); - - if ((dwError == ERROR_GEN_FAILURE) && - (dwControl == SERVICE_CONTROL_STOP)) - { - /* Service is already terminated */ - Service->Status.dwCurrentState = SERVICE_STOPPED; - Service->Status.dwControlsAccepted = 0; - Service->Status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE; - dwError = ERROR_SUCCESS; - } - goto Done; - } - - /* Read the reply */ - bResult = ReadFile(Service->lpImage->hControlPipe, - &ReplyPacket, - sizeof(SCM_REPLY_PACKET), - &dwReadCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("ReadFile() failed (Error %lu)\n", dwError); - } -#endif - Done: /* Release the control packet */ HeapFree(GetProcessHeap(), @@ -1291,9 +1241,7 @@ ScmSendStartCommand(PSERVICE Service, BOOL bResult; DWORD dwWriteCount = 0; DWORD dwReadCount = 0; -#ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; -#endif DPRINT("ScmSendStartCommand() called\n"); @@ -1363,7 +1311,6 @@ ScmSendStartCommand(PSERVICE Service, } } -#ifdef USE_ASYNCHRONOUS_IO bResult = WriteFile(Service->lpImage->hControlPipe, ControlPacket, PacketSize, @@ -1469,33 +1416,6 @@ ScmSendStartCommand(PSERVICE Service, } } -#else - /* Send the start command */ - bResult = WriteFile(Service->lpImage->hControlPipe, - ControlPacket, - PacketSize, - &dwWriteCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("WriteFile() failed (Error %lu)\n", dwError); - goto Done; - } - - /* Read the reply */ - bResult = ReadFile(Service->lpImage->hControlPipe, - &ReplyPacket, - sizeof(SCM_REPLY_PACKET), - &dwReadCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("ReadFile() failed (Error %lu)\n", dwError); - } -#endif - Done: /* Release the control packet */ HeapFree(GetProcessHeap(), @@ -1520,9 +1440,7 @@ ScmWaitForServiceConnect(PSERVICE Service) DWORD dwProcessId = 0; DWORD dwError = ERROR_SUCCESS; BOOL bResult; -#ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; -#endif #if 0 LPCWSTR lpLogStrings[3]; WCHAR szBuffer1[20]; @@ -1531,7 +1449,6 @@ ScmWaitForServiceConnect(PSERVICE Service) DPRINT("ScmWaitForServiceConnect()\n"); -#ifdef USE_ASYNCHRONOUS_IO Overlapped.hEvent = (HANDLE)NULL; bResult = ConnectNamedPipe(Service->lpImage->hControlPipe, @@ -1691,39 +1608,6 @@ ScmWaitForServiceConnect(PSERVICE Service) DPRINT("ScmWaitForServiceConnect() done\n"); return ERROR_SUCCESS; -#else - - /* Connect control pipe */ - if (ConnectNamedPipe(Service->lpImage->hControlPipe, NULL) ? - TRUE : (dwError = GetLastError()) == ERROR_PIPE_CONNECTED) - { - DPRINT("Control pipe connected!\n"); - - /* Read SERVICE_STATUS_HANDLE from pipe */ - bResult = ReadFile(Service->lpImage->hControlPipe, - (LPVOID)&dwProcessId, - sizeof(DWORD), - &dwRead, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT1("Reading the service control pipe failed (Error %lu)\n", - dwError); - } - else - { - dwError = ERROR_SUCCESS; - DPRINT("Read control pipe successfully\n"); - } - } - else - { - DPRINT1("Connecting control pipe failed! (Error %lu)\n", dwError); - } - - return dwError; -#endif }

1 0

01/01: [SETUPAPI] Machine handles are pointers.
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5870819a3d6ffac7095d… commit e5870819a3d6ffac7095d4ceac1eb0587bbf7cf6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 21:02:20 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 22:03:17 2018 +0100 [SETUPAPI] Machine handles are pointers. --- dll/win32/setupapi/setupapi.spec | 136 +++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 350df6c76d..a3dab530a7 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -15,16 +15,16 @@ @ stdcall CM_Add_ID_ExW(ptr wstr long ptr) @ stdcall CM_Add_Range(int64 int64 ptr long) @ stdcall CM_Add_Res_Des(ptr ptr long ptr long long) -@ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long long) +@ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long ptr) @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) @ stdcall CM_Create_DevNodeA(ptr str long long) @ stdcall CM_Create_DevNodeW(ptr wstr long long) -@ stdcall CM_Create_DevNode_ExA(ptr str long long long) -@ stdcall CM_Create_DevNode_ExW(ptr wstr long long long) +@ stdcall CM_Create_DevNode_ExA(ptr str long long ptr) +@ stdcall CM_Create_DevNode_ExW(ptr wstr long long ptr) @ stdcall CM_Create_Range_List(ptr long) @ stdcall CM_Delete_Class_Key(ptr long) -@ stdcall CM_Delete_Class_Key_Ex(ptr long long) +@ stdcall CM_Delete_Class_Key_Ex(ptr long ptr) @ stdcall CM_Delete_DevNode_Key(long long long) @ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) @ stdcall CM_Delete_Range(int64 int64 ptr long) @@ -32,7 +32,7 @@ @ stub CM_Detect_Resource_Conflict_Ex @ stdcall CM_Disable_DevNode(long long) @ stdcall CM_Disable_DevNode_Ex(long long ptr) -@ stdcall CM_Disconnect_Machine(long) +@ stdcall CM_Disconnect_Machine(ptr) @ stdcall CM_Dup_Range_List(ptr ptr long) @ stdcall CM_Enable_DevNode(long long) @ stdcall CM_Enable_DevNode_Ex(long long ptr) @@ -40,8 +40,8 @@ @ stdcall CM_Enumerate_Classes_Ex(long ptr long ptr) @ stdcall CM_Enumerate_EnumeratorsA(long str ptr long) @ stdcall CM_Enumerate_EnumeratorsW(long wstr ptr long) -@ stdcall CM_Enumerate_Enumerators_ExA(long str ptr long long) -@ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long long) +@ stdcall CM_Enumerate_Enumerators_ExA(long str ptr long ptr) +@ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long ptr) @ stdcall CM_Find_Range(ptr int64 long int64 int64 ptr long) @ stdcall CM_First_Range(ptr ptr ptr ptr long) @ stdcall CM_Free_Log_Conf(ptr long) @@ -49,51 +49,51 @@ @ stdcall CM_Free_Log_Conf_Handle(ptr) @ stdcall CM_Free_Range_List(ptr long) @ stdcall CM_Free_Res_Des(ptr ptr long) -@ stdcall CM_Free_Res_Des_Ex(ptr ptr long long) +@ stdcall CM_Free_Res_Des_Ex(ptr ptr long ptr) @ stdcall CM_Free_Res_Des_Handle(ptr) @ stub CM_Free_Resource_Conflict_Handle @ stdcall CM_Get_Child(ptr long long) -@ stdcall CM_Get_Child_Ex(ptr long long long) +@ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stdcall CM_Get_Class_Key_NameA(ptr str ptr long) @ stdcall CM_Get_Class_Key_NameW(ptr wstr ptr long) -@ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long long) -@ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long long) +@ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long ptr) +@ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long ptr) @ stdcall CM_Get_Class_NameA(ptr str ptr long) @ stdcall CM_Get_Class_NameW(ptr wstr ptr long) -@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) -@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) +@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long ptr) +@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long ptr) @ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr ptr long ptr) @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr ptr long ptr) @ stdcall CM_Get_Depth(ptr long long) -@ stdcall CM_Get_Depth_Ex(ptr long long long) +@ stdcall CM_Get_Depth_Ex(ptr long long ptr) @ stdcall CM_Get_DevNode_Custom_PropertyA(long str ptr ptr ptr long) @ stdcall CM_Get_DevNode_Custom_PropertyW(long wstr ptr ptr ptr long) @ stdcall CM_Get_DevNode_Custom_Property_ExA(long str ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Custom_Property_ExW(long wstr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) -@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long long) -@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long long) +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Status(ptr ptr long long) -@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Device_IDA(long str long long) @ stdcall CM_Get_Device_IDW(long wstr long long) -@ stdcall CM_Get_Device_ID_ExA(long str long long long) -@ stdcall CM_Get_Device_ID_ExW(long wstr long long long) +@ stdcall CM_Get_Device_ID_ExA(long str long long ptr) +@ stdcall CM_Get_Device_ID_ExW(long wstr long long ptr) @ stdcall CM_Get_Device_ID_ListA(str str long long) @ stdcall CM_Get_Device_ID_ListW(wstr wstr long long) -@ stdcall CM_Get_Device_ID_List_ExA(str str long long long) -@ stdcall CM_Get_Device_ID_List_ExW(wstr wstr long long long) +@ stdcall CM_Get_Device_ID_List_ExA(str str long long ptr) +@ stdcall CM_Get_Device_ID_List_ExW(wstr wstr long long ptr) @ stdcall CM_Get_Device_ID_List_SizeA(ptr str long) @ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) -@ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long long) -@ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long long) +@ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long ptr) +@ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long ptr) @ stdcall CM_Get_Device_ID_Size(ptr long long) -@ stdcall CM_Get_Device_ID_Size_Ex(ptr long long long) +@ stdcall CM_Get_Device_ID_Size_Ex(ptr long long ptr) @ stdcall CM_Get_Device_Interface_AliasA(str ptr str ptr long) @ stdcall CM_Get_Device_Interface_AliasW(wstr ptr wstr ptr long) -@ stdcall CM_Get_Device_Interface_Alias_ExA(str ptr str ptr long long) -@ stdcall CM_Get_Device_Interface_Alias_ExW(wstr ptr wstr ptr long long) +@ stdcall CM_Get_Device_Interface_Alias_ExA(str ptr str ptr long ptr) +@ stdcall CM_Get_Device_Interface_Alias_ExW(wstr ptr wstr ptr long ptr) @ stdcall CM_Get_Device_Interface_ListA(ptr str str long long) @ stdcall CM_Get_Device_Interface_ListW(ptr wstr wstr long long) @ stdcall CM_Get_Device_Interface_List_ExA(ptr str str long long ptr) @@ -108,105 +108,105 @@ @ stdcall CM_Get_Global_State_Ex(ptr long long) @ stdcall CM_Get_HW_Prof_FlagsA(str long ptr long) @ stdcall CM_Get_HW_Prof_FlagsW(wstr long ptr long) -@ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long long) -@ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long long) +@ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long ptr) +@ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long ptr) @ stdcall CM_Get_Hardware_Profile_InfoA(long ptr long) @ stdcall CM_Get_Hardware_Profile_InfoW(long ptr long) -@ stdcall CM_Get_Hardware_Profile_Info_ExA(long ptr long long) -@ stdcall CM_Get_Hardware_Profile_Info_ExW(long ptr long long) +@ stdcall CM_Get_Hardware_Profile_Info_ExA(long ptr long ptr) +@ stdcall CM_Get_Hardware_Profile_Info_ExW(long ptr long ptr) @ stdcall CM_Get_Log_Conf_Priority(ptr ptr long) -@ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) +@ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long ptr) @ stdcall CM_Get_Next_Log_Conf(ptr ptr long) -@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) +@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long ptr) @ stdcall CM_Get_Next_Res_Des(ptr ptr long ptr long) -@ stdcall CM_Get_Next_Res_Des_Ex(ptr ptr long ptr long long) +@ stdcall CM_Get_Next_Res_Des_Ex(ptr ptr long ptr long ptr) @ stdcall CM_Get_Parent(ptr long long) -@ stdcall CM_Get_Parent_Ex(ptr long long long) +@ stdcall CM_Get_Parent_Ex(ptr long long ptr) @ stdcall CM_Get_Res_Des_Data(ptr ptr long long) -@ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long long) +@ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Res_Des_Data_Size(ptr ptr long) -@ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long long) +@ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long ptr) @ stub CM_Get_Resource_Conflict_Count @ stub CM_Get_Resource_Conflict_DetailsA @ stub CM_Get_Resource_Conflict_DetailsW @ stdcall CM_Get_Sibling(ptr long long) -@ stdcall CM_Get_Sibling_Ex(ptr long long long) +@ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() -@ stdcall CM_Get_Version_Ex(long) +@ stdcall CM_Get_Version_Ex(ptr) @ stdcall CM_Intersect_Range_List(ptr ptr ptr long) @ stdcall CM_Invert_Range_List(ptr ptr int64 long) @ stdcall CM_Is_Dock_Station_Present(ptr) -@ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) +@ stdcall CM_Is_Dock_Station_Present_Ex(ptr ptr) @ stdcall CM_Is_Version_Available(long) -@ stdcall CM_Is_Version_Available_Ex(long long) +@ stdcall CM_Is_Version_Available_Ex(long ptr) @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) -@ stdcall CM_Locate_DevNode_ExA(ptr str long long) -@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) +@ stdcall CM_Locate_DevNode_ExA(ptr str long ptr) +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long ptr) @ stdcall CM_Merge_Range_List(ptr ptr ptr long) @ stdcall CM_Modify_Res_Des(ptr ptr long ptr long long) -@ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long long) +@ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long ptr) @ stdcall CM_Move_DevNode(long long long) -@ stdcall CM_Move_DevNode_Ex(long long long long) +@ stdcall CM_Move_DevNode_Ex(long long long ptr) @ stdcall CM_Next_Range(ptr ptr ptr long) @ stdcall CM_Open_Class_KeyA(ptr str long long ptr long) @ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long) -@ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long long) -@ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) +@ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long ptr) +@ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long ptr) @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) -@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) +@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long ptr) @ stdcall CM_Query_And_Remove_SubTreeA(long ptr str long long) @ stdcall CM_Query_And_Remove_SubTreeW(long ptr wstr long long) -@ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long long) -@ stdcall CM_Query_And_Remove_SubTree_ExW(long ptr wstr long long long) +@ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long ptr) +@ stdcall CM_Query_And_Remove_SubTree_ExW(long ptr wstr long long ptr) @ stdcall CM_Query_Arbitrator_Free_Data(ptr long long long long) @ stdcall CM_Query_Arbitrator_Free_Data_Ex(ptr long long long long ptr) @ stdcall CM_Query_Arbitrator_Free_Size(ptr long long long) @ stdcall CM_Query_Arbitrator_Free_Size_Ex(ptr long long long ptr) @ stdcall CM_Query_Remove_SubTree(long long) -@ stdcall CM_Query_Remove_SubTree_Ex(long long long) +@ stdcall CM_Query_Remove_SubTree_Ex(long long ptr) @ stub CM_Query_Resource_Conflict_List @ stdcall CM_Reenumerate_DevNode(long long) -@ stdcall CM_Reenumerate_DevNode_Ex(long long long) +@ stdcall CM_Reenumerate_DevNode_Ex(long long ptr) @ stdcall CM_Register_Device_Driver(long long) @ stdcall CM_Register_Device_Driver_Ex(long long ptr) @ stdcall CM_Register_Device_InterfaceA(long ptr str str ptr long) @ stdcall CM_Register_Device_InterfaceW(long ptr wstr wstr ptr long) -@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long long) -@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long long) +@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long ptr) +@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long ptr) @ stdcall CM_Remove_SubTree(long long) -@ stdcall CM_Remove_SubTree_Ex(long long long) +@ stdcall CM_Remove_SubTree_Ex(long long ptr) @ stdcall CM_Request_Device_EjectA(long ptr str long long) @ stdcall CM_Request_Device_EjectW(long ptr wstr long long) -@ stdcall CM_Request_Device_Eject_ExA(long ptr str long long long) -@ stdcall CM_Request_Device_Eject_ExW(long ptr wstr long long long) +@ stdcall CM_Request_Device_Eject_ExA(long ptr str long long ptr) +@ stdcall CM_Request_Device_Eject_ExW(long ptr wstr long long ptr) @ stdcall CM_Request_Eject_PC() -@ stdcall CM_Request_Eject_PC_Ex(long) +@ stdcall CM_Request_Eject_PC_Ex(ptr) @ stdcall CM_Run_Detection(long) -@ stdcall CM_Run_Detection_Ex(long long) +@ stdcall CM_Run_Detection_Ex(long ptr) @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) @ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) @ stdcall CM_Set_DevNode_Problem(long long long) -@ stdcall CM_Set_DevNode_Problem_Ex(long long long long) +@ stdcall CM_Set_DevNode_Problem_Ex(long long long ptr) @ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long) @ stdcall CM_Set_DevNode_Registry_PropertyW(long long ptr long long) -@ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long long) -@ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long long) +@ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long ptr) +@ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long ptr) @ stdcall CM_Set_HW_Prof(long long) -@ stdcall CM_Set_HW_Prof_Ex(long long long) +@ stdcall CM_Set_HW_Prof_Ex(long long ptr) @ stdcall CM_Set_HW_Prof_FlagsA(str long long long) @ stdcall CM_Set_HW_Prof_FlagsW(wstr long long long) -@ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long long) -@ stdcall CM_Set_HW_Prof_Flags_ExW(wstr long long long long) +@ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long ptr) +@ stdcall CM_Set_HW_Prof_Flags_ExW(wstr long long long ptr) @ stdcall CM_Setup_DevNode(long long) -@ stdcall CM_Setup_DevNode_Ex(long long long) +@ stdcall CM_Setup_DevNode_Ex(long long ptr) @ stdcall CM_Test_Range_Available(int64 int64 ptr long) @ stdcall CM_Uninstall_DevNode(long long) -@ stdcall CM_Uninstall_DevNode_Ex(long long long) +@ stdcall CM_Uninstall_DevNode_Ex(long long ptr) @ stdcall CM_Unregister_Device_InterfaceA(str long) @ stdcall CM_Unregister_Device_InterfaceW(wstr long) -@ stdcall CM_Unregister_Device_Interface_ExA(str long long) -@ stdcall CM_Unregister_Device_Interface_ExW(wstr long long) +@ stdcall CM_Unregister_Device_Interface_ExA(str long ptr) +@ stdcall CM_Unregister_Device_Interface_ExW(wstr long ptr) @ stdcall DoesUserHavePrivilege(wstr) @ stub ExtensionPropSheetPageProc @ stdcall InstallCatalog(str str ptr)

1 0

01/01: [NTOSKRNL] Yet another ASSERT...
by Pierre Schweitzer 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41792c517ed0372e8342c… commit 41792c517ed0372e8342ce66163781871a59d078 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 4 22:02:27 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 4 22:02:27 2018 +0100 [NTOSKRNL] Yet another ASSERT... CORE-14285 --- ntoskrnl/cc/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 2e570a1ead..cf2fc328b1 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -696,6 +696,7 @@ CcRosUnmapVacb ( CcRosMarkDirtyVacb(Vacb); } + ASSERT(Vacb->MappedCount != 0); Vacb->MappedCount--; CcRosVacbDecRefCount(Vacb);

1 0

01/01: [NTOSKRNL] Add an assert against VACB reference count overflow. Very likely to be hit...
by Pierre Schweitzer 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dc4ac369279672c6784b… commit 8dc4ac369279672c6784b7a77396b6a8283414df Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 4 21:46:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 4 21:46:08 2018 +0100 [NTOSKRNL] Add an assert against VACB reference count overflow. Very likely to be hit... CORE-14285 --- ntoskrnl/cc/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index f66f230c2d..2e570a1ead 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -94,6 +94,7 @@ static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) } static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line) { + ASSERT(vacb->ReferenceCount != 0); --vacb->ReferenceCount; ASSERT(!(vacb->ReferenceCount == 0 && vacb->Dirty)); if (vacb->SharedCacheMap->Trace)

1 0

01/01: [SETUPAPI] Add a proper (SEH protected) check for LOG_CONF handles
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19fc20f22254cb6cb0dc2… commit 19fc20f22254cb6cb0dc24da752b3ea26bd2954d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 20:23:51 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 20:23:51 2018 +0100 [SETUPAPI] Add a proper (SEH protected) check for LOG_CONF handles --- dll/win32/setupapi/cfgmgr.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index c2044d98fa..3a6c2e94b3 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -341,7 +341,7 @@ done: BOOL IsValidRangeList( - _In_ PINTERNAL_RANGE_LIST pRangeList) + _In_opt_ PINTERNAL_RANGE_LIST pRangeList) { BOOL bValid = TRUE; @@ -363,6 +363,30 @@ IsValidRangeList( } +BOOL +IsValidLogConf( + _In_opt_ PLOG_CONF_INFO pLogConfInfo) +{ + BOOL bValid = TRUE; + + if (pLogConfInfo == NULL) + return FALSE; + + _SEH2_TRY + { + if (pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + bValid = FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + return bValid; +} + + /*********************************************************************** * CMP_GetBlockedDriverInfo [SETUPAPI.@] */ @@ -2049,7 +2073,7 @@ CM_Free_Log_Conf_Ex( return CR_ACCESS_DENIED; pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; if (ulFlags != 0) @@ -2103,7 +2127,7 @@ CM_Free_Log_Conf_Handle( TRACE("CM_Free_Log_Conf_Handle(%lx)\n", lcLogConf); pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; HeapFree(GetProcessHeap(), 0, pLogConfInfo); @@ -4709,7 +4733,7 @@ CM_Get_Log_Conf_Priority_Ex( lcLogConf, pPriority, ulFlags, hMachine); pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; if (pPriority == NULL) @@ -4800,7 +4824,7 @@ CM_Get_Next_Log_Conf_Ex( *plcLogConf = 0; pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; if (ulFlags != 0)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018