Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/03: [FREELDR] LoadAndBootWindowsCommon(): Use UNREACHABLE, on success
by Serge Gautherie 04 Mar '21

04 Mar '21

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

1 0

[reactos] 02/03: [NTOS:KE] KiIdleLoop(): Propagate DECLSPEC_NORETURN to callers
by Serge Gautherie 04 Mar '21

04 Mar '21

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)

1 0

[reactos] 01/03: [NTOS:KE] KiIdleLoop(): Add DECLSPEC_NORETURN, Remove FASTCALL
by Serge Gautherie 04 Mar '21

04 Mar '21

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();

1 0

[reactos] 01/01: [DBGHELP] Fix use of unix path
by Jérôme Gardou 04 Mar '21

04 Mar '21

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;

1 0

[reactos] 02/02: [NTDLL_APITEST] Implement testcase for NtCompareTokens
by George Bișoc 04 Mar '21

04 Mar '21

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 },

1 0

[reactos] 01/02: [NTOS:SE] Complete the SepCompareTokens implementation
by George Bișoc 04 Mar '21

04 Mar '21

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; }

1 0

[reactos] 01/01: [BROWSEUI_APITEST] Fix abnormal termination on fn2 == NULL
by Katayama Hirofumi MZ 04 Mar '21

04 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2282205d135e1ac53bb4d… commit 2282205d135e1ac53bb4d08a0b65a119ab2e0bb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 4 14:42:04 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 4 14:42:04 2021 +0900 [BROWSEUI_APITEST] Fix abnormal termination on fn2 == NULL The DoWordBreakProc function crashed. CORE-9281 --- modules/rostests/apitests/browseui/IAutoComplete.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index 14938182fcd..0fa7d301542 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -350,7 +350,10 @@ DoTestCaseA(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, (EDITWORDBREAKPROC)SendMessageW(hwndEdit, EM_GETWORDBREAKPROC, 0, 0); ok(fn1 != fn2, "fn1 == fn2\n"); ok(fn2 != NULL, "fn2 was NULL\n"); - DoWordBreakProc(fn2); + if (fn2) + DoWordBreakProc(fn2); + else + skip("fn2 == NULL\n"); } // take care of the message queue

1 0

[reactos] 01/01: [NTOS:PS] Guard the quota in a spin lock (#3419)
by George Bișoc 04 Mar '21

04 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a340ec17677fbad860a23… commit a340ec17677fbad860a238f88a01f11a9130dd78 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Mar 4 02:43:30 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 4 04:43:30 2021 +0300 [NTOS:PS] Guard the quota in a spin lock (#3419) Prior to acquiring a quota from the process and do whatever it's needed to do (charge it or return it back), we must guard ourselves with a spinlock so that we may not get into potential race conditions. In Windows Server 2003, PspGivebackQuota and PspExpandQuota do the same thing and they're the equivalent to PspReturnProcessQuotaSpecifiedPool and PspChargeProcessQuotaSpecifiedPool in our codebase. --- ntoskrnl/ps/quota.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ps/quota.c b/ntoskrnl/ps/quota.c index 0645654a320..947f78a658e 100644 --- a/ntoskrnl/ps/quota.c +++ b/ntoskrnl/ps/quota.c @@ -38,28 +38,32 @@ PspChargeProcessQuotaSpecifiedPool(IN PEPROCESS Process, IN PS_QUOTA_TYPE QuotaType, IN SIZE_T Amount) { + KIRQL OldIrql; ASSERT(Process); ASSERT(Process != PsInitialSystemProcess); ASSERT(QuotaType < PsQuotaTypes); ASSERT(Process->QuotaBlock); - /* Note: Race warning. TODO: Needs to add/use lock for this */ + /* Guard our quota in a spin lock */ + KeAcquireSpinLock(&PspQuotaLock, &OldIrql); + if (Process->QuotaUsage[QuotaType] + Amount > Process->QuotaBlock->QuotaEntry[QuotaType].Limit) { DPRINT1("Quota exceeded, but ROS will let it slide...\n"); + KeReleaseSpinLock(&PspQuotaLock, OldIrql); return STATUS_SUCCESS; //return STATUS_QUOTA_EXCEEDED; /* caller raises the exception */ } InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[QuotaType], Amount); - /* Note: Race warning. TODO: Needs to add/use lock for this */ if (Process->QuotaPeak[QuotaType] < Process->QuotaUsage[QuotaType]) { Process->QuotaPeak[QuotaType] = Process->QuotaUsage[QuotaType]; } + KeReleaseSpinLock(&PspQuotaLock, OldIrql); return STATUS_SUCCESS; } @@ -73,10 +77,15 @@ PspReturnProcessQuotaSpecifiedPool(IN PEPROCESS Process, IN PS_QUOTA_TYPE QuotaType, IN SIZE_T Amount) { + KIRQL OldIrql; ASSERT(Process); ASSERT(Process != PsInitialSystemProcess); ASSERT(QuotaType < PsQuotaTypes); ASSERT(!(Amount & 0x80000000)); /* we need to be able to negate it */ + + /* Guard our quota in a spin lock */ + KeAcquireSpinLock(&PspQuotaLock, &OldIrql); + if (Process->QuotaUsage[QuotaType] < Amount) { DPRINT1("WARNING: Process->QuotaUsage sanity check failed.\n"); @@ -86,6 +95,8 @@ PspReturnProcessQuotaSpecifiedPool(IN PEPROCESS Process, InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[QuotaType], -(LONG)Amount); } + + KeReleaseSpinLock(&PspQuotaLock, OldIrql); } /* FUNCTIONS ***************************************************************/

1 0

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen IAutoComplete on WM_KEYDOWN (#3500)
by Katayama Hirofumi MZ 04 Mar '21

04 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b1c81b0ec456770dfec0… commit 3b1c81b0ec456770dfec00f4b8e1f2db9144b097 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 4 09:35:44 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 4 09:35:44 2021 +0900 [BROWSEUI_APITEST] Strengthen IAutoComplete on WM_KEYDOWN (#3500) - Simplify the test mechanism. - Add more tests for WM_KEYDOWN message. CORE-9281 --- .../rostests/apitests/browseui/IAutoComplete.cpp | 232 +++++++++++++++------ 1 file changed, 170 insertions(+), 62 deletions(-) diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index 88e74ccdc37..14938182fcd 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -12,6 +12,8 @@ #include <tchar.h> #include <atlcom.h> #include <atlwin.h> +#include <atlstr.h> +#include <atlsimpcoll.h> #include <shlwapi.h> #include <strsafe.h> @@ -39,6 +41,7 @@ static HWND MyCreateEditCtrl(INT x, INT y, INT cx, INT cy) static BOOL s_bReset = FALSE; static BOOL s_bExpand = FALSE; +static CStringW s_strExpand; // CEnumString class for auto-completion test class CEnumString : public IEnumString, public IACList2 @@ -142,6 +145,7 @@ public: { trace("CEnumString::Expand(%S)\n", pszExpand); s_bExpand = TRUE; + s_strExpand = pszExpand; return S_OK; } STDMETHODIMP GetOptions(DWORD *pdwFlag) override @@ -562,10 +566,38 @@ DoTestCaseA(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, ok_int(s_bExpand, chLast == L'\\'); } +struct TEST_B_ENTRY +{ + INT m_line; + UINT m_uMsg; + WPARAM m_wParam; + LPARAM m_lParam; + LPCWSTR m_text; + BOOL m_bVisible; + INT m_ich0, m_ich1; + INT m_iItem; + BOOL m_bReset, m_bExpand; + LPCWSTR m_expand; +}; + +static BOOL +DoesMatch(LPWSTR *pList, UINT nCount, LPCWSTR psz) +{ + INT cch = lstrlenW(psz); + if (cch == 0) + return FALSE; + for (UINT i = 0; i < nCount; ++i) + { + if (::StrCmpNIW(pList[i], psz, cch) == 0) + return TRUE; + } + return FALSE; +} + // the testcase B static VOID -DoTestCaseB(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, - LPWSTR *pList, UINT nCount) +DoTestCaseB(INT x, INT y, INT cx, INT cy, LPWSTR *pList, UINT nCount, + const TEST_B_ENTRY *pEntries, UINT cEntries) { MSG msg; s_bExpand = s_bReset = FALSE; @@ -575,6 +607,14 @@ DoTestCaseB(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, ok(hwndEdit != NULL, "hwndEdit was NULL\n"); ShowWindowAsync(hwndEdit, SW_SHOWNORMAL); + // do messages + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + ok_int(IsWindowVisible(hwndEdit), TRUE); + // set the list data CComPtr<CEnumString> pEnum(new CEnumString()); pEnum->SetList(nCount, pList); @@ -594,74 +634,75 @@ DoTestCaseB(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, hr = pAC->Init(hwndEdit, punk, NULL, NULL); // IAutoComplete::Init ok_hr(hr, S_OK); + HWND hwndDropDown = NULL, hwndScrollBar = NULL, hwndSizeBox = NULL, hwndList = NULL; // input SetFocus(hwndEdit); - for (UINT i = 0; pszInput[i]; ++i) - { - PostMessageW(hwndEdit, WM_COMMAND, (0xFFFF0000 + i), 0xDEADFACE); - PostMessageW(hwndEdit, WM_CHAR, pszInput[i], 0); - } - PostMessageW(hwndEdit, WM_CHAR, L'!', 0); + Sleep(100); - // observe the message responses - BOOL bFlag = FALSE; - INT i = 0; - WCHAR ch = 0; - s_bExpand = s_bReset = FALSE; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + for (UINT i = 0; i < cEntries; ++i) { - TranslateMessage(&msg); - DispatchMessageW(&msg); - if (bFlag && msg.message == WM_CHAR) + const TEST_B_ENTRY& entry = pEntries[i]; + s_bReset = s_bExpand = FALSE; + s_strExpand.Empty(); + + UINT uMsg = entry.m_uMsg; + WPARAM wParam = entry.m_wParam; + LPARAM lParam = entry.m_lParam; + PostMessageW(hwndEdit, uMsg, wParam, lParam); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - bFlag = FALSE; - ch = (WCHAR)msg.wParam; - if (ch == L'!') - break; - //trace("i: %d, ch:%C, s_bReset:%d, s_bExpand:%d, ch:%C\n", i, ch, s_bReset, s_bExpand, ch); - Sleep(100); - if (i == 0) - { - ok_int(s_bReset, TRUE); - s_bReset = FALSE; - ok_int(s_bExpand, FALSE); - } - else if (ch != L'\\') - { - ok_int(s_bReset, FALSE); - ok_int(s_bExpand, FALSE); - } + TranslateMessage(&msg); + DispatchMessageW(&msg); + + if (msg.message == WM_CHAR || msg.message == WM_KEYDOWN) + Sleep(100); // another thread is working } - if (msg.message == WM_COMMAND && (DWORD)msg.lParam == 0xDEADFACE) + + if (!IsWindow(hwndDropDown)) { - i = (msg.wParam & 0x0000FFFF); - //trace("i: %d, ch:%C, s_bReset:%d, s_bExpand:%d, ch:%C\n", i, ch, s_bReset, s_bExpand, ch); - if (ch == L'\\') - { - ok_int(s_bReset, TRUE); - ok_int(s_bExpand, TRUE); - s_bReset = s_bExpand = FALSE; - } - else - { - ok_int(s_bReset, FALSE); - ok_int(s_bExpand, FALSE); - } - bFlag = TRUE; - Sleep(100); + hwndDropDown = FindWindowW(L"Auto-Suggest Dropdown", L""); + hwndScrollBar = hwndSizeBox = hwndList = NULL; + } + if (IsWindowVisible(hwndDropDown)) + { + hwndScrollBar = GetTopWindow(hwndDropDown); + hwndSizeBox = GetNextWindow(hwndScrollBar, GW_HWNDNEXT); + hwndList = GetNextWindow(hwndSizeBox, GW_HWNDNEXT); } - } - // post quit - DestroyWindow(hwndEdit); - PostQuitMessage(0); + WCHAR szText[64]; + GetWindowTextW(hwndEdit, szText, _countof(szText)); + CStringW strText = szText; + INT ich0, ich1; + SendMessageW(hwndEdit, EM_GETSEL, (WPARAM)&ich0, (LPARAM)&ich1); - // take care of the message queue - while (GetMessageW(&msg, NULL, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); + BOOL bVisible = IsWindowVisible(hwndDropDown); + ok(bVisible == entry.m_bVisible, "Line %d: bVisible was %d\n", entry.m_line, bVisible); + INT iItem = -1; + if (IsWindowVisible(hwndList)) + { + iItem = ListView_GetNextItem(hwndList, -1, LVNI_ALL | LVNI_SELECTED); + } + BOOL bDidMatch = DoesMatch(pList, nCount, strText); + ok(bVisible == bDidMatch, "Line %d: bVisible != bDidMatch\n", entry.m_line); + + if (entry.m_text) + ok(strText == entry.m_text, "Line %d: szText was %S\n", entry.m_line, (LPCWSTR)strText); + else + ok(strText == L"", "Line %d: szText was %S\n", entry.m_line, (LPCWSTR)strText); + ok(ich0 == entry.m_ich0, "Line %d: ich0 was %d\n", entry.m_line, ich0); + ok(ich1 == entry.m_ich1, "Line %d: ich1 was %d\n", entry.m_line, ich1); + ok(iItem == entry.m_iItem, "Line %d: iItem was %d\n", entry.m_line, iItem); + ok(s_bReset == entry.m_bReset, "Line %d: s_bReset was %d\n", entry.m_line, s_bReset); + ok(s_bExpand == entry.m_bExpand, "Line %d: s_bExpand was %d\n", entry.m_line, s_bExpand); + if (entry.m_expand) + ok(s_strExpand == entry.m_expand, "Line %d: s_strExpand was %S\n", entry.m_line, (LPCWSTR)s_strExpand); + else + ok(s_strExpand == L"", "Line %d: s_strExpand was %S\n", entry.m_line, (LPCWSTR)s_strExpand); } + + DestroyWindow(hwndEdit); } START_TEST(IAutoComplete) @@ -729,6 +770,10 @@ START_TEST(IAutoComplete) DoTestCaseA(rcWork.right - 100, rcWork.bottom - 30, 80, 40, L"testtest\\", pList, nCount, FALSE, FALSE); +#ifdef MANUAL_DEBUGGING + return; +#endif + // Test case #5 (A) trace("Testcase #5 (upper, long) ------------------------------\n"); nCount = 300; @@ -753,12 +798,75 @@ START_TEST(IAutoComplete) // Test case #7 (B) trace("Testcase #7 ------------------------------\n"); - nCount = 500; + nCount = 16; pList = (LPWSTR *)CoTaskMemAlloc(nCount * sizeof(LPWSTR)); for (UINT i = 0; i < nCount; ++i) { - StringCbPrintfW(szText, sizeof(szText), L"testtest\\item-%u", i); + StringCbPrintfW(szText, sizeof(szText), L"test\\item-%u", i); + SHStrDupW(szText, &pList[i]); + } + static const TEST_B_ENTRY testcase7_entries[] = + { + { __LINE__, WM_CHAR, L't', 0, L"t", TRUE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'e', 0, L"te", TRUE, 2, 2, -1 }, + { __LINE__, WM_CHAR, L's', 0, L"tes", TRUE, 3, 3, -1 }, + { __LINE__, WM_CHAR, L'T', 0, L"tesT", TRUE, 4, 4, -1 }, + { __LINE__, WM_CHAR, L'\\', 0, L"tesT\\", TRUE, 5, 5, -1, TRUE, TRUE, L"tesT\\" }, + { __LINE__, WM_CHAR, L't', 0, L"tesT\\t", FALSE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tesT\\", TRUE, 5, 5, -1 }, + { __LINE__, WM_CHAR, L'i', 0, L"tesT\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"test\\item-0", TRUE, 11, 11, 0 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"test\\item-1", TRUE, 11, 11, 1 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"test\\item-0", TRUE, 11, 11, 0 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"tesT\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"test\\item-9", TRUE, 11, 11, 15 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"tesT\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tesT\\", TRUE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tesT", TRUE, 4, 4, -1, TRUE }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tes", TRUE, 3, 3, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"te", TRUE, 2, 2, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"t", TRUE, 1, 1, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"", FALSE, 0, 0, -1 }, + { __LINE__, WM_CHAR, L't', 0, L"t", TRUE, 1, 1, -1, TRUE }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"t", TRUE, 0, 0, -1 }, + { __LINE__, WM_KEYDOWN, VK_RIGHT, 0, L"t", TRUE, 1, 1, -1 }, + }; + DoTestCaseB(0, 0, 100, 30, pList, nCount, testcase7_entries, _countof(testcase7_entries)); + + // Test case #8 (B) + trace("Testcase #8 ------------------------------\n"); + nCount = 10; + pList = (LPWSTR *)CoTaskMemAlloc(nCount * sizeof(LPWSTR)); + for (UINT i = 0; i < nCount; ++i) + { + StringCbPrintfW(szText, sizeof(szText), L"test\\item-%u", i); SHStrDupW(szText, &pList[i]); } - DoTestCaseB(0, 0, 100, 30, L"testtest\\iX", pList, nCount); + static const TEST_B_ENTRY testcase8_entries[] = + { + { __LINE__, WM_CHAR, L'a', 0, L"a", FALSE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'b', 0, L"ab", FALSE, 2, 2, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"ab", FALSE, 1, 1, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"ab", FALSE, 0, 0, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"b", FALSE, 0, 0, -1, TRUE }, + { __LINE__, WM_CHAR, L't', 0, L"tb", FALSE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'e', 0, L"teb", FALSE, 2, 2, -1 }, + { __LINE__, WM_CHAR, L's', 0, L"tesb", FALSE, 3, 3, -1 }, + { __LINE__, WM_CHAR, L't', 0, L"testb", FALSE, 4, 4, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test", TRUE, 4, 4, -1 }, + { __LINE__, WM_CHAR, L'\\', 0, L"test\\", TRUE, 5, 5, -1, TRUE, TRUE, L"test\\" }, + { __LINE__, WM_CHAR, L'i', 0, L"test\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_CHAR, L'z', 0, L"test\\iz", FALSE, 7, 7, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\iz", FALSE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\iz", FALSE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test\\z", FALSE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test\\", TRUE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\", TRUE, 4, 4, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\", TRUE, 3, 3, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tet\\", FALSE, 2, 2, -1, TRUE, TRUE, L"tet\\" }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"te\\", FALSE, 2, 2, -1, TRUE, TRUE, L"te\\" }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"te", TRUE, 2, 2, -1, TRUE }, + }; + DoTestCaseB(rcWork.right - 100, rcWork.bottom - 30, 80, 40, pList, nCount, testcase8_entries, _countof(testcase8_entries)); }

1 0

[reactos] 01/01: [SDK:RTL] Statically initialize RtlCriticalSectionList
by Jérôme Gardou 03 Mar '21

03 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65b6af58f9cc4ea2fa9f3… commit 65b6af58f9cc4ea2fa9f34aed7b2a7b5aaec57e8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Mar 3 14:09:08 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 3 14:10:47 2021 +0100 [SDK:RTL] Statically initialize RtlCriticalSectionList This might be used before RtlpInitDeferedCriticalSection gets called --- sdk/lib/rtl/critical.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index 0911a8ce76f..8ef2c7e9544 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -17,7 +17,7 @@ #define MAX_STATIC_CS_DEBUG_OBJECTS 64 static RTL_CRITICAL_SECTION RtlCriticalSectionLock; -static LIST_ENTRY RtlCriticalSectionList; +static LIST_ENTRY RtlCriticalSectionList = {&RtlCriticalSectionList, &RtlCriticalSectionList}; static BOOLEAN RtlpCritSectInitialized = FALSE; static RTL_CRITICAL_SECTION_DEBUG RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS]; static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; @@ -265,9 +265,6 @@ VOID NTAPI RtlpInitDeferedCriticalSection(VOID) { - /* Initialize the Process Critical Section List */ - InitializeListHead(&RtlCriticalSectionList); - /* Initialize the CS Protecting the List */ RtlInitializeCriticalSection(&RtlCriticalSectionLock);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs