Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 01/01: [SYSSETUP] SamQueryInformationDomain expects a pointer
by Mark Jansen 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c59ab8fce181f08f09271… commit c59ab8fce181f08f09271afb91fdb965afbf02b6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Mar 17 21:16:57 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 18 23:28:17 2021 +0100 [SYSSETUP] SamQueryInformationDomain expects a pointer --- dll/win32/syssetup/security.c | 58 ++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 47123e7286a..ffe73bbe336 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -766,7 +766,7 @@ ApplyPasswordSettings( _In_ PWSTR pszSectionName) { INFCONTEXT InfContext; - DOMAIN_PASSWORD_INFORMATION PasswordInfo; + PDOMAIN_PASSWORD_INFORMATION PasswordInfo = NULL; PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle = NULL; @@ -828,7 +828,7 @@ ApplyPasswordSettings( goto done; } - DPRINT("MaximumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo.MaxPasswordAge.QuadPart); + DPRINT("MaximumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo->MaxPasswordAge.QuadPart); if (SetupFindFirstLineW(hSecurityInf, pszSectionName, L"MaximumPasswordAge", @@ -839,17 +839,17 @@ ApplyPasswordSettings( DPRINT("Value: %ld\n", nValue); if (nValue == -1) { - PasswordInfo.MaxPasswordAge.QuadPart = 0x8000000000000000; + PasswordInfo->MaxPasswordAge.QuadPart = 0x8000000000000000; } else if ((nValue >= 1) && (nValue < 1000)) { - PasswordInfo.MaxPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; + PasswordInfo->MaxPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; } - DPRINT("MaximumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo.MaxPasswordAge.QuadPart); + DPRINT("MaximumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo->MaxPasswordAge.QuadPart); } } - DPRINT("MinimumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo.MinPasswordAge.QuadPart); + DPRINT("MinimumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo->MinPasswordAge.QuadPart); if (SetupFindFirstLineW(hSecurityInf, pszSectionName, L"MinimumPasswordAge", @@ -860,14 +860,14 @@ ApplyPasswordSettings( DPRINT("Wert: %ld\n", nValue); if ((nValue >= 0) && (nValue < 1000)) { - if (PasswordInfo.MaxPasswordAge.QuadPart < (LONGLONG)nValue * TICKS_PER_DAY) - PasswordInfo.MinPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; + if (PasswordInfo->MaxPasswordAge.QuadPart < (LONGLONG)nValue * TICKS_PER_DAY) + PasswordInfo->MinPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; } - DPRINT("MinimumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo.MinPasswordAge.QuadPart); + DPRINT("MinimumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo->MinPasswordAge.QuadPart); } } - DPRINT("MinimumPasswordLength (OldValue) : %lu\n", PasswordInfo.MinPasswordLength); + DPRINT("MinimumPasswordLength (OldValue) : %lu\n", PasswordInfo->MinPasswordLength); if (SetupFindFirstLineW(hSecurityInf, pszSectionName, L"MinimumPasswordLength", @@ -878,13 +878,13 @@ ApplyPasswordSettings( DPRINT("Value: %ld\n", nValue); if ((nValue >= 0) && (nValue <= 65535)) { - PasswordInfo.MinPasswordLength = nValue; + PasswordInfo->MinPasswordLength = nValue; } - DPRINT("MinimumPasswordLength (NewValue) : %lu\n", PasswordInfo.MinPasswordLength); + DPRINT("MinimumPasswordLength (NewValue) : %lu\n", PasswordInfo->MinPasswordLength); } } - DPRINT("PasswordHistoryLength (OldValue) : %lu\n", PasswordInfo.PasswordHistoryLength); + DPRINT("PasswordHistoryLength (OldValue) : %lu\n", PasswordInfo->PasswordHistoryLength); if (SetupFindFirstLineW(hSecurityInf, pszSectionName, L"PasswordHistorySize", @@ -895,9 +895,9 @@ ApplyPasswordSettings( DPRINT("Value: %ld\n", nValue); if ((nValue >= 0) && (nValue <= 65535)) { - PasswordInfo.PasswordHistoryLength = nValue; + PasswordInfo->PasswordHistoryLength = nValue; } - DPRINT("PasswordHistoryLength (NewValue) : %lu\n", PasswordInfo.PasswordHistoryLength); + DPRINT("PasswordHistoryLength (NewValue) : %lu\n", PasswordInfo->PasswordHistoryLength); } } @@ -910,11 +910,11 @@ ApplyPasswordSettings( { if (nValue == 0) { - PasswordInfo.PasswordProperties &= ~DOMAIN_PASSWORD_COMPLEX; + PasswordInfo->PasswordProperties &= ~DOMAIN_PASSWORD_COMPLEX; } else { - PasswordInfo.PasswordProperties |= DOMAIN_PASSWORD_COMPLEX; + PasswordInfo->PasswordProperties |= DOMAIN_PASSWORD_COMPLEX; } } } @@ -928,11 +928,11 @@ ApplyPasswordSettings( { if (nValue == 0) { - PasswordInfo.PasswordProperties &= ~DOMAIN_PASSWORD_STORE_CLEARTEXT; + PasswordInfo->PasswordProperties &= ~DOMAIN_PASSWORD_STORE_CLEARTEXT; } else { - PasswordInfo.PasswordProperties |= DOMAIN_PASSWORD_STORE_CLEARTEXT; + PasswordInfo->PasswordProperties |= DOMAIN_PASSWORD_STORE_CLEARTEXT; } } } @@ -941,7 +941,7 @@ ApplyPasswordSettings( Status = SamSetInformationDomain(DomainHandle, DomainPasswordInformation, - (PVOID*)&PasswordInfo); + PasswordInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamSetInformationDomain() failed (Status %08lx)\n", Status); @@ -949,6 +949,9 @@ ApplyPasswordSettings( } done: + if (PasswordInfo != NULL) + SamFreeMemory(PasswordInfo); + if (DomainHandle != NULL) SamCloseHandle(DomainHandle); @@ -970,7 +973,7 @@ ApplyLockoutSettings( _In_ PWSTR pszSectionName) { INFCONTEXT InfContext; - DOMAIN_LOCKOUT_INFORMATION LockoutInfo; + PDOMAIN_LOCKOUT_INFORMATION LockoutInfo = NULL; PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle = NULL; @@ -1041,7 +1044,7 @@ ApplyLockoutSettings( { if (nValue >= 0) { - LockoutInfo.LockoutThreshold = nValue; + LockoutInfo->LockoutThreshold = nValue; } } } @@ -1055,7 +1058,7 @@ ApplyLockoutSettings( { if (nValue >= 0) { - LockoutInfo.LockoutObservationWindow.QuadPart = (LONGLONG)nValue * TICKS_PER_MINUTE; + LockoutInfo->LockoutObservationWindow.QuadPart = (LONGLONG)nValue * TICKS_PER_MINUTE; } } } @@ -1069,18 +1072,18 @@ ApplyLockoutSettings( { if (nValue == -1) { - LockoutInfo.LockoutDuration.QuadPart = 0x8000000000000000LL; + LockoutInfo->LockoutDuration.QuadPart = 0x8000000000000000LL; } else if ((nValue >= 0) && (nValue < 100000)) { - LockoutInfo.LockoutDuration.QuadPart = (LONGLONG)nValue * TICKS_PER_MINUTE; + LockoutInfo->LockoutDuration.QuadPart = (LONGLONG)nValue * TICKS_PER_MINUTE; } } } Status = SamSetInformationDomain(DomainHandle, DomainLockoutInformation, - (PVOID*)&LockoutInfo); + LockoutInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamSetInformationDomain() failed (Status %08lx)\n", Status); @@ -1088,6 +1091,9 @@ ApplyLockoutSettings( } done: + if (LockoutInfo != NULL) + SamFreeMemory(LockoutInfo); + if (DomainHandle != NULL) SamCloseHandle(DomainHandle);

1 0

[reactos] 01/01: [NTOS:IO][NTOS:PNP] Fix incorrect usage of IopGetRegistryValue
by Victor Perevertkin 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aec3d9cc8f890df41fbaa… commit aec3d9cc8f890df41fbaa697a0249a78ad98db8f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Mar 19 01:07:22 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Mar 19 01:07:22 2021 +0300 [NTOS:IO][NTOS:PNP] Fix incorrect usage of IopGetRegistryValue KEY_VALUE_FULL_INFORMATION was not always freed properly --- ntoskrnl/io/iomgr/driver.c | 7 +++- ntoskrnl/io/pnpmgr/devaction.c | 88 +++++++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 41 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 602cd487fb7..24f6084a892 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -195,7 +195,12 @@ IopGetDriverNames( if (driverName.Buffer == NULL) { status = IopGetRegistryValue(ServiceHandle, L"Type", &kvInfo); - if (!NT_SUCCESS(status) || kvInfo->Type != REG_DWORD) + if (!NT_SUCCESS(status)) + { + ExFreePoolWithTag(basicInfo, TAG_IO); + return status; + } + if (kvInfo->Type != REG_DWORD) { ExFreePool(kvInfo); ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 5d354ddc62c..aa1ac12f6c2 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -419,11 +419,15 @@ PiAttachFilterDriversCallback( SERVICE_LOAD_TYPE startType = DisableLoad; Status = IopGetRegistryValue(serviceHandle, L"Start", &kvInfo); - if (NT_SUCCESS(Status) && kvInfo->Type == REG_DWORD) + if (NT_SUCCESS(Status)) { - RtlMoveMemory(&startType, - (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), - sizeof(startType)); + if (kvInfo->Type == REG_DWORD) + { + RtlMoveMemory(&startType, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + sizeof(startType)); + } + ExFreePool(kvInfo); } @@ -621,52 +625,56 @@ PiCallDriverAddDevice( // try to get the class GUID of an instance and its registry key Status = IopGetRegistryValue(SubKey, REGSTR_VAL_CLASSGUID, &kvInfo); - if (NT_SUCCESS(Status) && kvInfo->Type == REG_SZ && kvInfo->DataLength > sizeof(WCHAR)) + if (NT_SUCCESS(Status)) { - UNICODE_STRING classGUID = { - .MaximumLength = kvInfo->DataLength, - .Length = kvInfo->DataLength - sizeof(UNICODE_NULL), - .Buffer = (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset) - }; - HANDLE ccsControlHandle; - - Status = IopOpenRegistryKeyEx(&ccsControlHandle, NULL, &ccsControlClass, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for \"%wZ\" (status %x)\n", - &ccsControlClass, Status); - } - else + if (kvInfo->Type == REG_SZ && kvInfo->DataLength > sizeof(WCHAR)) { - // open the CCS\Control\Class\<ClassGUID> key - Status = IopOpenRegistryKeyEx(&ClassKey, ccsControlHandle, &classGUID, KEY_READ); - ZwClose(ccsControlHandle); + UNICODE_STRING classGUID = { + .MaximumLength = kvInfo->DataLength, + .Length = kvInfo->DataLength - sizeof(UNICODE_NULL), + .Buffer = (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset) + }; + HANDLE ccsControlHandle; + + Status = IopOpenRegistryKeyEx(&ccsControlHandle, NULL, &ccsControlClass, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open class key \"%wZ\" (status %x)\n", &classGUID, Status); + DPRINT1("IopOpenRegistryKeyEx() failed for \"%wZ\" (status %x)\n", + &ccsControlClass, Status); } - } - - if (ClassKey) - { - // Check the Properties key of a class too - // Windows fills some device properties from this key (which is protected) - // TODO: add the device properties from this key - - UNICODE_STRING properties = RTL_CONSTANT_STRING(REGSTR_KEY_DEVICE_PROPERTIES); - HANDLE propertiesHandle; - - Status = IopOpenRegistryKeyEx(&propertiesHandle, ClassKey, &properties, KEY_READ); - if (!NT_SUCCESS(Status)) + else { - DPRINT("Properties key failed to open for \"%wZ\" (status %x)\n", - &classGUID, Status); + // open the CCS\Control\Class\<ClassGUID> key + Status = IopOpenRegistryKeyEx(&ClassKey, ccsControlHandle, &classGUID, KEY_READ); + ZwClose(ccsControlHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open class key \"%wZ\" (status %x)\n", &classGUID, Status); + } } - else + + if (ClassKey) { - ZwClose(propertiesHandle); + // Check the Properties key of a class too + // Windows fills some device properties from this key (which is protected) + // TODO: add the device properties from this key + + UNICODE_STRING properties = RTL_CONSTANT_STRING(REGSTR_KEY_DEVICE_PROPERTIES); + HANDLE propertiesHandle; + + Status = IopOpenRegistryKeyEx(&propertiesHandle, ClassKey, &properties, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT("Properties key failed to open for \"%wZ\" (status %x)\n", + &classGUID, Status); + } + else + { + ZwClose(propertiesHandle); + } } } + ExFreePool(kvInfo); }

1 0

[reactos] 06/06: [NTOS:MM] Silence noisy DPRINTs
by Jérôme Gardou 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42094071eebe30489ebc3… commit 42094071eebe30489ebc36f98c38df670f078dfd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 18 11:48:09 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Mar 18 12:24:21 2021 +0100 [NTOS:MM] Silence noisy DPRINTs --- ntoskrnl/mm/ARM3/expool.c | 2 +- ntoskrnl/mm/ARM3/pool.c | 2 +- ntoskrnl/mm/ARM3/syspte.c | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 25ad64c62ae..4df9bbde217 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -1517,7 +1517,7 @@ ExpReallocateBigPageTable( NewTable = MiAllocatePoolPages(NonPagedPool, NewSizeInBytes); if (NewTable == NULL) { - DPRINT1("Could not allocate %lu bytes for new big page table\n", NewSizeInBytes); + DPRINT("Could not allocate %lu bytes for new big page table\n", NewSizeInBytes); KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); return FALSE; } diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 9490f326874..5a406e166d8 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -835,7 +835,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Ran out of memory // - DPRINT1("Out of NP Expansion Pool\n"); + DPRINT("Out of NP Expansion Pool\n"); return NULL; } diff --git a/ntoskrnl/mm/ARM3/syspte.c b/ntoskrnl/mm/ARM3/syspte.c index 6c1b1bd55e2..87b862c265f 100644 --- a/ntoskrnl/mm/ARM3/syspte.c +++ b/ntoskrnl/mm/ARM3/syspte.c @@ -253,17 +253,6 @@ MiReserveSystemPtes(IN ULONG NumberOfPtes, // PointerPte = MiReserveAlignedSystemPtes(NumberOfPtes, SystemPtePoolType, 0); - // - // Check if allocation failed - // - if (!PointerPte) - { - // - // Warn that we are out of memory - // - DPRINT1("MiReserveSystemPtes: Failed to reserve %lu PTE(s)!\n", NumberOfPtes); - } - // // Return the PTE Pointer //

1 0

[reactos] 05/06: [NTOS:MM] Use a define for the big pool table occupation rate
by Jérôme Gardou 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ff5d39edb2b9bf59ed78… commit 4ff5d39edb2b9bf59ed78789b736cb276a6a249b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 18 09:15:48 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Mar 18 12:24:21 2021 +0100 [NTOS:MM] Use a define for the big pool table occupation rate --- ntoskrnl/mm/ARM3/expool.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 95bc21ad822..25ad64c62ae 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -22,6 +22,16 @@ #define POOL_BIG_TABLE_ENTRY_FREE 0x1 +/* + * This defines when we shrink or expand the table. + * 3 --> keep the number of used entries in the 33%-66% of the table capacity. + * 4 --> 25% - 75% + * etc. + */ +#define POOL_BIG_TABLE_USE_RATE 4 +#define POOL_BIG_TABLE_LOW_THRESHOLD (POOL_BIG_TABLE_USE_RATE * 2) +#define POOL_BIG_TABLE_HIGH_THRESHOLD ((POOL_BIG_TABLE_USE_RATE - 1) / POOL_BIG_TABLE_USE_RATE) + typedef struct _POOL_DPC_CONTEXT { PPOOL_TRACKER_TABLE PoolTrackTable; @@ -1626,7 +1636,7 @@ Retry: // which implies a massive number of concurrent big pool allocations. // ExpPoolBigEntriesInUse++; - if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize * 3 / 4))) + if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize * POOL_BIG_TABLE_HIGH_THRESHOLD))) { DPRINT("Attempting expansion since we now have %lu entries\n", ExpPoolBigEntriesInUse); @@ -1740,7 +1750,7 @@ ExpFindAndRemoveTagBigPages(IN PVOID Va, /* If reaching 12.5% of the size (or whatever integer rounding gets us to), * halve the allocation size, which will get us to 25% of space used. */ - if (ExpPoolBigEntriesInUse < (PoolBigPageTableSize / 8)) + if (ExpPoolBigEntriesInUse < (PoolBigPageTableSize / POOL_BIG_TABLE_LOW_THRESHOLD)) { /* Shrink the table. */ ExpReallocateBigPageTable(OldIrql, TRUE);

1 0

[reactos] 04/06: [NTOS:MM] Do not use atomic operations to set a bit while holding a lock.
by Jérôme Gardou 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8494688eebecb28797356… commit 8494688eebecb287973569dc1261fd0741706324 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 18 09:05:00 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Mar 18 12:24:21 2021 +0100 [NTOS:MM] Do not use atomic operations to set a bit while holding a lock. Saving your fingers from typing it doesn't make it better code. --- ntoskrnl/mm/ARM3/expool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index fb55f9159ba..95bc21ad822 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -1734,7 +1734,7 @@ ExpFindAndRemoveTagBigPages(IN PVOID Va, // Set the free bit, and decrement the number of allocations. Finally, release // the lock and return the tag that was located // - InterlockedIncrement((PLONG)&Entry->Va); + Entry->Va = (PVOID)((ULONG_PTR)Entry->Va | POOL_BIG_TABLE_ENTRY_FREE); ExpPoolBigEntriesInUse--;

1 0

[reactos] 03/06: [NTOS:MM] Implement shrinking big pool allocation table
by Jérôme Gardou 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f06b58925d9819c08bbf1… commit f06b58925d9819c08bbf1482ca9d0435182bf656 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Feb 22 17:30:24 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Mar 18 12:24:21 2021 +0100 [NTOS:MM] Implement shrinking big pool allocation table Shrink when using 1/8 of its allocated capacity (thus use 25% of it at the end of the process) Expand when using 3/4 of its allocated capacity (thus use ~40% of it at the end of the process) --- ntoskrnl/mm/ARM3/expool.c | 85 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 21 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 1ea7ee6cc46..fb55f9159ba 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -1446,14 +1446,14 @@ ExGetPoolTagInfo(IN PSYSTEM_POOLTAG_INFORMATION SystemInformation, } _IRQL_requires_(DISPATCH_LEVEL) +static BOOLEAN -NTAPI -ExpExpandBigPageTable( - _In_ _IRQL_restores_ KIRQL OldIrql) +ExpReallocateBigPageTable( + _In_ _IRQL_restores_ KIRQL OldIrql, + _In_ BOOLEAN Shrink) { - ULONG OldSize = PoolBigPageTableSize; - ULONG NewSize = 2 * OldSize; - ULONG NewSizeInBytes; + SIZE_T OldSize = PoolBigPageTableSize; + SIZE_T NewSize, NewSizeInBytes; PPOOL_TRACKER_BIG_PAGES NewTable; PPOOL_TRACKER_BIG_PAGES OldTable; ULONG i; @@ -1465,11 +1465,41 @@ ExpExpandBigPageTable( ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Make sure we don't overflow */ - if (!NT_SUCCESS(RtlULongMult(2, - OldSize * sizeof(POOL_TRACKER_BIG_PAGES), - &NewSizeInBytes))) + if (Shrink) + { + NewSize = OldSize / 2; + + /* Make sure we don't shrink too much. */ + ASSERT(NewSize >= ExpPoolBigEntriesInUse); + + NewSize = ALIGN_UP_BY(NewSize, PAGE_SIZE / sizeof(POOL_TRACKER_BIG_PAGES)); + ASSERT(NewSize <= OldSize); + + /* If there is only one page left, then keep it around. Not a failure either. */ + if (NewSize == OldSize) + { + ASSERT(NewSize == (PAGE_SIZE / sizeof(POOL_TRACKER_BIG_PAGES))); + KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); + return TRUE; + } + } + else { - DPRINT1("Overflow expanding big page table. Size=%lu\n", OldSize); + if (!NT_SUCCESS(RtlSIZETMult(2, OldSize, &NewSize))) + { + DPRINT1("Overflow expanding big page table. Size=%lu\n", OldSize); + KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); + return FALSE; + } + + /* Make sure we don't stupidly waste pages */ + NewSize = ALIGN_DOWN_BY(NewSize, PAGE_SIZE / sizeof(POOL_TRACKER_BIG_PAGES)); + ASSERT(NewSize > OldSize); + } + + if (!NT_SUCCESS(RtlSIZETMult(sizeof(POOL_TRACKER_BIG_PAGES), NewSize, &NewSizeInBytes))) + { + DPRINT1("Overflow while calculating big page table size. Size=%lu\n", OldSize); KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); return FALSE; } @@ -1482,7 +1512,7 @@ ExpExpandBigPageTable( return FALSE; } - DPRINT("Expanding big pool tracker table to %lu entries\n", NewSize); + DPRINT("%s big pool tracker table to %lu entries\n", Shrink ? "Shrinking" : "Expanding", NewSize); /* Initialize the new table */ RtlZeroMemory(NewTable, NewSizeInBytes); @@ -1503,15 +1533,16 @@ ExpExpandBigPageTable( } /* Recalculate the hash due to the new table size */ - Hash = ExpComputePartialHashForAddress(OldTable[i].Va) & HashMask; + Hash = ExpComputePartialHashForAddress(OldTable[i].Va) % HashMask; /* Find the location in the new table */ while (!((ULONG_PTR)NewTable[Hash].Va & POOL_BIG_TABLE_ENTRY_FREE)) { - Hash = (Hash + 1) & HashMask; + if (++Hash == NewSize) + Hash = 0; } - /* We just enlarged the table, so we must have space */ + /* We must have space */ ASSERT((ULONG_PTR)NewTable[Hash].Va & POOL_BIG_TABLE_ENTRY_FREE); /* Finally, copy the item */ @@ -1587,20 +1618,20 @@ Retry: // // Add one more entry to the count, and see if we're getting within - // 25% of the table size, at which point we'll do an expansion now + // 75% of the table size, at which point we'll do an expansion now // to avoid blocking too hard later on. // // Note that we only do this if it's also been the 16th time that we // keep losing the race or that we are not finding a free entry anymore, // which implies a massive number of concurrent big pool allocations. // - InterlockedIncrementUL(&ExpPoolBigEntriesInUse); - if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize / 4))) + ExpPoolBigEntriesInUse++; + if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize * 3 / 4))) { DPRINT("Attempting expansion since we now have %lu entries\n", ExpPoolBigEntriesInUse); ASSERT(TableSize == PoolBigPageTableSize); - ExpExpandBigPageTable(OldIrql); + ExpReallocateBigPageTable(OldIrql, FALSE); return TRUE; } @@ -1626,7 +1657,7 @@ Retry: // to attempt expanding the table // ASSERT(TableSize == PoolBigPageTableSize); - if (ExpExpandBigPageTable(OldIrql)) + if (ExpReallocateBigPageTable(OldIrql, FALSE)) { goto Retry; } @@ -1704,8 +1735,20 @@ ExpFindAndRemoveTagBigPages(IN PVOID Va, // the lock and return the tag that was located // InterlockedIncrement((PLONG)&Entry->Va); - InterlockedDecrementUL(&ExpPoolBigEntriesInUse); - KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); + + ExpPoolBigEntriesInUse--; + + /* If reaching 12.5% of the size (or whatever integer rounding gets us to), + * halve the allocation size, which will get us to 25% of space used. */ + if (ExpPoolBigEntriesInUse < (PoolBigPageTableSize / 8)) + { + /* Shrink the table. */ + ExpReallocateBigPageTable(OldIrql, TRUE); + } + else + { + KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); + } return PoolTag; }

1 0

[reactos] 02/06: [NTOS:MM] Fail allocating non-paged pool when running out of available pages
by Jérôme Gardou 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54354712e25df2aa2cf56… commit 54354712e25df2aa2cf562de4dd9251365a041fe Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Feb 22 11:43:04 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Mar 18 12:24:21 2021 +0100 [NTOS:MM] Fail allocating non-paged pool when running out of available pages --- ntoskrnl/mm/ARM3/pool.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 7c0e1bb93ba..9490f326874 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -849,6 +849,19 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // MiAcquirePfnLockAtDpcLevel(); + /* Check that we have enough available pages for this request */ + if (MmAvailablePages < SizeInPages) + { + MiReleasePfnLockFromDpcLevel(); + KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); + + MiReleaseSystemPtes(StartPte, SizeInPages, NonPagedPoolExpansion); + + DPRINT1("OUT OF AVAILABLE PAGES! Required %lu, Available %lu\n", SizeInPages, MmAvailablePages); + + return NULL; + } + // // Loop the pages //

1 0

[reactos] 01/06: [NTOS:MM] Do not bugcheck when we are freeing a big allocation for which we didn't manage to insert the tag
by Jérôme Gardou 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34630a06ca7416dcd98f4… commit 34630a06ca7416dcd98f436f245be2132278754e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Feb 22 14:38:36 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Mar 18 12:24:21 2021 +0100 [NTOS:MM] Do not bugcheck when we are freeing a big allocation for which we didn't manage to insert the tag --- ntoskrnl/mm/ARM3/expool.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 2cda0ac5b06..1ea7ee6cc46 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -2551,7 +2551,9 @@ ExFreePoolWithTag(IN PVOID P, { DPRINT1("Freeing pool - invalid tag specified: %.4s != %.4s\n", (char*)&TagToFree, (char*)&Tag); #if DBG - KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree); + /* Do not bugcheck in case this is a big allocation for which we didn't manage to insert the tag */ + if (Tag != ' GIB') + KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree); #endif }

1 0

[reactos] 01/01: [SDK][INCLUDE] msgdump.h: Support RegisterWindowMessage
by Katayama Hirofumi MZ 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9b89c9961fa89d4d3891… commit f9b89c9961fa89d4d3891be9f61af0933e0bead0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 18 18:41:03 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 18 18:41:03 2021 +0900 [SDK][INCLUDE] msgdump.h: Support RegisterWindowMessage msgdump.h: Version 18. --- sdk/include/reactos/msgdump.h | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index eeea6a2cae8..1076c7e8943 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -2,10 +2,10 @@ * PROJECT: ReactOS header files * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) * PURPOSE: Win32API message dumping - * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: Copyright 2018-2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 17 /* Version 17 */ +#define _INC_MSGDUMP 18 /* Version 18 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -4654,7 +4654,7 @@ MD_RichEdit_OnGetTextMode(HWND hwnd) static __inline LRESULT MSGDUMP_API MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TCHAR szClass[24], sz[2]; + TCHAR szClass[24], sz[2], szMsg[64]; szClass[0] = 0; GetClassName(hwnd, szClass, ARRAYSIZE(szClass)); sz[0] = szClass[0]; @@ -5341,15 +5341,24 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #endif default: { - if (WM_USER <= uMsg && uMsg <= 0x7FFF) + if (WM_USER <= uMsg && uMsg < WM_APP) { return MD_OnUser(hwnd, uMsg, wParam, lParam); } - if (WM_APP <= uMsg && uMsg <= 0xBFFF) + if (WM_APP <= uMsg && uMsg < MAXINTATOM) { return MD_OnApp(hwnd, uMsg, wParam, lParam); } - return MD_OnUnknown(hwnd, uMsg, wParam, lParam); + else if (MAXINTATOM <= uMsg && uMsg <= MAXWORD && + GetClipboardFormatName(uMsg, szMsg, _countof(szMsg))) + { + MSGDUMP_TPRINTF(TEXT("%sWM_%u[\"%s\"](hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, uMsg, szMsg, (void *)hwnd, wParam, lParam); + } + else + { + return MD_OnUnknown(hwnd, uMsg, wParam, lParam); + } } } return 0; @@ -5360,7 +5369,7 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult { #define DEFINE_RESULT(WM_) case WM_: MSGDUMP_TPRINTF(TEXT("%s") TEXT(#WM_) TEXT(": hwnd:%p, lResult:%p\n"), \ MSGDUMP_PREFIX, (void *)hwnd, lResult); break - TCHAR szClass[24], sz[2]; + TCHAR szClass[24], sz[2], szMsg[64]; szClass[0] = 0; GetClassName(hwnd, szClass, ARRAYSIZE(szClass)); sz[0] = szClass[0]; @@ -6060,16 +6069,22 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult DEFINE_RESULT(WM_GETTITLEBARINFOEX); #endif default: - if (WM_USER <= uMsg && uMsg <= 0x7FFF) + if (WM_USER <= uMsg && uMsg < WM_APP) { MSGDUMP_TPRINTF(TEXT("%sWM_USER+%u(hwnd:%p, lResult:%p)\n"), MSGDUMP_PREFIX, uMsg - WM_USER, (void *)hwnd, (void *)lResult); } - else if (WM_APP <= uMsg && uMsg <= 0xBFFF) + else if (WM_APP <= uMsg && uMsg < MAXINTATOM) { MSGDUMP_TPRINTF(TEXT("%sWM_APP+%u(hwnd:%p, lResult:%p)\n"), MSGDUMP_PREFIX, uMsg - WM_APP, (void *)hwnd, (void *)lResult); } + else if (MAXINTATOM <= uMsg && uMsg <= MAXWORD && + GetClipboardFormatName(uMsg, szMsg, _countof(szMsg))) + { + MSGDUMP_TPRINTF(TEXT("%sWM_%u[\"%s\"](hwnd:%p, lResult:%p)\n"), + MSGDUMP_PREFIX, uMsg, szMsg, (void *)hwnd, (void *)lResult); + } else { MSGDUMP_TPRINTF(TEXT("%sWM_%u(hwnd:%p, lResult:%p)\n"),

1 0

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen ACListISF testcase (#3538)
by Katayama Hirofumi MZ 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea3c56b659ded0121f261… commit ea3c56b659ded0121f2613f7f133a669390997d2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 18 09:49:40 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 18 09:49:40 2021 +0900 [BROWSEUI_APITEST] Strengthen ACListISF testcase (#3538) Add tests for ACListISF testcase to clarify the details. CORE-9281 --- modules/rostests/apitests/browseui/ACListISF.cpp | 125 ++++++++++++++++++++++- 1 file changed, 121 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/browseui/ACListISF.cpp b/modules/rostests/apitests/browseui/ACListISF.cpp index 7ae0d10b4c4..7cb1bc6d93a 100644 --- a/modules/rostests/apitests/browseui/ACListISF.cpp +++ b/modules/rostests/apitests/browseui/ACListISF.cpp @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS api tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for ACListISF objects - * PROGRAMMER: Mark Jansen + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for ACListISF objects + * COPYRIGHT: Copyright 2016 Mark Jansen <mark.jansen(a)reactos.org> + * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #define _UNICODE @@ -259,6 +260,122 @@ test_ACListISF_CURRENTDIR() // The first set of results are absolute paths, without hidden files?! test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer2, IgnoreHidden); test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer2, IgnoreHidden | IgnoreRoot | CheckLast); + + WCHAR szDir[MAX_PATH], szPath[MAX_PATH]; + Buffer2[2] = 0; + StringCbCopyW(szDir, sizeof(szDir), Buffer2); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1"); + CreateDirectoryW(szPath, NULL); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST1"); + CreateDirectoryW(szPath, NULL); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST2"); + CreateDirectoryW(szPath, NULL); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2"); + CreateDirectoryW(szPath, NULL); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2\\tes1"); + CreateDirectoryW(szPath, NULL); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2\\tes2"); + CreateDirectoryW(szPath, NULL); + + ULONG cGot; + LPWSTR psz = NULL; + EnumStr->Reset(); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\"); + ok_hr(hr = ACList->Expand(szPath), S_OK); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST1"); + ok_wstr(szPath, psz); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST2"); + ok_wstr(szPath, psz); + CoTaskMemFree(psz); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2\\"); + ok_hr(hr = CurrentWorkingDir->SetDirectory(szPath), S_OK); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"tes1"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"tes2"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_FALSE); + CoTaskMemFree(psz); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2"); + ok_hr(hr = CurrentWorkingDir->SetDirectory(szPath), S_OK); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_FALSE); + CoTaskMemFree(psz); + + EnumStr->Reset(); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"tes1"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"tes2"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_FALSE); + CoTaskMemFree(psz); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST1"); + RemoveDirectoryW(szPath); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST2"); + RemoveDirectoryW(szPath); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1"); + RemoveDirectoryW(szPath); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2\\tes1"); + RemoveDirectoryW(szPath); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2\\tes2"); + RemoveDirectoryW(szPath); + + StringCbCopyW(szPath, sizeof(szPath), szDir); + StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2"); + RemoveDirectoryW(szPath); } static void

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2021