Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 01/01: [CMAKE] Fix few copy-paste typos in add_pch() calls (#3508)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c18617fa71dbf18e5361… commit 8c18617fa71dbf18e5361432b49c936be7b4a3a6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Mar 6 19:11:56 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 6 19:11:56 2021 +0100 [CMAKE] Fix few copy-paste typos in add_pch() calls (#3508) Follow-up to e898c9e. --- dll/win32/fusion/CMakeLists.txt | 2 +- modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt | 2 +- modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt | 2 +- modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt | 2 +- modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 4 ++-- modules/rostests/kmtests/tcpip/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt index 5a19f11ac93..b180daf21f9 100644 --- a/dll/win32/fusion/CMakeLists.txt +++ b/dll/win32/fusion/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND COMMON_SOURCE add_library(fusion_common STATIC ${COMMON_SOURCE}) add_dependencies(fusion_common psdk) +add_pch(fusion_common precomp.h COMMON_SOURCE) add_library(fusion MODULE version.rc @@ -22,7 +23,6 @@ add_library(fusion MODULE set_module_type(fusion win32dll) target_link_libraries(fusion fusion_common uuid wine) add_importlibs(fusion bcrypt advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) -add_pch(fusion_common precomp.h COMMON_SOURCE) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt index 8d244b28323..6c22086ec75 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt @@ -10,5 +10,5 @@ set_module_type(fltmgr_create kernelmodedriver) target_link_libraries(fltmgr_create kmtest_printf ${PSEH_LIB}) add_importlibs(fltmgr_create fltmgr ntoskrnl hal) target_compile_definitions(fltmgr_create PRIVATE KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) -#add_pch(example_drv ../include/kmt_test.h) +#add_pch(fltmgr_create ../include/kmt_test.h) add_rostests_file(TARGET fltmgr_create) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt index 2095a385b4d..707083fe38e 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt @@ -10,5 +10,5 @@ set_module_type(FltMgrLoad_drv kernelmodedriver) target_link_libraries(FltMgrLoad_drv kmtest_printf ${PSEH_LIB}) add_importlibs(FltMgrLoad_drv fltmgr ntoskrnl hal) target_compile_definitions(FltMgrLoad_drv PRIVATE KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) -#add_pch(example_drv ../include/kmt_test.h) +#add_pch(FltMgrLoad_drv ../include/kmt_test.h) add_rostests_file(TARGET FltMgrLoad_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt index 3c1c4a54d57..f1365981290 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt @@ -11,5 +11,5 @@ set_module_type(fltmgrreg_drv kernelmodedriver) target_link_libraries(fltmgrreg_drv kmtest_printf ${PSEH_LIB}) add_importlibs(fltmgrreg_drv fltmgr ntoskrnl hal) target_compile_definitions(fltmgrreg_drv PRIVATE KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) -#add_pch(example_drv ../include/kmt_test.h) +#add_pch(fltmgrreg_drv ../include/kmt_test.h) add_rostests_file(TARGET fltmgrreg_drv) diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt index 600e0106dd5..3bc63f700e1 100644 --- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -28,7 +28,7 @@ set_module_type(cccopywrite_drv kernelmodedriver) target_link_libraries(cccopywrite_drv kmtest_printf ${PSEH_LIB}) add_importlibs(cccopywrite_drv ntoskrnl hal) target_compile_definitions(cccopywrite_drv PRIVATE KMT_STANDALONE_DRIVER) -#add_pch(cccopyread_drv ../include/kmt_test.h) +#add_pch(cccopywrite_drv ../include/kmt_test.h) add_rostests_file(TARGET cccopywrite_drv) # @@ -73,7 +73,7 @@ set_module_type(ccpinread_drv kernelmodedriver) target_link_libraries(ccpinread_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ccpinread_drv ntoskrnl hal) target_compile_definitions(ccpinread_drv PRIVATE KMT_STANDALONE_DRIVER) -#add_pch(ccmapdata_drv ../include/kmt_test.h) +#add_pch(ccpinread_drv ../include/kmt_test.h) add_rostests_file(TARGET ccpinread_drv) # diff --git a/modules/rostests/kmtests/tcpip/CMakeLists.txt b/modules/rostests/kmtests/tcpip/CMakeLists.txt index 94691d5f38b..d8a229ce3ef 100644 --- a/modules/rostests/kmtests/tcpip/CMakeLists.txt +++ b/modules/rostests/kmtests/tcpip/CMakeLists.txt @@ -12,5 +12,5 @@ set_module_type(tcpip_drv kernelmodedriver) target_link_libraries(tcpip_drv kmtest_printf ${PSEH_LIB}) add_importlibs(tcpip_drv ntoskrnl hal) target_compile_definitions(tcpip_drv PRIVATE KMT_STANDALONE_DRIVER) -#add_pch(example_drv ../include/kmt_test.h) +#add_pch(tcpip_drv ../include/kmt_test.h) add_rostests_file(TARGET tcpip_drv)

3 years, 8 months

[reactos] 01/01: [NETCFGX] LoadDNSSettings(): Improve one RegQueryValueExW() call (#2870)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62b4c61f82b4fb29faac6… commit 62b4c61f82b4fb29faac651414951a06969cf17d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu May 28 04:49:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 4 23:29:38 2021 +0100 [NETCFGX] LoadDNSSettings(): Improve one RegQueryValueExW() call (#2870) --- dll/win32/netcfgx/tcpipconf_notify.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c index 2844d3afb4e..21eaa3485a0 100644 --- a/dll/win32/netcfgx/tcpipconf_notify.c +++ b/dll/win32/netcfgx/tcpipconf_notify.c @@ -2719,6 +2719,8 @@ LoadDNSSettings( { dwSize = sizeof(DWORD); RegQueryValueExW(hKey, L"RegisterAdapterName", NULL, NULL, (LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, &dwSize); + + dwSize = sizeof(DWORD); RegQueryValueExW(hKey, L"RegistrationEnabled", NULL, NULL, (LPBYTE)&This->pCurrentConfig->pDNS->RegistrationEnabled, &dwSize); dwSize = sizeof(This->pCurrentConfig->pDNS->szDomain);

3 years, 8 months

[reactos] 01/01: [COMPILER_APITEST] Sync an '#if defined(_X86_)' (#3318)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b43bb63373fbfd0514f68… commit b43bb63373fbfd0514f685f3cf070b69f6901418 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 4 23:03:37 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 4 23:03:37 2021 +0100 [COMPILER_APITEST] Sync an '#if defined(_X86_)' (#3318) Addendum to dfccee7 (r41810). --- modules/rostests/apitests/compiler/pseh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/compiler/pseh.c b/modules/rostests/apitests/compiler/pseh.c index 61800b17cf6..86184375870 100644 --- a/modules/rostests/apitests/compiler/pseh.c +++ b/modules/rostests/apitests/compiler/pseh.c @@ -2643,7 +2643,7 @@ int call_test(int (* func)(void)) static int ret; static struct volatile_context before, after; static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; -#if !defined(_PSEH3_H_) && !defined(_MSC_VER) +#if defined(_X86_) && !defined(_PSEH3_H_) && !defined(_MSC_VER) static _SEH2Registration_t * prev_frame; _SEH2Registration_t passthrough_frame; #endif

3 years, 8 months

[reactos] 01/01: [CSRSRV] CsrApiHandleConnectionRequest(): Remove ASSERT() redundant condition (#2858)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63007901fd1f250568944… commit 63007901fd1f2505689449fb8a431be07c5e34f5 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 4 22:54:00 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 4 22:54:00 2021 +0100 [CSRSRV] CsrApiHandleConnectionRequest(): Remove ASSERT() redundant condition (#2858) Detected by Cppcheck: redundantCondition. Addendum to 835f3ef1. --- subsystems/win32/csrsrv/api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index a0b3de17c55..6ff8694537a 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -189,7 +189,7 @@ CsrApiHandleConnectionRequest(IN PCSR_API_MESSAGE ApiMessage) ConnectInfo->ServerProcessId = NtCurrentTeb()->ClientId.UniqueProcess; /* Accept the Connection */ - ASSERT(!AllowConnection || (AllowConnection && CsrProcess)); + ASSERT(!AllowConnection || CsrProcess); Status = NtAcceptConnectPort(&ServerPort, AllowConnection ? UlongToPtr(CsrProcess->SequenceNumber) : 0, &ApiMessage->Header,

3 years, 8 months

[reactos] 03/03: [FREELDR] LoadAndBootWindowsCommon(): Use UNREACHABLE, on success

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abc84a742b0133a3b36f4… commit abc84a742b0133a3b36f46a19753e1907f0bfc77 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Mar 5 00:43:15 2021 +0300 [FREELDR] LoadAndBootWindowsCommon(): Use UNREACHABLE, on success KiSystemStartup() is DECLSPEC_NORETURN. --- boot/freeldr/freeldr/ntldr/winldr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index e57c3826114..68036794941 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -1035,7 +1035,8 @@ LoadAndBootWindowsCommon( /* Pass control */ (*KiSystemStartup)(LoaderBlockVA); - return ESUCCESS; + + UNREACHABLE; // return ESUCCESS; } VOID

3 years, 8 months

[reactos] 02/03: [NTOS:KE] KiIdleLoop(): Propagate DECLSPEC_NORETURN to callers

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0400e781021d741754c9… commit e0400e781021d741754c9affe9a31a8670143790 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Mar 5 00:43:15 2021 +0300 [NTOS:KE] KiIdleLoop(): Propagate DECLSPEC_NORETURN to callers --- ntoskrnl/include/internal/amd64/ke.h | 2 +- ntoskrnl/include/internal/i386/ke.h | 5 ++++- ntoskrnl/include/internal/ke.h | 1 + ntoskrnl/ke/amd64/kiinit.c | 1 + ntoskrnl/ke/amd64/krnlinit.c | 1 + ntoskrnl/ke/arm/kiinit.c | 1 + ntoskrnl/ke/i386/kiinit.c | 2 ++ 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index fa0408b921e..d4e1354290d 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -310,7 +310,7 @@ struct _KPCR; //VOID KiInitializeTss(IN PKTSS Tss, IN UINT64 Stack); -VOID KiSwitchToBootStack(IN ULONG_PTR InitialStack); +DECLSPEC_NORETURN VOID KiSwitchToBootStack(IN ULONG_PTR InitialStack); VOID KiDivideErrorFault(VOID); VOID KiDebugTrapOrFault(VOID); VOID KiNmiInterrupt(VOID); diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index 5a41246212f..021a379472f 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -792,10 +792,11 @@ KiCheckForApcDelivery(IN PKTRAP_FRAME TrapFrame) // Switches from boot loader to initial kernel stack // FORCEINLINE +DECLSPEC_NORETURN VOID KiSwitchToBootStack(IN ULONG_PTR InitialStack) { - VOID NTAPI KiSystemStartupBootStack(VOID); + DECLSPEC_NORETURN VOID NTAPI KiSystemStartupBootStack(VOID); /* We have to switch to a new stack before continuing kernel initialization */ #ifdef __GNUC__ @@ -823,6 +824,8 @@ KiSwitchToBootStack(IN ULONG_PTR InitialStack) #else #error Unknown Compiler #endif + + UNREACHABLE; } // diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index f4a8289155e..31621647570 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -740,6 +740,7 @@ VOID NTAPI KiInitializeBugCheck(VOID); +DECLSPEC_NORETURN VOID NTAPI KiSystemStartup( diff --git a/ntoskrnl/ke/amd64/kiinit.c b/ntoskrnl/ke/amd64/kiinit.c index c8610b83e6b..eb66b349fa6 100644 --- a/ntoskrnl/ke/amd64/kiinit.c +++ b/ntoskrnl/ke/amd64/kiinit.c @@ -367,6 +367,7 @@ KiInitModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } CODE_SEG("INIT") +DECLSPEC_NORETURN VOID NTAPI KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index 8b5d7003cdf..a946d92801c 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -52,6 +52,7 @@ KiInitializeHandBuiltThread( } CODE_SEG("INIT") +DECLSPEC_NORETURN VOID NTAPI KiSystemStartupBootStack(VOID) diff --git a/ntoskrnl/ke/arm/kiinit.c b/ntoskrnl/ke/arm/kiinit.c index 03f22153de3..e5396370e96 100644 --- a/ntoskrnl/ke/arm/kiinit.c +++ b/ntoskrnl/ke/arm/kiinit.c @@ -327,6 +327,7 @@ KiInitializeMachineType(VOID) } } +DECLSPEC_NORETURN VOID KiInitializeSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 9fb22698bca..0414176c3d8 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -657,6 +657,7 @@ KiGetMachineBootPointers(IN PKGDTENTRY *Gdt, } CODE_SEG("INIT") +DECLSPEC_NORETURN VOID NTAPI KiSystemStartupBootStack(VOID) @@ -709,6 +710,7 @@ KiMarkPageAsReadOnly( } CODE_SEG("INIT") +DECLSPEC_NORETURN VOID NTAPI KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)

3 years, 8 months

[reactos] 01/03: [NTOS:KE] KiIdleLoop(): Add DECLSPEC_NORETURN, Remove FASTCALL

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f1d79f0c586b9fbfd393… commit 5f1d79f0c586b9fbfd393f1cc81f6fed67edac44 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Mar 5 00:43:15 2021 +0300 [NTOS:KE] KiIdleLoop(): Add DECLSPEC_NORETURN, Remove FASTCALL --- ntoskrnl/include/internal/ke.h | 2 +- ntoskrnl/ke/amd64/stubs.c | 2 +- ntoskrnl/ke/arm/thrdini.c | 2 +- ntoskrnl/ke/arm/trapc.c | 1 + ntoskrnl/ke/i386/thrdini.c | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index 7bdd97fd8ee..f4a8289155e 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -1015,8 +1015,8 @@ KiQuantumEnd( VOID ); +DECLSPEC_NORETURN VOID -FASTCALL KiIdleLoop( VOID ); diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 08076199d56..1afc1f54dea 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -167,8 +167,8 @@ KiSwitchKernelStack(PVOID StackBase, PVOID StackLimit) return OldStackBase; } +DECLSPEC_NORETURN VOID -FASTCALL KiIdleLoop(VOID) { PKPRCB Prcb = KeGetCurrentPrcb(); diff --git a/ntoskrnl/ke/arm/thrdini.c b/ntoskrnl/ke/arm/thrdini.c index f8326724e57..e2833c6f808 100644 --- a/ntoskrnl/ke/arm/thrdini.c +++ b/ntoskrnl/ke/arm/thrdini.c @@ -148,8 +148,8 @@ KiInitializeContextThread(IN PKTHREAD Thread, Thread->KernelStack = (PVOID)CtxSwitchFrame; } +DECLSPEC_NORETURN VOID -FASTCALL KiIdleLoop(VOID) { PKPRCB Prcb = KeGetCurrentPrcb(); diff --git a/ntoskrnl/ke/arm/trapc.c b/ntoskrnl/ke/arm/trapc.c index 0f94c17ea95..020ec8db7f2 100644 --- a/ntoskrnl/ke/arm/trapc.c +++ b/ntoskrnl/ke/arm/trapc.c @@ -15,6 +15,7 @@ /* FUNCTIONS ******************************************************************/ #if 0 +DECLSPEC_NORETURN VOID KiIdleLoop(VOID) { diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index 7ce51632af2..bb90f78cadf 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -266,8 +266,8 @@ KiInitializeContextThread(IN PKTHREAD Thread, Thread->KernelStack = (PVOID)CtxSwitchFrame; } +DECLSPEC_NORETURN VOID -FASTCALL KiIdleLoop(VOID) { PKPRCB Prcb = KeGetCurrentPrcb();

3 years, 8 months

[reactos] 01/01: [DBGHELP] Fix use of unix path

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43ea86440535c37e0f61d… commit 43ea86440535c37e0f61dddda99a22b5355c58b5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 4 17:38:33 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Mar 4 17:41:25 2021 +0100 [DBGHELP] Fix use of unix path --- dll/win32/dbghelp/module.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index bf3cf8852e4..a74b12d6663 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -542,7 +542,11 @@ static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fma */ static BOOL image_locate_debug_link(const struct module* module, struct image_file_map* fmap, const char* filename, DWORD crc) { +#ifndef __REACTOS__ static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; +#else + static const WCHAR globalDebugDirW[] = {'\0'}; +#endif static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; const size_t globalDebugDirLen = ARRAY_SIZE(globalDebugDirW); size_t filename_len, path_len;

3 years, 8 months

[reactos] 02/02: [NTDLL_APITEST] Implement testcase for NtCompareTokens

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69ca7258d010ae68c1899… commit 69ca7258d010ae68c18990a3e8a735dd0b351341 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Feb 6 18:22:03 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 4 16:22:56 2021 +0300 [NTDLL_APITEST] Implement testcase for NtCompareTokens --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/NtCompareTokens.c | 109 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 112 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 0ed66a9fed6..c8f9cbc207e 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE NtAcceptConnectPort.c NtAllocateVirtualMemory.c NtApphelpCacheControl.c + NtCompareTokens.c NtContinue.c NtCreateFile.c NtCreateKey.c diff --git a/modules/rostests/apitests/ntdll/NtCompareTokens.c b/modules/rostests/apitests/ntdll/NtCompareTokens.c new file mode 100644 index 00000000000..5b8af9aebb8 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtCompareTokens.c @@ -0,0 +1,109 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtCompareTokens API + * COPYRIGHT: Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +static +HANDLE +GetTokenFromCurrentProcess(VOID) +{ + BOOL Success; + HANDLE Token; + + Success = OpenProcessToken(GetCurrentProcess(), + TOKEN_READ | TOKEN_ADJUST_PRIVILEGES | TOKEN_DUPLICATE, + &Token); + if (!Success) + { + skip("OpenProcessToken() has failed to get the process' token (error code: %lu)!\n", GetLastError()); + return NULL; + } + + return Token; +} + +static +HANDLE +GetDuplicateToken(_In_ HANDLE Token) +{ + BOOL Success; + HANDLE ReturnedToken; + + Success = DuplicateToken(Token, SecurityIdentification, &ReturnedToken); + if (!Success) + { + skip("DuplicateToken() has failed to get the process' token (error code: %lu)!\n", GetLastError()); + return NULL; + } + + return ReturnedToken; +} + +static +VOID +DisableTokenPrivileges(_In_ HANDLE Token) +{ + BOOL Success; + + Success = AdjustTokenPrivileges(Token, TRUE, NULL, 0, NULL, NULL); + if (!Success) + { + skip("AdjustTokenPrivileges() has failed to disable the privileges (error code: %lu)!\n", GetLastError()); + return; + } +} + +START_TEST(NtCompareTokens) +{ + NTSTATUS Status; + HANDLE ProcessToken = NULL; + HANDLE DuplicatedToken = NULL; + BOOLEAN IsEqual = FALSE; + + /* Obtain some tokens from current process */ + ProcessToken = GetTokenFromCurrentProcess(); + DuplicatedToken = GetDuplicateToken(ProcessToken); + + /* + * Give invalid token handles and don't output + * the returned value in the last parameter. + */ + Status = NtCompareTokens(NULL, NULL, NULL); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* + * Token handles are valid but don't output + * the returned value. + */ + Status = NtCompareTokens(ProcessToken, ProcessToken, NULL); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* The tokens are the same */ + Status = NtCompareTokens(ProcessToken, ProcessToken, &IsEqual); + ok_hex(Status, STATUS_SUCCESS); + ok(IsEqual == TRUE, "Equal tokens expected but they aren't (current value: %u)!\n", IsEqual); + + /* A token is duplicated with equal SIDs and privileges */ + Status = NtCompareTokens(ProcessToken, DuplicatedToken, &IsEqual); + ok_hex(Status, STATUS_SUCCESS); + ok(IsEqual == TRUE, "Equal tokens expected but they aren't (current value: %u)!\n", IsEqual); + + /* Disable all the privileges for token. */ + DisableTokenPrivileges(ProcessToken); + + /* + * The main token has privileges disabled but the + * duplicated one has them enabled still. + */ + Status = NtCompareTokens(ProcessToken, DuplicatedToken, &IsEqual); + ok_hex(Status, STATUS_SUCCESS); + ok(IsEqual == FALSE, "Tokens mustn't be equal (current value: %u)!\n", IsEqual); + + /* We finished our tests, close the tokens */ + CloseHandle(ProcessToken); + CloseHandle(DuplicatedToken); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index a1de8c81629..a65d6770dcd 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -8,6 +8,7 @@ extern void func_load_notifications(void); extern void func_NtAcceptConnectPort(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtApphelpCacheControl(void); +extern void func_NtCompareTokens(void); extern void func_NtContinue(void); extern void func_NtCreateFile(void); extern void func_NtCreateKey(void); @@ -84,6 +85,7 @@ const struct test winetest_testlist[] = { "NtAcceptConnectPort", func_NtAcceptConnectPort }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtApphelpCacheControl", func_NtApphelpCacheControl }, + { "NtCompareTokens", func_NtCompareTokens }, { "NtContinue", func_NtContinue }, { "NtCreateFile", func_NtCreateFile }, { "NtCreateKey", func_NtCreateKey },

3 years, 8 months

[reactos] 01/02: [NTOS:SE] Complete the SepCompareTokens implementation

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44b8e5caac51157cc6c01… commit 44b8e5caac51157cc6c01d1c07810fc971d3e9ea Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jan 17 21:46:30 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 4 16:22:56 2021 +0300 [NTOS:SE] Complete the SepCompareTokens implementation * Implement SepCompareSidAndAttributesFromTokens and SepComparePrivilegeAndAttributesFromTokens functions for array elements comparison * Implement the token comparison code in SepCompareTokens function * Add a missing PAGED_CODE() in SepCompareTokens as most of the token comparison code is paged * Use SAL annotations for SepCompareTokens and NtCompareTokens --- ntoskrnl/se/token.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 228 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 1f12e0109d2..872e5e15d0d 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -135,12 +135,173 @@ SepDeleteTokenLock( ExFreePoolWithTag(Token->TokenLock, TAG_SE_TOKEN_LOCK); } -static NTSTATUS -SepCompareTokens(IN PTOKEN FirstToken, - IN PTOKEN SecondToken, - OUT PBOOLEAN Equal) +/** + * @brief + * Compares the elements of SID arrays provided by tokens. + * The elements that are being compared for equality are + * the SIDs and their attributes. + * + * @param[in] SidArrayToken1 + * SID array from the first token. + * + * @param[in] CountSidArray1 + * SID count array from the first token. + * + * @param[in] SidArrayToken2 + * SID array from the second token. + * + * @param[in] CountSidArray2 + * SID count array from the second token. + * + * @return + * Returns TRUE if the elements match from either arrays, + * FALSE otherwise. + */ +static +BOOLEAN +SepCompareSidAndAttributesFromTokens( + _In_ PSID_AND_ATTRIBUTES SidArrayToken1, + _In_ ULONG CountSidArray1, + _In_ PSID_AND_ATTRIBUTES SidArrayToken2, + _In_ ULONG CountSidArray2) +{ + ULONG FirstCount, SecondCount; + PSID_AND_ATTRIBUTES FirstSidArray, SecondSidArray; + PAGED_CODE(); + + /* Bail out if index counters provided are not equal */ + if (CountSidArray1 != CountSidArray2) + { + DPRINT("SepCompareSidAndAttributesFromTokens(): Index counters are not the same!\n"); + return FALSE; + } + + /* Loop over the SID arrays and compare them */ + for (FirstCount = 0; FirstCount < CountSidArray1; FirstCount++) + { + for (SecondCount = 0; SecondCount < CountSidArray2; SecondCount++) + { + FirstSidArray = &SidArrayToken1[FirstCount]; + SecondSidArray = &SidArrayToken2[SecondCount]; + + if (RtlEqualSid(FirstSidArray->Sid, SecondSidArray->Sid) && + FirstSidArray->Attributes == SecondSidArray->Attributes) + { + break; + } + } + + /* We've exhausted the array of the second token without finding this one */ + if (SecondCount == CountSidArray2) + { + DPRINT("SepCompareSidAndAttributesFromTokens(): No matching elements could be found in either token!\n"); + return FALSE; + } + } + + return TRUE; +} + +/** + * @brief + * Compares the elements of privilege arrays provided by tokens. + * The elements that are being compared for equality are + * the privileges and their attributes. + * + * @param[in] PrivArrayToken1 + * Privilege array from the first token. + * + * @param[in] CountPrivArray1 + * Privilege count array from the first token. + * + * @param[in] PrivArrayToken2 + * Privilege array from the second token. + * + * @param[in] CountPrivArray2 + * Privilege count array from the second token. + * + * @return + * Returns TRUE if the elements match from either arrays, + * FALSE otherwise. + */ +static +BOOLEAN +SepComparePrivilegeAndAttributesFromTokens( + _In_ PLUID_AND_ATTRIBUTES PrivArrayToken1, + _In_ ULONG CountPrivArray1, + _In_ PLUID_AND_ATTRIBUTES PrivArrayToken2, + _In_ ULONG CountPrivArray2) +{ + ULONG FirstCount, SecondCount; + PLUID_AND_ATTRIBUTES FirstPrivArray, SecondPrivArray; + PAGED_CODE(); + + /* Bail out if index counters provided are not equal */ + if (CountPrivArray1 != CountPrivArray2) + { + DPRINT("SepComparePrivilegeAndAttributesFromTokens(): Index counters are not the same!\n"); + return FALSE; + } + + /* Loop over the privilege arrays and compare them */ + for (FirstCount = 0; FirstCount < CountPrivArray1; FirstCount++) + { + for (SecondCount = 0; SecondCount < CountPrivArray2; SecondCount++) + { + FirstPrivArray = &PrivArrayToken1[FirstCount]; + SecondPrivArray = &PrivArrayToken2[SecondCount]; + + if (RtlEqualLuid(&FirstPrivArray->Luid, &SecondPrivArray->Luid) && + FirstPrivArray->Attributes == SecondPrivArray->Attributes) + { + break; + } + } + + /* We've exhausted the array of the second token without finding this one */ + if (SecondCount == CountPrivArray2) + { + DPRINT("SepComparePrivilegeAndAttributesFromTokens(): No matching elements could be found in either token!\n"); + return FALSE; + } + } + + return TRUE; +} + +/** + * @brief + * Compares tokens if they're equal based on all the following properties. If all + * of the said conditions are met then the tokens are deemed as equal. + * + * - Every SID that is present in either token is also present in the other one. + * - Both or none of the tokens are restricted. + * - If both tokens are restricted, every SID that is restricted in either token is + * also restricted in the other one. + * - Every privilege present in either token is also present in the other one. + * + * @param[in] FirstToken + * The first token. + * + * @param[in] SecondToken + * The second token. + * + * @param[out] Equal + * The retrieved value which determines if the tokens are + * equal or not. + * + * @return + * Returns STATUS_SUCCESS. + */ +static +NTSTATUS +SepCompareTokens( + _In_ PTOKEN FirstToken, + _In_ PTOKEN SecondToken, + _Out_ PBOOLEAN Equal) { BOOLEAN Restricted, IsEqual = FALSE; + PAGED_CODE(); ASSERT(FirstToken != SecondToken); @@ -148,21 +309,53 @@ SepCompareTokens(IN PTOKEN FirstToken, SepAcquireTokenLockShared(FirstToken); SepAcquireTokenLockShared(SecondToken); - /* FIXME: Check if every SID that is present in either token is also present in the other one */ + /* Check if every SID that is present in either token is also present in the other one */ + if (!SepCompareSidAndAttributesFromTokens(FirstToken->UserAndGroups, + FirstToken->UserAndGroupCount, + SecondToken->UserAndGroups, + SecondToken->UserAndGroupCount)) + { + goto Quit; + } + /* Is one token restricted but the other isn't? */ Restricted = SeTokenIsRestricted(FirstToken); - if (Restricted == SeTokenIsRestricted(SecondToken)) + if (Restricted != SeTokenIsRestricted(SecondToken)) + { + /* If that's the case then bail out */ + goto Quit; + } + + /* + * If both tokens are restricted check if every SID + * that is restricted in either token is also restricted + * in the other one. + */ + if (Restricted) { - if (Restricted) + if (!SepCompareSidAndAttributesFromTokens(FirstToken->RestrictedSids, + FirstToken->RestrictedSidCount, + SecondToken->RestrictedSids, + SecondToken->RestrictedSidCount)) { - /* FIXME: Check if every SID that is restricted in either token is also restricted in the other one */ + goto Quit; } + } - /* FIXME: Check if every privilege that is present in either token is also present in the other one */ - DPRINT1("FIXME: Pretending tokens are equal!\n"); - IsEqual = TRUE; + /* Check if every privilege present in either token is also present in the other one */ + if (!SepComparePrivilegeAndAttributesFromTokens(FirstToken->Privileges, + FirstToken->PrivilegeCount, + SecondToken->Privileges, + SecondToken->PrivilegeCount)) + { + goto Quit; } + /* If we're here then the tokens are equal */ + IsEqual = TRUE; + DPRINT("SepCompareTokens(): Tokens are equal!\n"); + +Quit: /* Unlock the tokens */ SepReleaseTokenLock(SecondToken); SepReleaseTokenLock(FirstToken); @@ -3921,14 +4114,29 @@ NtOpenThreadToken(IN HANDLE ThreadHandle, TokenHandle); } -/* - * @unimplemented +/** + * @brief + * Compares tokens if they're equal or not. + * + * @param[in] FirstToken + * The first token. + * + * @param[in] SecondToken + * The second token. + * + * @param[out] Equal + * The retrieved value which determines if the tokens are + * equal or not. + * + * @return + * Returns STATUS_SUCCESS, otherwise it returns a failure NTSTATUS code. */ NTSTATUS NTAPI -NtCompareTokens(IN HANDLE FirstTokenHandle, - IN HANDLE SecondTokenHandle, - OUT PBOOLEAN Equal) +NtCompareTokens( + _In_ HANDLE FirstTokenHandle, + _In_ HANDLE SecondTokenHandle, + _Out_ PBOOLEAN Equal) { KPROCESSOR_MODE PreviousMode; PTOKEN FirstToken, SecondToken; @@ -3960,7 +4168,10 @@ NtCompareTokens(IN HANDLE FirstTokenHandle, (PVOID*)&FirstToken, NULL); if (!NT_SUCCESS(Status)) + { + DPRINT1("ObReferenceObjectByHandle() failed (Status 0x%lx)\n", Status); return Status; + } Status = ObReferenceObjectByHandle(SecondTokenHandle, TOKEN_QUERY, @@ -3970,6 +4181,7 @@ NtCompareTokens(IN HANDLE FirstTokenHandle, NULL); if (!NT_SUCCESS(Status)) { + DPRINT1("ObReferenceObjectByHandle() failed (Status 0x%lx)\n", Status); ObDereferenceObject(FirstToken); return Status; }

3 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2021