Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 02/04: [NTOS:SE] Implement SepCreateSystemAnonymousLogonToken and SepCreateSystemAnonymousLogonTokenNoEveryone functions

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe0f9d8646083e367b402… commit fe0f9d8646083e367b402e6e709b39d6785af6b3 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Mar 13 20:11:58 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 25 02:30:46 2021 +0300 [NTOS:SE] Implement SepCreateSystemAnonymousLogonToken and SepCreateSystemAnonymousLogonTokenNoEveryone functions These private functions are needed to set up two different kinds of system's anonymous logon tokens: one that includes everyone in the group and the other that doesn't. These functions are needed as next step closer to the implementation of NtImpersonateAnonymousToken system call. --- ntoskrnl/include/internal/se.h | 6 ++ ntoskrnl/se/token.c | 140 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 140 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index cb812c2fbdc..8f73dce719c 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -335,6 +335,12 @@ PTOKEN NTAPI SepCreateSystemProcessToken(VOID); +PTOKEN +SepCreateSystemAnonymousLogonToken(VOID); + +PTOKEN +SepCreateSystemAnonymousLogonTokenNoEveryone(VOID); + BOOLEAN NTAPI SeDetailedAuditingWithToken(IN PTOKEN Token); diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 872e5e15d0d..bd56397225f 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/se/token.c - * PURPOSE: Security manager - * - * PROGRAMMERS: David Welch <welch(a)cwcom.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security token implementation support + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ @@ -1530,6 +1529,135 @@ SepCreateSystemProcessToken(VOID) return Token; } +/** + * @brief + * Creates the anonymous logon token for the system. The difference between this + * token and the other one is the inclusion of everyone SID group (being SeWorldSid). + * The other token lacks such group. + * + * @return + * Returns the system's anonymous logon token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonToken(VOID) +{ + SID_AND_ATTRIBUTES Groups[32], UserSid; + PSID PrimaryGroup; + PTOKEN Token; + ULONG GroupsLength; + LARGE_INTEGER Expiration; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + /* The token never expires */ + Expiration.QuadPart = -1; + + /* The user is the anonymous logon */ + UserSid.Sid = SeAnonymousLogonSid; + UserSid.Attributes = 0; + + /* The primary group is also the anonymous logon */ + PrimaryGroup = SeAnonymousLogonSid; + + /* The only group for the token is the World */ + Groups[0].Sid = SeWorldSid; + Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; + GroupsLength = sizeof(SID_AND_ATTRIBUTES) + + SeLengthSid(Groups[0].Sid); + ASSERT(GroupsLength <= sizeof(Groups)); + + /* Initialise the object attributes for the token */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemAnonymousLogonDacl != NULL); + + /* Create token */ + Status = SepCreateToken((PHANDLE)&Token, + KernelMode, + 0, + &ObjectAttributes, + TokenPrimary, + SecurityAnonymous, + &SeAnonymousAuthenticationId, + &Expiration, + &UserSid, + 1, + Groups, + GroupsLength, + 0, + NULL, + NULL, + PrimaryGroup, + SeSystemAnonymousLogonDacl, + &SeSystemTokenSource, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + + /* Return the anonymous logon token */ + return Token; +} + +/** + * @brief + * Creates the anonymous logon token for the system. This kind of token + * doesn't include the everyone SID group (being SeWorldSid). + * + * @return + * Returns the system's anonymous logon token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) +{ + SID_AND_ATTRIBUTES UserSid; + PSID PrimaryGroup; + PTOKEN Token; + LARGE_INTEGER Expiration; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + /* The token never expires */ + Expiration.QuadPart = -1; + + /* The user is the anonymous logon */ + UserSid.Sid = SeAnonymousLogonSid; + UserSid.Attributes = 0; + + /* The primary group is also the anonymous logon */ + PrimaryGroup = SeAnonymousLogonSid; + + /* Initialise the object attributes for the token */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemAnonymousLogonDacl != NULL); + + /* Create token */ + Status = SepCreateToken((PHANDLE)&Token, + KernelMode, + 0, + &ObjectAttributes, + TokenPrimary, + SecurityAnonymous, + &SeAnonymousAuthenticationId, + &Expiration, + &UserSid, + 0, + NULL, + 0, + 0, + NULL, + NULL, + PrimaryGroup, + SeSystemAnonymousLogonDacl, + &SeSystemTokenSource, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + + /* Return the anonymous (not including everyone) logon token */ + return Token; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /*

3 years, 5 months

[reactos] 01/04: [NTOS:SE] Set up an ACL and SD for the anonymous logon

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b28530d4acf3e3909fa89… commit b28530d4acf3e3909fa89eda14f4945a941de0b3 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Mar 13 14:33:15 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 25 02:30:46 2021 +0300 [NTOS:SE] Set up an ACL and SD for the anonymous logon --- ntoskrnl/include/internal/se.h | 2 ++ ntoskrnl/se/acl.c | 26 ++++++++++++++++++++++++++ ntoskrnl/se/sd.c | 14 ++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 56a1287d8bf..cb812c2fbdc 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -187,6 +187,7 @@ extern PACL SePublicDefaultUnrestrictedDacl; extern PACL SePublicOpenDacl; extern PACL SePublicOpenUnrestrictedDacl; extern PACL SeUnrestrictedDacl; +extern PACL SeSystemAnonymousLogonDacl; /* SDs */ extern PSECURITY_DESCRIPTOR SePublicDefaultSd; @@ -195,6 +196,7 @@ extern PSECURITY_DESCRIPTOR SePublicOpenSd; extern PSECURITY_DESCRIPTOR SePublicOpenUnrestrictedSd; extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; +extern PSECURITY_DESCRIPTOR SeSystemAnonymousLogonSd; #define SepAcquireTokenLockExclusive(Token) \ diff --git a/ntoskrnl/se/acl.c b/ntoskrnl/se/acl.c index 25635610a16..1da423b43c2 100644 --- a/ntoskrnl/se/acl.c +++ b/ntoskrnl/se/acl.c @@ -21,6 +21,7 @@ PACL SePublicDefaultUnrestrictedDacl = NULL; PACL SePublicOpenDacl = NULL; PACL SePublicOpenUnrestrictedDacl = NULL; PACL SeUnrestrictedDacl = NULL; +PACL SeSystemAnonymousLogonDacl = NULL; /* FUNCTIONS ******************************************************************/ @@ -217,6 +218,31 @@ SepInitDACLs(VOID) GENERIC_READ | GENERIC_EXECUTE, SeRestrictedCodeSid); + /* create SystemAnonymousLogonDacl */ + AclLength = sizeof(ACL) + + (sizeof(ACE) + RtlLengthSid(SeWorldSid)) + + (sizeof(ACE) + RtlLengthSid(SeAnonymousLogonSid)); + + SeSystemAnonymousLogonDacl = ExAllocatePoolWithTag(PagedPool, + AclLength, + TAG_ACL); + if (SeSystemAnonymousLogonDacl == NULL) + return FALSE; + + RtlCreateAcl(SeSystemAnonymousLogonDacl, + AclLength, + ACL_REVISION); + + RtlAddAccessAllowedAce(SeSystemAnonymousLogonDacl, + ACL_REVISION, + GENERIC_ALL, + SeWorldSid); + + RtlAddAccessAllowedAce(SeSystemAnonymousLogonDacl, + ACL_REVISION, + GENERIC_ALL, + SeAnonymousLogonSid); + return TRUE; } diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index ccf17bb8388..dca0db419ff 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -21,6 +21,7 @@ PSECURITY_DESCRIPTOR SePublicOpenSd = NULL; PSECURITY_DESCRIPTOR SePublicOpenUnrestrictedSd = NULL; PSECURITY_DESCRIPTOR SeSystemDefaultSd = NULL; PSECURITY_DESCRIPTOR SeUnrestrictedSd = NULL; +PSECURITY_DESCRIPTOR SeSystemAnonymousLogonSd = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -107,6 +108,19 @@ SepInitSDs(VOID) SeUnrestrictedDacl, FALSE); + /* Create SystemAnonymousLogonSd */ + SeSystemAnonymousLogonSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); + if (SeSystemAnonymousLogonSd == NULL) + return FALSE; + + RtlCreateSecurityDescriptor(SeSystemAnonymousLogonSd, + SECURITY_DESCRIPTOR_REVISION); + RtlSetDaclSecurityDescriptor(SeSystemAnonymousLogonSd, + TRUE, + SeSystemAnonymousLogonDacl, + FALSE); + return TRUE; }

3 years, 5 months

[reactos] 01/01: [BROWSEUI] Support ACO_USETAB and SHACF_USETAB on auto-completion (#3549)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5c72a2e090edd4a11091… commit d5c72a2e090edd4a11091b8b46007490fbcb6c5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 25 07:42:24 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 25 07:42:24 2021 +0900 [BROWSEUI] Support ACO_USETAB and SHACF_USETAB on auto-completion (#3549) Support Tab key on auto-completion. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 8fe44e27977..b2ebc12ba68 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -26,7 +26,6 @@ TODO: - implement ACO_SEARCH style - implement ACO_FILTERPREFIXES style - - implement ACO_USETAB style - implement ACO_RTLREADING style */ @@ -321,7 +320,7 @@ LRESULT CACEditCtrl::OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL break; case VK_TAB: if (m_pDropDown->IsWindowVisible() && m_pDropDown->UseTab()) - m_pDropDown->OnEditKeyDown(VK_TAB, 0); + ret |= DLGC_WANTALLKEYS; // we want all keys to manipulate the list break; case VK_ESCAPE: if (m_pDropDown->IsWindowVisible()) @@ -949,9 +948,13 @@ BOOL CAutoComplete::OnEditKeyDown(WPARAM wParam, LPARAM lParam) } case VK_TAB: { + // ACO_USETAB if (IsWindowVisible() && UseTab()) { - FIXME("ACO_USETAB\n"); + if (GetKeyState(VK_SHIFT) < 0) + return OnListUpDown(VK_UP); + else + return OnListUpDown(VK_DOWN); } break; } @@ -1114,21 +1117,6 @@ CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", this, hwndEdit, punkACL, debugstr_w(pwszRegKeyPath), debugstr_w(pwszQuickComplete)); - if (m_dwOptions & ACO_AUTOSUGGEST) - TRACE(" ACO_AUTOSUGGEST\n"); - if (m_dwOptions & ACO_AUTOAPPEND) - TRACE(" ACO_AUTOAPPEND\n"); - if (m_dwOptions & ACO_SEARCH) - FIXME(" ACO_SEARCH not supported\n"); - if (m_dwOptions & ACO_FILTERPREFIXES) - FIXME(" ACO_FILTERPREFIXES not supported\n"); - if (m_dwOptions & ACO_USETAB) - FIXME(" ACO_USETAB not supported\n"); - if (m_dwOptions & ACO_UPDOWNKEYDROPSLIST) - TRACE(" ACO_UPDOWNKEYDROPSLIST\n"); - if (m_dwOptions & ACO_RTLREADING) - FIXME(" ACO_RTLREADING not supported\n"); - // sanity check if (m_hwndEdit || !punkACL) { @@ -1199,6 +1187,14 @@ STDMETHODIMP CAutoComplete::SetOptions(DWORD dwFlag) { TRACE("(%p) -> (0x%x)\n", this, dwFlag); m_dwOptions = dwFlag; + + if (m_dwOptions & ACO_SEARCH) + FIXME(" ACO_SEARCH not supported\n"); + if (m_dwOptions & ACO_FILTERPREFIXES) + FIXME(" ACO_FILTERPREFIXES not supported\n"); + if (m_dwOptions & ACO_RTLREADING) + FIXME(" ACO_RTLREADING not supported\n"); + UpdateDropDownState(); // create/hide the drop-down window if necessary return S_OK; }

3 years, 5 months

[reactos] 02/02: [NTOS:CC] Wake up lazy scan after inserting elements in the list.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e4f83da700fbfac5450d… commit 6e4f83da700fbfac5450dc9ef667585ddc870bc9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 16 17:17:57 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 15:28:04 2021 +0100 [NTOS:CC] Wake up lazy scan after inserting elements in the list. --- ntoskrnl/cc/copy.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 30864bc319e..09af125540c 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -381,16 +381,6 @@ CcCanIWrite ( return FALSE; } - /* Otherwise, if there are no deferred writes yet, start the lazy writer */ - if (IsListEmpty(&CcDeferredWrites)) - { - KIRQL OldIrql; - - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); - CcScheduleLazyWriteScan(TRUE); - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); - } - /* Initialize our wait event */ KeInitializeEvent(&WaitEvent, NotificationEvent, FALSE); @@ -418,6 +408,12 @@ CcCanIWrite ( &CcDeferredWriteSpinLock); } + /* Now make sure that the lazy scan writer will be active */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + if (!LazyWriter.ScanActive) + CcScheduleLazyWriteScan(TRUE); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + #if DBG DPRINT1("Actively deferring write for: %p\n", FileObject); DPRINT1("Because:\n");

3 years, 5 months

[reactos] 01/02: [NTOS:CC] Be verbose about why we defer writes

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edd4a985d986158e8d02c… commit edd4a985d986158e8d02c42a4bd340f4b30686ed Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 16 11:26:25 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 15:27:36 2021 +0100 [NTOS:CC] Be verbose about why we defer writes --- ntoskrnl/cc/copy.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 3ab5b7852f3..30864bc319e 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -418,7 +418,18 @@ CcCanIWrite ( &CcDeferredWriteSpinLock); } +#if DBG DPRINT1("Actively deferring write for: %p\n", FileObject); + DPRINT1("Because:\n"); + if (CcTotalDirtyPages + Pages >= CcDirtyPageThreshold) + DPRINT1(" There are too many cache dirty pages: %x + %x >= %x\n", CcTotalDirtyPages, Pages, CcDirtyPageThreshold); + if (MmAvailablePages <= MmThrottleTop) + DPRINT1(" Available pages are below throttle top: %lx <= %lx\n", MmAvailablePages, MmThrottleTop); + if (MmModifiedPageListHead.Total >= 1000) + DPRINT1(" There are too many modified pages: %lu >= 1000\n", MmModifiedPageListHead.Total); + if (MmAvailablePages <= MmThrottleBottom) + DPRINT1(" Available pages are below throttle bottom: %lx <= %lx\n", MmAvailablePages, MmThrottleBottom); +#endif /* Now, we'll loop until our event is set. When it is set, it means that caller * can immediately write, and has to */

3 years, 5 months

[reactos] 01/01: [CMAKE] Declare KD stub Dlls as kerneldll

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ce9ad42a6d66bcd19af… commit 00ce9ad42a6d66bcd19af2782cb5e197e1fc5e25 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Mar 24 14:26:15 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 15:20:06 2021 +0100 [CMAKE] Declare KD stub Dlls as kerneldll --- drivers/base/kdcom/CMakeLists.txt | 2 +- drivers/base/kdgdb/CMakeLists.txt | 2 +- drivers/base/kdvm/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt index bed4484fa1b..f754c215200 100644 --- a/drivers/base/kdcom/CMakeLists.txt +++ b/drivers/base/kdcom/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(kdcom MODULE kdcom.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) -set_module_type(kdcom module IMAGEBASE 0x00010000) +set_module_type(kdcom kerneldll ENTRYPOINT 0) set_subsystem(kdcom native) add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) diff --git a/drivers/base/kdgdb/CMakeLists.txt b/drivers/base/kdgdb/CMakeLists.txt index 86bb0b33850..d783b3851da 100644 --- a/drivers/base/kdgdb/CMakeLists.txt +++ b/drivers/base/kdgdb/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(kdcom MODULE kdgdb.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) -set_module_type(kdcom module IMAGEBASE 0x00010000) +set_module_type(kdcom kerneldll ENTRYPOINT 0) set_subsystem(kdcom native) add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) diff --git a/drivers/base/kdvm/CMakeLists.txt b/drivers/base/kdvm/CMakeLists.txt index e8eeae8a180..2128c1ba497 100644 --- a/drivers/base/kdvm/CMakeLists.txt +++ b/drivers/base/kdvm/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(kdvbox MODULE ${kdvbox_asm} ${CMAKE_CURRENT_BINARY_DIR}/kdvbox.def) -set_module_type(kdvbox module IMAGEBASE 0x00010000) +set_module_type(kdvbox kerneldll ENTRYPOINT 0) set_subsystem(kdvbox native) add_importlibs(kdvbox ntoskrnl hal) add_dependencies(kdvbox psdk bugcodes)

3 years, 5 months

[reactos] 01/01: [SYSSETUP] security.c: Remove 3 useless casts

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca1814f2c94c61404ade0… commit ca1814f2c94c61404ade0f7d54c8d313e68911d4 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 24 12:15:55 2021 +0100 [SYSSETUP] security.c: Remove 3 useless casts And * Make 1 cast more explicit. * Fix 1 'SamSetInformationUser' copypasta in DPRINT1() text. * Optimize 1 '.MaximumLength' assignment. --- dll/win32/syssetup/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index eb505ffd3df..1a784edc5b5 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -100,7 +100,7 @@ SetAccountsDomainSid( LsaClose(PolicyHandle); DomainNameInfo.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); - DomainNameInfo.DomainName.MaximumLength = (wcslen(DomainName) + 1) * sizeof(WCHAR); + DomainNameInfo.DomainName.MaximumLength = DomainNameInfo.DomainName.Length + sizeof(WCHAR); DomainNameInfo.DomainName.Buffer = (LPWSTR)DomainName; Status = SamConnect(NULL, @@ -117,7 +117,7 @@ SetAccountsDomainSid( { Status = SamSetInformationDomain(DomainHandle, DomainNameInformation, - (PVOID)&DomainNameInfo); + &DomainNameInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamSetInformationDomain failed (Status: 0x%08lx)\n", Status); @@ -1186,7 +1186,7 @@ EnableAccount( Status = SamQueryInformationUser(UserHandle, UserControlInformation, - (PVOID)&ControlInfo); + (PVOID*)&ControlInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamQueryInformationUser() failed (Status: 0x%08lx)\n", Status); @@ -1289,7 +1289,7 @@ SetNewAccountName( Status = SamSetInformationUser(UserHandle, UserNameInformation, - (PVOID)&NameInfo); + &NameInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamSetInformationUser() failed (Status: 0x%08lx)\n", Status); @@ -1655,7 +1655,7 @@ SetAdministratorPassword(LPCWSTR Password) Status = SamSetInformationUser(UserHandle, UserSetPasswordInformation, - (PVOID)&PasswordInfo); + &PasswordInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamSetInformationUser() failed (Status %08lx)\n", Status); @@ -1667,7 +1667,7 @@ SetAdministratorPassword(LPCWSTR Password) (PVOID*)&AccountNameInfo); if (!NT_SUCCESS(Status)) { - DPRINT1("SamSetInformationUser() failed (Status %08lx)\n", Status); + DPRINT1("SamQueryInformationUser() failed (Status 0x%08lx)\n", Status); goto done; }

3 years, 5 months

[reactos] 01/01: [NTOS:CC] Rewrite CcPostDeferredWrites

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c54fb91791c5b628b54c… commit 5c54fb91791c5b628b54c539872f89c6bf2a7828 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Feb 18 11:36:14 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 11:22:28 2021 +0100 [NTOS:CC] Rewrite CcPostDeferredWrites This allows to post small writes if there are any, and avoid holding the list lock for a long time. --- ntoskrnl/cc/copy.c | 79 +++++++++++++++++++++--------------------------------- 1 file changed, 31 insertions(+), 48 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index cdab94c8313..3ab5b7852f3 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -72,74 +72,57 @@ CcInitCacheZeroPage ( VOID CcPostDeferredWrites(VOID) { - ULONG WrittenBytes; + LIST_ENTRY ToInsertBack; + + InitializeListHead(&ToInsertBack); /* We'll try to write as much as we can */ - WrittenBytes = 0; while (TRUE) { - KIRQL OldIrql; - PLIST_ENTRY ListEntry; PDEFERRED_WRITE DeferredWrite; + PLIST_ENTRY ListEntry; DeferredWrite = NULL; - /* Lock our deferred writes list */ - KeAcquireSpinLock(&CcDeferredWriteSpinLock, &OldIrql); - for (ListEntry = CcDeferredWrites.Flink; - ListEntry != &CcDeferredWrites; - ListEntry = ListEntry->Flink) - { - /* Extract an entry */ - DeferredWrite = CONTAINING_RECORD(ListEntry, DEFERRED_WRITE, DeferredWriteLinks); + ListEntry = ExInterlockedRemoveHeadList(&CcDeferredWrites, &CcDeferredWriteSpinLock); - /* Compute the modified bytes, based on what we already wrote */ - WrittenBytes += DeferredWrite->BytesToWrite; - /* We overflowed, give up */ - if (WrittenBytes < DeferredWrite->BytesToWrite) - { - DeferredWrite = NULL; - break; - } + if (!ListEntry) + break; - /* Check we can write */ - if (CcCanIWrite(DeferredWrite->FileObject, WrittenBytes, FALSE, RetryForceCheckPerFile)) + DeferredWrite = CONTAINING_RECORD(ListEntry, DEFERRED_WRITE, DeferredWriteLinks); + + /* Check if we can write */ + if (CcCanIWrite(DeferredWrite->FileObject, DeferredWrite->BytesToWrite, FALSE, RetryForceCheckPerFile)) + { + /* If we have an event, set it and go along */ + if (DeferredWrite->Event) { - /* We can, so remove it from the list and stop looking for entry */ - RemoveEntryList(&DeferredWrite->DeferredWriteLinks); - break; + KeSetEvent(DeferredWrite->Event, IO_NO_INCREMENT, FALSE); } - - /* If we don't accept modified pages, stop here */ - if (!DeferredWrite->LimitModifiedPages) + /* Otherwise, call the write routine and free the context */ + else { - DeferredWrite = NULL; - break; + DeferredWrite->PostRoutine(DeferredWrite->Context1, DeferredWrite->Context2); + ExFreePoolWithTag(DeferredWrite, 'CcDw'); } - - /* Reset count as nothing was written yet */ - WrittenBytes -= DeferredWrite->BytesToWrite; - DeferredWrite = NULL; + continue; } - KeReleaseSpinLock(&CcDeferredWriteSpinLock, OldIrql); - /* Nothing to write found, give up */ - if (DeferredWrite == NULL) + /* Keep it for later */ + InsertHeadList(&ToInsertBack, &DeferredWrite->DeferredWriteLinks); + + /* If we don't accept modified pages, stop here */ + if (!DeferredWrite->LimitModifiedPages) { break; } + } - /* If we have an event, set it and quit */ - if (DeferredWrite->Event) - { - KeSetEvent(DeferredWrite->Event, IO_NO_INCREMENT, FALSE); - } - /* Otherwise, call the write routine and free the context */ - else - { - DeferredWrite->PostRoutine(DeferredWrite->Context1, DeferredWrite->Context2); - ExFreePoolWithTag(DeferredWrite, 'CcDw'); - } + /* Insert what we couldn't write back in the list */ + while (!IsListEmpty(&ToInsertBack)) + { + PLIST_ENTRY ListEntry = RemoveTailList(&ToInsertBack); + ExInterlockedInsertHeadList(&CcDeferredWrites, ListEntry, &CcDeferredWriteSpinLock); } }

3 years, 5 months

[reactos] 01/01: [NTOS:KE] Explicitly cast -1 to ULONG

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b13a6965139963bc8b20a… commit b13a6965139963bc8b20aaf35c98de9c65615ece Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 11 16:27:54 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 11:13:04 2021 +0100 [NTOS:KE] Explicitly cast -1 to ULONG --- ntoskrnl/include/internal/i386/trap_x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/i386/trap_x.h b/ntoskrnl/include/internal/i386/trap_x.h index 1f1e96f04d0..8cc82562a7e 100644 --- a/ntoskrnl/include/internal/i386/trap_x.h +++ b/ntoskrnl/include/internal/i386/trap_x.h @@ -142,7 +142,7 @@ KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame, } /* If we're ignoring previous mode, make sure caller doesn't actually want it */ - if (SkipPreviousMode && (TrapFrame->PreviousPreviousMode != -1)) + if (SkipPreviousMode && (TrapFrame->PreviousPreviousMode != (ULONG)-1)) { DbgPrint("Exiting a trap witout restoring previous mode, yet previous mode seems valid: %lx\n", TrapFrame->PreviousPreviousMode); __debugbreak();

3 years, 5 months

[reactos] 01/01: [NTOS] Remove a definition which is redundant with ndk

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94d175b7f25836da781b3… commit 94d175b7f25836da781b39cf5c167da37ebf93b1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 11 16:27:08 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 11:12:12 2021 +0100 [NTOS] Remove a definition which is redundant with ndk --- ntoskrnl/include/internal/ke.h | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index 31621647570..2310d4232fe 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -142,7 +142,6 @@ extern ULONG KeTimeIncrement; extern ULONG KeTimeAdjustment; extern BOOLEAN KiTimeAdjustmentEnabled; extern LONG KiTickOffset; -extern ULONG_PTR KiBugCheckData[5]; extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout; extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch;

3 years, 5 months

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