Ros-diffs November 2021

ros-diffs@reactos.org

23 participants
97 discussions

[reactos] 02/03: [REACTOS] Fix traces with missing arguments.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0af3689c2ea5e33b275a5… commit 0af3689c2ea5e33b275a5096bc440ec84eb431bc Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 21 12:37:04 2021 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 21 12:57:35 2021 -0500 [REACTOS] Fix traces with missing arguments. Courtesy of VS Code Analysis warning C6064: Missing integer argument to 'DbgPrint' that corresponds to conversion specifier 'N'. --- base/services/dcomlaunch/dcomlaunch.c | 2 +- base/services/wmisvc/wmisvc.c | 2 +- base/services/wuauserv/wuauserv.c | 2 +- dll/win32/kernel32/winnls/string/lang.c | 4 ++-- drivers/bus/acpi/cmbatt/cmbatt.c | 7 ++++--- drivers/network/ndis/ndis/config.c | 2 +- drivers/wdm/audio/drivers/CMIDriver/minwave.cpp | 2 +- ntoskrnl/mm/i386/page.c | 5 +++-- ntoskrnl/se/token.c | 4 ++-- ntoskrnl/wmi/smbios.c | 3 ++- win32ss/user/ntuser/defwnd.c | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/base/services/dcomlaunch/dcomlaunch.c b/base/services/dcomlaunch/dcomlaunch.c index 49c8541c0c7..f67feb72e6e 100644 --- a/base/services/dcomlaunch/dcomlaunch.c +++ b/base/services/dcomlaunch/dcomlaunch.c @@ -90,7 +90,7 @@ ServiceControlHandler(DWORD dwControl, return ERROR_SUCCESS; default : - DPRINT1(" Control %lu received\n"); + DPRINT1(" Control %lu received\n", dwControl); return ERROR_CALL_NOT_IMPLEMENTED; } } diff --git a/base/services/wmisvc/wmisvc.c b/base/services/wmisvc/wmisvc.c index 07c94eddd43..ee0281d3c07 100644 --- a/base/services/wmisvc/wmisvc.c +++ b/base/services/wmisvc/wmisvc.c @@ -112,7 +112,7 @@ ServiceControlHandler(DWORD dwControl, return ERROR_SUCCESS; default : - DPRINT1(" Control %lu received\n"); + DPRINT1(" Control %lu received\n", dwControl); return ERROR_CALL_NOT_IMPLEMENTED; } } diff --git a/base/services/wuauserv/wuauserv.c b/base/services/wuauserv/wuauserv.c index 5ef0d287778..fed557d1b66 100644 --- a/base/services/wuauserv/wuauserv.c +++ b/base/services/wuauserv/wuauserv.c @@ -82,7 +82,7 @@ ServiceControlHandler(DWORD dwControl, return ERROR_SUCCESS; default : - DPRINT1("WU ServiceControlHandler() Control %lu received\n"); + DPRINT1("WU ServiceControlHandler() Control %lu received\n", dwControl); return ERROR_CALL_NOT_IMPLEMENTED; } } diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index 06be3da8cb7..4841e7a9d57 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -3239,7 +3239,7 @@ EnumSystemCodePagesW ( { ENUMSYSTEMCODEPAGES_CALLBACKS procs; - TRACE("(%p,0x%08X,0x%08lX)\n", lpCodePageEnumProc, dwFlags); + TRACE("(%p,0x%08X)\n", lpCodePageEnumProc, dwFlags); procs.procA = NULL; procs.procW = lpCodePageEnumProc; @@ -3261,7 +3261,7 @@ EnumSystemCodePagesA ( { ENUMSYSTEMCODEPAGES_CALLBACKS procs; - TRACE("(%p,0x%08X,0x%08lX)\n", lpCodePageEnumProc, dwFlags); + TRACE("(%p,0x%08X)\n", lpCodePageEnumProc, dwFlags); procs.procA = lpCodePageEnumProc; procs.procW = NULL; diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index 69000fcf032..257af8e4eb3 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -65,7 +65,7 @@ CmBattPowerCallBack(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, else if (CmBattDebug & 0x10) { /* Unknown value */ - DbgPrint("CmBattPowerCallBack: unknown argument2 = %08x\n"); + DbgPrint("CmBattPowerCallBack: unknown argument2 = %08x\n", Value); } } } @@ -770,10 +770,11 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: Want %X CurrentCap %X\n", Capacity, DeviceExtension->RemainingCapacity); if (CmBattDebug & CMBATT_ACPI_WARNING) - DbgPrint("CmBattSetStatusNotify: Set to: [%#08lx][%#08lx][%#08lx] Status %x\n", + DbgPrint("CmBattSetStatusNotify: Set to: [%#08lx][%#08lx][%#08lx] Status %lx\n", BatteryNotify->PowerState, BatteryNotify->LowCapacity, - BatteryNotify->HighCapacity); + BatteryNotify->HighCapacity, + Status); return Status; } diff --git a/drivers/network/ndis/ndis/config.c b/drivers/network/ndis/ndis/config.c index 288a1ce7504..a5235e8a205 100644 --- a/drivers/network/ndis/ndis/config.c +++ b/drivers/network/ndis/ndis/config.c @@ -553,7 +553,7 @@ NdisReadConfiguration( (*ParameterValue)->ParameterData.IntegerData = NDIS_VERSION; *Status = NDIS_STATUS_SUCCESS; - NDIS_DbgPrint(MAX_TRACE,("ParameterType = %0x%x, ParameterValue = 0x%x\n", + NDIS_DbgPrint(MAX_TRACE,("ParameterType = 0x%x, ParameterValue = 0x%x\n", (*ParameterValue)->ParameterType, (*ParameterValue)->ParameterData.IntegerData)); return; } diff --git a/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp b/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp index 331dcdbf052..1070757fdca 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp @@ -83,7 +83,7 @@ STDMETHODIMP CMiniportWaveCMI::NonDelegatingQueryInterface(REFIID Interface, PVO { PAGED_CODE(); ASSERT(Object); - DBGPRINT(("CMiniportWaveCMI[%p]::NonDelegatingQueryInterface")); + DBGPRINT(("CMiniportWaveCMI[%p]::NonDelegatingQueryInterface", this)); if (IsEqualGUIDAligned(Interface,IID_IUnknown)) { #ifdef WAVERT diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index cf2e012389b..a9ba2eb1179 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -261,7 +261,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, { if ((Address >= MmSystemRangeStart) || Add2Ptr(Address, PAGE_SIZE) >= MmSystemRangeStart) { - DPRINT1("Process %p given for kernel-mode mapping at %p -- %lu pages starting at %Ix\n", Process, Address); + DPRINT1("Process %p given for kernel-mode mapping at %p\n", Process, Address); KeBugCheck(MEMORY_MANAGEMENT); } @@ -625,7 +625,8 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, { if ((Address >= MmSystemRangeStart) || Add2Ptr(Address, PAGE_SIZE) >= MmSystemRangeStart) { - DPRINT1("Process %p given for kernel-mode mapping at %p -- %lu pages starting at %Ix\n", Process, Address); + DPRINT1("Process %p given for kernel-mode mapping at %p -- 1 page starting at %Ix\n", + Process, Address, Page); KeBugCheck(MEMORY_MANAGEMENT); } diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 67beb8a8bfc..fb1b0a52159 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -6352,7 +6352,7 @@ NtOpenThreadTokenEx( KernelMode, &NewToken); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenThreadTokenEx(): Failed to duplicate the token (Status 0x%lx)\n"); + DPRINT1("NtOpenThreadTokenEx(): Failed to duplicate the token (Status 0x%lx)\n", Status); } ObReferenceObject(NewToken); @@ -6393,7 +6393,7 @@ NtOpenThreadTokenEx( Status = PsImpersonateClient(Thread, NewToken, FALSE, EffectiveOnly, ImpersonationLevel); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenThreadTokenEx(): Failed to impersonate the client (Status 0x%lx)\n"); + DPRINT1("NtOpenThreadTokenEx(): Failed to impersonate the client (Status 0x%lx)\n", Status); } } diff --git a/ntoskrnl/wmi/smbios.c b/ntoskrnl/wmi/smbios.c index 389678d4c01..b9aafae5647 100644 --- a/ntoskrnl/wmi/smbios.c +++ b/ntoskrnl/wmi/smbios.c @@ -182,7 +182,8 @@ WmipGetRawSMBiosTableData( 'BTMS'); if (BiosTables == NULL) { - DPRINT1("Failed to allocate %lu bytes for the SMBIOS table\n"); + DPRINT1("Failed to allocate %lu bytes for the SMBIOS table\n", + HeaderSize + TableSize); return STATUS_INSUFFICIENT_RESOURCES; } diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 660fd4c1494..ea6adc73844 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -414,7 +414,7 @@ UserPaintCaption(PWND pWnd, INT Flags) * RealUserDrawCaption in order to draw the classic caption when themes * are disabled but the themes service is enabled */ - TRACE("UDCB Flags %08x\n"); + TRACE("UDCB Flags %08x\n", Flags); co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCUAHDRAWCAPTION, Flags, 0); } else

3 years, 1 month

[reactos] 01/03: [NTOS] Fix broken SAL annotations on MmDereferenceSegmentWithLock.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7b270347950c710c64be… commit a7b270347950c710c64be8f03db86918585aa0cb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Oct 31 17:02:38 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 21 12:47:46 2021 -0500 [NTOS] Fix broken SAL annotations on MmDereferenceSegmentWithLock. --- ntoskrnl/include/internal/mm.h | 5 +++-- ntoskrnl/mm/section.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index bb27544a949..654f23c6ee0 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1495,11 +1495,12 @@ _When_(OldIrql == MM_NOIRQL, _IRQL_requires_max_(DISPATCH_LEVEL)) _When_(OldIrql == MM_NOIRQL, _Requires_lock_not_held_(MmPfnLock)) _When_(OldIrql != MM_NOIRQL, _Requires_lock_held_(MmPfnLock)) _When_(OldIrql != MM_NOIRQL, _Releases_lock_(MmPfnLock)) -_When_(OldIrql != MM_NOIRQL, _IRQL_restores_(OldIrql)) _When_(OldIrql != MM_NOIRQL, _IRQL_requires_(DISPATCH_LEVEL)) VOID NTAPI -MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql); +MmDereferenceSegmentWithLock( + _In_ PMM_SECTION_SEGMENT Segment, + _In_ _When_(OldIrql != MM_NOIRQL, _IRQL_restores_) KIRQL OldIrql); _IRQL_requires_max_(DISPATCH_LEVEL) _Requires_lock_not_held_(MmPfnLock) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index e106e0a66d1..44b5710f6f4 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -991,11 +991,12 @@ _When_(OldIrql == MM_NOIRQL, _IRQL_requires_max_(DISPATCH_LEVEL)) _When_(OldIrql == MM_NOIRQL, _Requires_lock_not_held_(MmPfnLock)) _When_(OldIrql != MM_NOIRQL, _Requires_lock_held_(MmPfnLock)) _When_(OldIrql != MM_NOIRQL, _Releases_lock_(MmPfnLock)) -_When_(OldIrql != MM_NOIRQL, _IRQL_restores_(OldIrql)) _When_(OldIrql != MM_NOIRQL, _IRQL_requires_(DISPATCH_LEVEL)) VOID NTAPI -MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) +MmDereferenceSegmentWithLock( + _Inout_ PMM_SECTION_SEGMENT Segment, + _In_ _When_(OldIrql != MM_NOIRQL, _IRQL_restores_) KIRQL OldIrql) { /* Lock the PFN lock because we mess around with SectionObjectPointers */ if (OldIrql == MM_NOIRQL)

3 years, 1 month

[reactos] 01/01: [NTOS:IO] Use a guarded region in IopQueueIrpToThread.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e76fb9fe13436a542cc6… commit 2e76fb9fe13436a542cc647bd3cd4a016a6690b6 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Oct 28 10:59:20 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 20 14:58:51 2021 -0500 [NTOS:IO] Use a guarded region in IopQueueIrpToThread. We're protecting against IopCompleteRequest, which is a special kernel APC. So this is a little bit faster than raising the IRQL. --- ntoskrnl/include/internal/io_x.h | 17 +++++++++++------ ntoskrnl/include/internal/ke_x.h | 36 ++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/include/internal/io_x.h b/ntoskrnl/include/internal/io_x.h index 7cf42e9dc02..88b19160448 100644 --- a/ntoskrnl/include/internal/io_x.h +++ b/ntoskrnl/include/internal/io_x.h @@ -48,22 +48,27 @@ FORCEINLINE VOID IopQueueIrpToThread(IN PIRP Irp) { - KIRQL OldIrql; + PETHREAD Thread = Irp->Tail.Overlay.Thread; - /* Raise to APC Level */ - KeRaiseIrql(APC_LEVEL, &OldIrql); + /* Disable special kernel APCs so we can't race with IopCompleteRequest. + * IRP's thread must be the current thread */ + KeEnterGuardedRegionThread(&Thread->Tcb); /* Insert it into the list */ - InsertHeadList(&Irp->Tail.Overlay.Thread->IrpList, &Irp->ThreadListEntry); + InsertHeadList(&Thread->IrpList, &Irp->ThreadListEntry); - /* Lower irql */ - KeLowerIrql(OldIrql); + /* Leave the guarded region */ + KeLeaveGuardedRegionThread(&Thread->Tcb); } FORCEINLINE VOID IopUnQueueIrpFromThread(IN PIRP Irp) { + /* Special kernel APCs must be disabled so we can't race with + * IopCompleteRequest (or because we are called from there) */ + ASSERT(KeAreAllApcsDisabled()); + /* Remove it from the list and reset it */ if (IsListEmpty(&Irp->ThreadListEntry)) return; diff --git a/ntoskrnl/include/internal/ke_x.h b/ntoskrnl/include/internal/ke_x.h index 7a00fba8f9c..70fa05e1d12 100644 --- a/ntoskrnl/include/internal/ke_x.h +++ b/ntoskrnl/include/internal/ke_x.h @@ -28,12 +28,12 @@ KeGetPreviousMode(VOID) { \ /* Sanity checks */ \ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); \ - ASSERT(_Thread == KeGetCurrentThread()); \ - ASSERT((_Thread->SpecialApcDisable <= 0) && \ - (_Thread->SpecialApcDisable != -32768)); \ + ASSERT((_Thread) == KeGetCurrentThread()); \ + ASSERT(((_Thread)->SpecialApcDisable <= 0) && \ + ((_Thread)->SpecialApcDisable != -32768)); \ \ /* Disable Special APCs */ \ - _Thread->SpecialApcDisable--; \ + (_Thread)->SpecialApcDisable--; \ } #define KeEnterGuardedRegion() \ @@ -49,14 +49,14 @@ KeGetPreviousMode(VOID) { \ /* Sanity checks */ \ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); \ - ASSERT(_Thread == KeGetCurrentThread()); \ - ASSERT(_Thread->SpecialApcDisable < 0); \ + ASSERT((_Thread) == KeGetCurrentThread()); \ + ASSERT((_Thread)->SpecialApcDisable < 0); \ \ /* Leave region and check if APCs are OK now */ \ - if (!(++_Thread->SpecialApcDisable)) \ + if (!(++(_Thread)->SpecialApcDisable)) \ { \ /* Check for Kernel APCs on the list */ \ - if (!IsListEmpty(&_Thread->ApcState. \ + if (!IsListEmpty(&(_Thread)->ApcState. \ ApcListHead[KernelMode])) \ { \ /* Check for APC Delivery */ \ @@ -77,12 +77,12 @@ KeGetPreviousMode(VOID) #define KeEnterCriticalRegionThread(_Thread) \ { \ /* Sanity checks */ \ - ASSERT(_Thread == KeGetCurrentThread()); \ - ASSERT((_Thread->KernelApcDisable <= 0) && \ - (_Thread->KernelApcDisable != -32768)); \ + ASSERT((_Thread) == KeGetCurrentThread()); \ + ASSERT(((_Thread)->KernelApcDisable <= 0) && \ + ((_Thread)->KernelApcDisable != -32768)); \ \ /* Disable Kernel APCs */ \ - _Thread->KernelApcDisable--; \ + (_Thread)->KernelApcDisable--; \ } #define KeEnterCriticalRegion() \ @@ -97,18 +97,18 @@ KeGetPreviousMode(VOID) #define KeLeaveCriticalRegionThread(_Thread) \ { \ /* Sanity checks */ \ - ASSERT(_Thread == KeGetCurrentThread()); \ - ASSERT(_Thread->KernelApcDisable < 0); \ + ASSERT((_Thread) == KeGetCurrentThread()); \ + ASSERT((_Thread)->KernelApcDisable < 0); \ \ /* Enable Kernel APCs */ \ - _Thread->KernelApcDisable++; \ + (_Thread)->KernelApcDisable++; \ \ /* Check if Kernel APCs are now enabled */ \ - if (!(_Thread->KernelApcDisable)) \ + if (!((_Thread)->KernelApcDisable)) \ { \ /* Check if we need to request an APC Delivery */ \ - if (!(IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode])) && \ - !(_Thread->SpecialApcDisable)) \ + if (!(IsListEmpty(&(_Thread)->ApcState.ApcListHead[KernelMode])) && \ + !((_Thread)->SpecialApcDisable)) \ { \ /* Check for the right environment */ \ KiCheckForKernelApcDelivery(); \

3 years, 1 month

[reactos] 01/01: [CONFIGURE] Add support for 'Visual Studio 2022, v17.x'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d10682307707db5d417b… commit 8d10682307707db5d417b48cb5bf211811604541 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Nov 5 18:24:21 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Nov 20 12:14:32 2021 +0300 [CONFIGURE] Add support for 'Visual Studio 2022, v17.x' CORE-17733 --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 53eb586b339..33213aed58d 100755 --- a/configure.cmd +++ b/configure.cmd @@ -54,6 +54,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 + cl 2>&1 | findstr /R /c:"19\.3.\." > NUL && set VS_VERSION=17 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 14 ^(2015^)^) or version detection failed. goto quit

3 years, 1 month

[reactos] 01/01: [USER32] GetQueueStatus() should not return 0 when passing QS_ALLINPUT flag that includes QS_RAWINPUT (#4115)

by Julio Carchi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c4397afdfa7947694c2e… commit 9c4397afdfa7947694c2eaa48ce0291386f24a08 Author: Julio Carchi <julcar(a)informaticos.com> AuthorDate: Fri Nov 19 18:45:35 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 20 00:45:35 2021 +0100 [USER32] GetQueueStatus() should not return 0 when passing QS_ALLINPUT flag that includes QS_RAWINPUT (#4115) GTK applications call GetQueueStatus(QS_ALLINPUT), where QS_ALLINPUT specifies the QS_RAWINPUT flag as well, when these are compiled for Windows XP+, and they expect the call to succeed on this platform. On one side, ReactOS does not currently support this flag at all, but since it claims to be XP/2003-compatible, applications may implicitly expect the flag to be supported by GetQueueStatus() and the function *NOT* failing when this flag is set. (Later GTK apps don't care and just call GetQueueStatus(QS_ALLINPUT) that includes QS_RAWINPUT, and therefore would fail as well on e.g. Windows 2000...) Otherwise, an observable effect is that some versions of libgdk-win32-2.0.0.dll enter into an infinite loop when calling GetQueueStatus(QS_ALLINPUT), since this call always failed on ReactOS. On the other side, however, we should honour our winetests that handle the presence of the QS_RAWINPUT flag and behave differently accordingly. But since we do not support QS_RAWINPUT yet, we should keep their old behaviour where QS_RAWINPUT is unused. Thus, in order to accomodate both sides, we don't fail the GetQueueStatus() call, but just set the ERROR_INVALID_FLAGS last error and continue it. This fixes CORE-15686, CORE-17551 and probably CORE-11850. Fixes also all user32:TrackMouseEvent tests. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- win32ss/user/user32/windows/message.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index 607ae7dda9b..1c745cb4584 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -2899,12 +2899,21 @@ DWORD WINAPI RealGetQueueStatus(UINT flags) { - #define QS_TEMPALLINPUT 255 // ATM, do not support QS_RAWINPUT - if (flags & ~(QS_SMRESULT|QS_ALLPOSTMESSAGE|QS_TEMPALLINPUT)) + if (flags & ~(QS_ALLINPUT|QS_ALLPOSTMESSAGE|QS_SMRESULT)) { SetLastError( ERROR_INVALID_FLAGS ); return 0; } + /** ATM, we do not support QS_RAWINPUT, but we need to support apps that pass + ** this flag along, while also working around QS_RAWINPUT checks in winetests. + ** Just set the last error to ERROR_INVALID_FLAGS but do not fail the call. + **/ + if (flags & QS_RAWINPUT) + { + SetLastError(ERROR_INVALID_FLAGS); + flags &= ~QS_RAWINPUT; + } + /**/ return NtUserxGetQueueStatus(flags); }

3 years, 1 month

[reactos] 01/01: [WINSPOOL] QS_SENDMESSAGE|QS_ALLEVENTS == QS_ALLINPUT, so use the latter instead.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c8c9e1aba52d548df018… commit 7c8c9e1aba52d548df01890a9c2a66c9dc9ec02b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 19 21:13:26 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 21:13:26 2021 +0100 [WINSPOOL] QS_SENDMESSAGE|QS_ALLEVENTS == QS_ALLINPUT, so use the latter instead. --- win32ss/printing/base/winspool/ports.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/printing/base/winspool/ports.c b/win32ss/printing/base/winspool/ports.c index 2dd27556a8a..5f8353c54b3 100644 --- a/win32ss/printing/base/winspool/ports.c +++ b/win32ss/printing/base/winspool/ports.c @@ -77,7 +77,7 @@ StartPortThread( LPWSTR pName, HWND hWnd, LPWSTR pPortName, PPfpFunction fpFunct CloseHandle( htHandle ); - while ( MsgWaitForMultipleObjects( 1, &PortThreadInfo.hEvent, FALSE, INFINITE, QS_SENDMESSAGE|QS_ALLEVENTS ) == 1 ) + while ( MsgWaitForMultipleObjects( 1, &PortThreadInfo.hEvent, FALSE, INFINITE, QS_ALLINPUT ) == 1 ) { while ( PeekMessageW( &Msg, NULL, 0, 0, PM_REMOVE ) ) {

3 years, 1 month

[reactos] 01/01: [PSDK] Sort out the QS_*** definitions. Add the Win7+ QS_TOUCH and QS_POINTER.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d78a5b6dbf9de09d905de… commit d78a5b6dbf9de09d905def711cb0c3f763fcaed8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 19 18:23:35 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 18:23:57 2021 +0100 [PSDK] Sort out the QS_*** definitions. Add the Win7+ QS_TOUCH and QS_POINTER. In particular, define the compound QS_MOUSE, QS_INPUT, QS_ALLEVENTS and QS_ALLINPUT flags based on the other elementary QS_*** flags, instead of having magic values for these. --- sdk/include/psdk/winuser.h | 47 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 4ee8eaf49a5..0b5f2cd04cd 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -865,29 +865,36 @@ extern "C" { #define DWLP_DLGPROC (DWLP_MSGRESULT + sizeof(LRESULT)) #define DWLP_USER (DWLP_DLGPROC + sizeof(DLGPROC)) +#define QS_KEY 1 +#define QS_MOUSEMOVE 2 +#define QS_MOUSEBUTTON 4 +#define QS_POSTMESSAGE 8 +#define QS_TIMER 16 +#define QS_PAINT 32 +#define QS_SENDMESSAGE 64 +#define QS_HOTKEY 128 +#define QS_ALLPOSTMESSAGE 256 + #if (_WIN32_WINNT >= 0x0501) -#define QS_ALLEVENTS 1215 -#define QS_ALLINPUT 1279 -#define QS_RAWINPUT 1024 -#else -#define QS_ALLEVENTS 191 -#define QS_ALLINPUT 255 +#define QS_RAWINPUT 1024 #endif -#define QS_ALLPOSTMESSAGE 256 -#define QS_HOTKEY 128 -#if (_WIN32_WINNT >= 0x0501) -#define QS_INPUT 1031 +#if (_WIN32_WINNT >= 0x0602) +#define QS_TOUCH 2048 +#define QS_POINTER 4096 +#endif + +#define QS_MOUSE (QS_MOUSEMOVE | QS_MOUSEBUTTON) + +#if (_WIN32_WINNT >= 0x0602) +#define QS_INPUT (QS_KEY | QS_MOUSE | QS_RAWINPUT | QS_TOUCH | QS_POINTER) +#elif (_WIN32_WINNT >= 0x0501) +#define QS_INPUT (QS_KEY | QS_MOUSE | QS_RAWINPUT) #else -#define QS_INPUT 7 -#endif -#define QS_KEY 1 -#define QS_MOUSE 6 -#define QS_MOUSEBUTTON 4 -#define QS_MOUSEMOVE 2 -#define QS_PAINT 32 -#define QS_POSTMESSAGE 8 -#define QS_SENDMESSAGE 64 -#define QS_TIMER 16 +#define QS_INPUT (QS_KEY | QS_MOUSE) +#endif + +#define QS_ALLEVENTS (QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY) +#define QS_ALLINPUT (QS_ALLEVENTS | QS_SENDMESSAGE) #define USER_TIMER_MAXIMUM 2147483647 #define USER_TIMER_MINIMUM 10

3 years, 1 month

[reactos] 01/01: [PSDK] Unduplicate QS_RAWINPUT (#4116)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d1ecc4df8e7c12e6a15… commit 48d1ecc4df8e7c12e6a155d0d268ef5d2e549d8f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 19 17:56:44 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 19 17:56:44 2021 +0100 [PSDK] Unduplicate QS_RAWINPUT (#4116) Addendum to a7bf412a (r38925). --- sdk/include/psdk/winuser.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 487140761fc..4ee8eaf49a5 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -886,9 +886,6 @@ extern "C" { #define QS_MOUSEMOVE 2 #define QS_PAINT 32 #define QS_POSTMESSAGE 8 -#if (_WIN32_WINNT >= 0x0501) -#define QS_RAWINPUT 1024 -#endif #define QS_SENDMESSAGE 64 #define QS_TIMER 16

3 years, 1 month

[reactos] 01/01: [CODEOWNERS] Add myself as maintainer for Security Manager

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=009f2c3917be8d28b8bba… commit 009f2c3917be8d28b8bba13bce4206818bf0a9d6 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Nov 19 12:01:19 2021 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Nov 19 12:01:19 2021 +0100 [CODEOWNERS] Add myself as maintainer for Security Manager From now on I'll take care of this subsystem of the kernel. --- CODEOWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 86f8aa11961..fa505246fd4 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -246,6 +246,12 @@ # S: Maintained /sdk/lib/rtl/ @HeisSpiter @learn-more @ThFabba @tkreuzer +# Security Manager +# M: GeoB99, George Bișoc +# S: Maintained +/modules/rostests/kmtests/ntos_se/ @GeoB99 +/ntoskrnl/se/ @GeoB99 + # Shell Extensions # M: # R: learn-more, learn_more, Mark Jansen

3 years, 1 month

[reactos] 04/04: [FREELDR] Add RegCloseKey() and use it where registry keys need to be closed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b3197783833d322fd392… commit 2b3197783833d322fd3929db074500b253496502 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 19 03:55:15 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 03:55:21 2021 +0100 [FREELDR] Add RegCloseKey() and use it where registry keys need to be closed. Actually, RegCloseKey() is here a dummy macro that just "returns" success. Indeed, the internal implementation of RegOpenKey() doesn't really allocate internal structures: it just returns a "pointer" to already existing allocated data. Therefore nothing needs to be closed/freed later on. --- boot/freeldr/freeldr/ntldr/registry.c | 15 +++- boot/freeldr/freeldr/ntldr/registry.h | 7 ++ boot/freeldr/freeldr/ntldr/winldr.c | 4 ++ boot/freeldr/freeldr/ntldr/wlregistry.c | 121 +++++++++++++++++--------------- 4 files changed, 89 insertions(+), 58 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 70a2f2eaa0e..07438b52423 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -58,6 +58,7 @@ RegImportBinaryHive( _In_ ULONG ChunkSize) { NTSTATUS Status; + TRACE("RegImportBinaryHive(%p, 0x%lx)\n", ChunkBase, ChunkSize); /* Allocate and initialize the hive */ @@ -77,8 +78,8 @@ RegImportBinaryHive( NULL); if (!NT_SUCCESS(Status)) { - CmpFree(CmHive, 0); ERR("Corrupted hive %p!\n", ChunkBase); + CmpFree(CmHive, 0); return FALSE; } @@ -101,6 +102,7 @@ RegInitCurrentControlSet( ULONG LastKnownGoodSet = 0; ULONG DataSize; LONG Error; + TRACE("RegInitCurrentControlSet\n"); Error = RegOpenKey(NULL, @@ -121,6 +123,7 @@ RegInitCurrentControlSet( if (Error != ERROR_SUCCESS) { ERR("RegQueryValue('Default') failed (Error %u)\n", (int)Error); + RegCloseKey(SelectKey); return Error; } @@ -133,9 +136,12 @@ RegInitCurrentControlSet( if (Error != ERROR_SUCCESS) { ERR("RegQueryValue('LastKnownGood') failed (Error %u)\n", (int)Error); + RegCloseKey(SelectKey); return Error; } + RegCloseKey(SelectKey); + CurrentSet = (LastKnownGood) ? LastKnownGoodSet : DefaultSet; wcscpy(ControlSetKeyName, L"ControlSet"); switch(CurrentSet) @@ -169,6 +175,9 @@ RegInitCurrentControlSet( Error = RegOpenKey(SystemKey, ControlSetKeyName, &CurrentControlSetKey); + + RegCloseKey(SystemKey); + if (Error != ERROR_SUCCESS) { ERR("RegOpenKey(CurrentControlSetKey) failed (Error %lu)\n", Error); @@ -283,6 +292,8 @@ RegEnumKey( if (SubKey != NULL) *SubKey = (HKEY)SubKeyNode; + // else + // RegCloseKey((HKEY)SubKeyNode); TRACE("RegEnumKey done -> %u, '%.*S'\n", *NameSize, *NameSize, Name); return ERROR_SUCCESS; @@ -299,6 +310,7 @@ RegOpenKey( PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; HCELL_INDEX CellIndex; + TRACE("RegOpenKey(%p, '%S', %p)\n", ParentKey, KeyName, Key); /* Initialize the remaining path name */ @@ -314,6 +326,7 @@ RegOpenKey( UNICODE_STRING RegistryPath = RTL_CONSTANT_STRING(L"Registry"); UNICODE_STRING MachinePath = RTL_CONSTANT_STRING(L"MACHINE"); UNICODE_STRING SystemPath = RTL_CONSTANT_STRING(L"SYSTEM"); + TRACE("RegOpenKey: absolute path\n"); if ((RemainingPath.Length < sizeof(WCHAR)) || diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index b59cce682f4..8368749339d 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -32,6 +32,13 @@ LONG RegInitCurrentControlSet( _In_ BOOLEAN LastKnownGood); +/* + * LONG + * RegCloseKey( + * _In_ HKEY hKey); + */ +#define RegCloseKey(hKey) (ERROR_SUCCESS) + LONG RegEnumKey( _In_ HKEY Key, diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index a4238a4555a..e1b97336281 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -445,6 +445,7 @@ WinLdrDetectVersion(VOID) /* Key doesn't exist; assume NT 4.0 */ return _WIN32_WINNT_NT4; } + RegCloseKey(hKey); /* We may here want to read the value of ProductVersion */ return _WIN32_WINNT_WS03; @@ -739,11 +740,14 @@ WinLdrInitErrataInf( if (rc != ERROR_SUCCESS) { WARN("Could not retrieve the InfName value (Error %u)\n", (int)rc); + RegCloseKey(hKey); return FALSE; } // TODO: "SystemBiosDate" + RegCloseKey(hKey); + RtlStringCbPrintfA(ErrataFilePath, sizeof(ErrataFilePath), "%s%s%S", SystemRoot, "inf\\", szFileName); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 7d9d9219183..83bbda92f84 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -54,7 +54,6 @@ WinLdrLoadSystemHive( if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FullHiveName, Status); - UiMessageBox("Opening hive file failed!"); return FALSE; } @@ -62,8 +61,8 @@ WinLdrLoadSystemHive( Status = ArcGetFileInformation(FileId, &FileInfo); if (Status != ESUCCESS) { + WARN("Hive file has 0 size!"); ArcClose(FileId); - UiMessageBox("Hive file has 0 size!"); return FALSE; } HiveFileSize = FileInfo.EndingAddress.LowPart; @@ -75,8 +74,8 @@ WinLdrLoadSystemHive( if (HiveDataPhysical == NULL) { + WARN("Could not alloc memory for hive!"); ArcClose(FileId); - UiMessageBox("Unable to alloc memory for a hive!"); return FALSE; } @@ -91,9 +90,8 @@ WinLdrLoadSystemHive( Status = ArcRead(FileId, HiveDataPhysical, HiveFileSize, &BytesRead); if (Status != ESUCCESS) { - ArcClose(FileId); WARN("Error while reading '%s', Status: %u\n", FullHiveName, Status); - UiMessageBox("Unable to read from hive file!"); + ArcClose(FileId); return FALSE; } @@ -102,17 +100,17 @@ WinLdrLoadSystemHive( if (FsService) { BOOLEAN Success; - TRACE(" Adding filesystem service %S\n", FsService); + TRACE("Adding filesystem service %S\n", FsService); Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", NULL, (PWSTR)FsService); if (!Success) - TRACE(" Failed to add filesystem service\n"); + TRACE("Failed to add filesystem service\n"); } else { - TRACE(" No required filesystem service\n"); + TRACE("No required filesystem service\n"); } ArcClose(FileId); @@ -147,10 +145,11 @@ WinLdrInitSystemHive( TRACE("WinLdrInitSystemHive: loading hive %s%s\n", SearchPath, HiveName); Success = WinLdrLoadSystemHive(LoaderBlock, SearchPath, HiveName); - - /* Fail if failed... */ if (!Success) + { + UiMessageBox("Could not load %s hive!", HiveName); return FALSE; + } /* Import what was loaded */ Success = RegImportBinaryHive(VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); @@ -220,8 +219,8 @@ WinLdrGetNLSNames(PSTR AnsiName, /* Open the CodePage key */ rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", - &hKey); + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", + &hKey); if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't open CodePage registry key"); @@ -234,6 +233,7 @@ WinLdrGetNLSNames(PSTR AnsiName, if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get ACP NLS setting"); + RegCloseKey(hKey); return FALSE; } @@ -242,6 +242,7 @@ WinLdrGetNLSNames(PSTR AnsiName, if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "ACP NLS Setting exists, but isn't readable"); + //RegCloseKey(hKey); //return FALSE; wcscpy(NameBuffer, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 } @@ -253,6 +254,7 @@ WinLdrGetNLSNames(PSTR AnsiName, if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get OEMCP NLS setting"); + RegCloseKey(hKey); return FALSE; } @@ -261,15 +263,18 @@ WinLdrGetNLSNames(PSTR AnsiName, if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "OEMCP NLS setting exists, but isn't readable"); + //RegCloseKey(hKey); //return FALSE; wcscpy(NameBuffer, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 } sprintf(OemName, "%S", NameBuffer); + RegCloseKey(hKey); + /* Open the Language key */ rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", - &hKey); + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", + &hKey); if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't open Language registry key"); @@ -282,6 +287,7 @@ WinLdrGetNLSNames(PSTR AnsiName, if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get Language Default setting"); + RegCloseKey(hKey); return FALSE; } @@ -290,10 +296,12 @@ WinLdrGetNLSNames(PSTR AnsiName, if (rc != ERROR_SUCCESS) { //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Language Default setting exists, but isn't readable"); + RegCloseKey(hKey); return FALSE; } sprintf(LangName, "%S", NameBuffer); + RegCloseKey(hKey); return TRUE; } @@ -482,8 +490,8 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, IN PCSTR SystemRoot) { LONG rc = 0; - HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey; - PWSTR GroupNameBuffer; + HKEY hOrderKey, hServiceKey, hGroupKey, hDriverKey; + PWSTR GroupNameBuffer = NULL; WCHAR ServiceName[256]; ULONG OrderList[128]; ULONG BufferSize; @@ -503,51 +511,53 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, BOOLEAN Success; - /* get 'service group order' key */ + /* Get 'group order list' key */ rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ServiceGroupOrder", - &hGroupKey); - if (rc != ERROR_SUCCESS) { - - TRACE_CH(REACTOS, "Failed to open the 'ServiceGroupOrder' key (rc %d)\n", (int)rc); + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", + &hOrderKey); + if (rc != ERROR_SUCCESS) + { + TRACE_CH(REACTOS, "Failed to open the 'GroupOrderList' key (rc %d)\n", (int)rc); return; } - /* get 'group order list' key */ + /* Get 'services' key */ rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", - &hOrderKey); - if (rc != ERROR_SUCCESS) { - - TRACE_CH(REACTOS, "Failed to open the 'GroupOrderList' key (rc %d)\n", (int)rc); + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services", + &hServiceKey); + if (rc != ERROR_SUCCESS) + { + TRACE_CH(REACTOS, "Failed to open the 'Services' key (rc %d)\n", (int)rc); + RegCloseKey(hOrderKey); return; } - /* enumerate drivers */ + /* Get 'service group order' key */ rc = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services", - &hServiceKey); - if (rc != ERROR_SUCCESS) { - - TRACE_CH(REACTOS, "Failed to open the 'Services' key (rc %d)\n", (int)rc); - return; + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ServiceGroupOrder", + &hGroupKey); + if (rc != ERROR_SUCCESS) + { + TRACE_CH(REACTOS, "Failed to open the 'ServiceGroupOrder' key (rc %d)\n", (int)rc); + goto Quit; } - /* Get the Name Group */ + /* Get the Group Order List */ BufferSize = 4096; GroupNameBuffer = FrLdrHeapAlloc(BufferSize, TAG_WLDR_NAME); if (!GroupNameBuffer) { TRACE_CH(REACTOS, "Failed to allocate buffer\n"); - return; + RegCloseKey(hGroupKey); + goto Quit; } rc = RegQueryValue(hGroupKey, L"List", NULL, (PUCHAR)GroupNameBuffer, &BufferSize); - TRACE_CH(REACTOS, "RegQueryValue(): rc %d\n", (int)rc); + RegCloseKey(hGroupKey); + if (rc != ERROR_SUCCESS) { TRACE_CH(REACTOS, "Failed to query the 'List' value (rc %d)\n", (int)rc); - FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); - return; + goto Quit; } TRACE_CH(REACTOS, "BufferSize: %d\n", (int)BufferSize); TRACE_CH(REACTOS, "GroupNameBuffer: '%S'\n", GroupNameBuffer); @@ -563,12 +573,10 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, rc = RegQueryValue(hOrderKey, GroupName, NULL, (PUCHAR)OrderList, &BufferSize); if (rc != ERROR_SUCCESS) OrderList[0] = 0; - /* enumerate all drivers */ + /* Enumerate all drivers */ for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { - Index = 0; - - while (TRUE) + for (Index = 0; TRUE; Index++) { /* Get the Driver's Name */ ValueSize = sizeof(ServiceName); @@ -579,10 +587,7 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) - { - FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); - return; - } + goto Quit; //TRACE_CH(REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName); /* Read the Start Value */ @@ -643,12 +648,11 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, // ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName); } - Index++; + RegCloseKey(hDriverKey); } } - Index = 0; - while (TRUE) + for (Index = 0; TRUE; Index++) { /* Get the Driver's Name */ ValueSize = sizeof(ServiceName); @@ -658,10 +662,7 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) - { - FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); - return; - } + goto Quit; TRACE("Service %d: '%S'\n", (int)Index, ServiceName); /* Read the Start Value */ @@ -722,15 +723,21 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, // ServiceName, StartValue, TagValue, DriverGroup, GroupName); } - Index++; + RegCloseKey(hDriverKey); } /* Move to the next group name */ GroupName = GroupName + wcslen(GroupName) + 1; } +Quit: /* Free allocated memory */ - FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); + if (GroupNameBuffer) + FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); + + /* Close the registry key handles */ + RegCloseKey(hServiceKey); + RegCloseKey(hOrderKey); } static

3 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2021