Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SYSSETUP] Install nettcpip.inf
by Jérôme Gardou 19 Mar '21

19 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3141c833c27ca38df810… commit e3141c833c27ca38df810a63be317b8cdc9bcab8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 19 14:22:16 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Mar 19 14:23:28 2021 +0100 [SYSSETUP] Install nettcpip.inf CORE-17514 --- media/inf/syssetup.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index d80ab26d629..41a0b782c70 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -20,6 +20,7 @@ machine.inf monitor.inf msmouse.inf NET_NIC.inf +nettcpip.inf ports.inf scsi.inf unknown.inf

1 0

[reactos] 01/01: [NDK][XDK] Use decimal literals for MINxxxx defines
by Jérôme Gardou 19 Mar '21

19 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=525d19d46955947492486… commit 525d19d4695594749248617d8e7a069fff894856 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 19 10:15:31 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Mar 19 11:04:19 2021 +0100 [NDK][XDK] Use decimal literals for MINxxxx defines Because myLongLong < MINLONG is supposed to behave like you'd expect --- sdk/include/ndk/umtypes.h | 12 ++++++------ sdk/include/xdk/ntbasedef.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/include/ndk/umtypes.h b/sdk/include/ndk/umtypes.h index 3037151b6b0..82b32eae971 100644 --- a/sdk/include/ndk/umtypes.h +++ b/sdk/include/ndk/umtypes.h @@ -108,12 +108,12 @@ Author: // // Limits // -#define MINCHAR 0x80 -#define MAXCHAR 0x7f -#define MINSHORT 0x8000 -#define MAXSHORT 0x7fff -#define MINLONG 0x80000000 -#define MAXLONG 0x7fffffff +#define MINCHAR (-128) +#define MAXCHAR 127 +#define MINSHORT (-32768) +#define MAXSHORT 32767 +#define MINLONG (-2147483648) +#define MAXLONG 2147483647 #define MAXUCHAR 0xff #define MAXUSHORT 0xffff #define MAXULONG 0xffffffff diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 91c926257fb..50f8b9314f1 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -735,12 +735,12 @@ extern "C++" { \ #define COMPILETIME_OR_5FLAGS(a,b,c,d,e) ((UINT)(a)|(UINT)(b)|(UINT)(c)|(UINT)(d)|(UINT)(e)) /* Type Limits */ -#define MINCHAR 0x80 -#define MAXCHAR 0x7f -#define MINSHORT 0x8000 -#define MAXSHORT 0x7fff -#define MINLONG 0x80000000 -#define MAXLONG 0x7fffffff +#define MINCHAR (-128) +#define MAXCHAR 127 +#define MINSHORT (-32768) +#define MAXSHORT 32767 +#define MINLONG (-2147483648) +#define MAXLONG 2147483647 $if(_NTDEF_) #define MAXUCHAR 0xff #define MAXUSHORT 0xffff

1 0

[reactos] 01/01: [UMPNPMGR] Fix GCC build
by Victor Perevertkin 19 Mar '21

19 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16173c0798f1dd8cdf5e3… commit 16173c0798f1dd8cdf5e36deca5559a5dd870268 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Mar 19 09:14:05 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Mar 19 09:14:05 2021 +0300 [UMPNPMGR] Fix GCC build Addendum to 420c4a7abfe14decc624aa9626e8871c9de267e6 --- base/services/umpnpmgr/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/umpnpmgr/install.c b/base/services/umpnpmgr/install.c index afe3c9fc0ca..dae3e649254 100644 --- a/base/services/umpnpmgr/install.c +++ b/base/services/umpnpmgr/install.c @@ -369,7 +369,7 @@ DeviceInstallThread(LPVOID lpParameter) while (TRUE) { - UINT32 devListSize; + ULONG devListSize; DWORD status = PNP_GetDeviceListSize(NULL, NULL, &devListSize, 0); if (status != CR_SUCCESS) {

1 0

[reactos] 02/02: [UMPNPMGR] Install drivers for all devices available on boot
by Victor Perevertkin 19 Mar '21

19 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=420c4a7abfe14decc624a… commit 420c4a7abfe14decc624aa9626e8871c9de267e6 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Mar 19 08:59:42 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Mar 19 08:59:42 2021 +0300 [UMPNPMGR] Install drivers for all devices available on boot Don't wait for their events to appear, just retrieve the list and install drivers. This fixes the installation of manually reported device nodes CORE-17212 CORE-17398 --- base/services/umpnpmgr/install.c | 55 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/install.c b/base/services/umpnpmgr/install.c index 80ef8258900..afe3c9fc0ca 100644 --- a/base/services/umpnpmgr/install.c +++ b/base/services/umpnpmgr/install.c @@ -358,13 +358,64 @@ DeviceInstallThread(LPVOID lpParameter) { PLIST_ENTRY ListEntry; DeviceInstallParams* Params; - BOOL showWizard; UNREFERENCED_PARAMETER(lpParameter); + // Step 1: install all drivers which were configured during the boot + + DPRINT("Step 1: Installing devices configured during the boot\n"); + + PWSTR deviceList; + + while (TRUE) + { + UINT32 devListSize; + DWORD status = PNP_GetDeviceListSize(NULL, NULL, &devListSize, 0); + if (status != CR_SUCCESS) + { + goto Step2; + } + + deviceList = HeapAlloc(GetProcessHeap(), 0, devListSize * sizeof(WCHAR)); + if (!deviceList) + { + goto Step2; + } + + status = PNP_GetDeviceList(NULL, NULL, deviceList, &devListSize, 0); + if (status == CR_BUFFER_SMALL) + { + HeapFree(GetProcessHeap(), 0, deviceList); + } + else if (status != CR_SUCCESS) + { + DPRINT1("PNP_GetDeviceList failed with error %u\n", status); + goto Cleanup; + } + else // status == CR_SUCCESS + { + break; + } + } + + for (PWSTR currentDev = deviceList; + currentDev[0] != UNICODE_NULL; + currentDev += lstrlenW(currentDev) + 1) + { + InstallDevice(currentDev, FALSE); + } + +Cleanup: + HeapFree(GetProcessHeap(), 0, deviceList); + + // Step 2: start the wait-loop for newly added devices +Step2: + + DPRINT("Step 2: Starting the wait-loop\n"); + WaitForSingleObject(hInstallEvent, INFINITE); - showWizard = !SetupIsActive() && !IsConsoleBoot(); + BOOL showWizard = !SetupIsActive() && !IsConsoleBoot(); while (TRUE) {

1 0

[reactos] 01/02: [NTOS:PNP] Initialize DeviceDesc and LocationInformation registry fields
by Victor Perevertkin 19 Mar '21

19 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fed07b7e4c70e5be3068… commit 0fed07b7e4c70e5be3068aeae224d69b39ee7046 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Mar 19 07:57:41 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Mar 19 07:57:41 2021 +0300 [NTOS:PNP] Initialize DeviceDesc and LocationInformation registry fields for manually reported devices, as it is required by the newdev.dll for installing drivers from INF files CORE-17212 CORE-17398 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- ntoskrnl/include/internal/io.h | 12 +++ ntoskrnl/io/pnpmgr/devaction.c | 199 ++++++++++++++++++++++------------------- ntoskrnl/io/pnpmgr/pnpirp.c | 31 +++++++ ntoskrnl/io/pnpmgr/pnpreport.c | 3 + 4 files changed, 151 insertions(+), 94 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 5e84f8e120f..e43f4769c94 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -753,6 +753,11 @@ PnpRegSzToString( OUT PUSHORT StringLength OPTIONAL ); +VOID +PiSetDevNodeText( + _In_ PDEVICE_NODE DeviceNode, + _In_ HANDLE InstanceKey); + // // Initialization Routines // @@ -1381,6 +1386,13 @@ PiIrpQueryDeviceRelations( _In_ PDEVICE_NODE DeviceNode, _In_ DEVICE_RELATION_TYPE Type); +NTSTATUS +PiIrpQueryDeviceText( + _In_ PDEVICE_NODE DeviceNode, + _In_ LCID POINTER_ALIGNMENT LocaleId, + _In_ DEVICE_TEXT_TYPE Type, + _Out_ PWSTR *DeviceText); + NTSTATUS PiIrpQueryPnPDeviceState( _In_ PDEVICE_NODE DeviceNode, diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index aa1ac12f6c2..1cf30fa8575 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1081,34 +1081,123 @@ IopQueryCompatibleIds(PDEVICE_NODE DeviceNode, return Status; } +/** + * @brief Sets the DeviceNode's DeviceDesc and LocationInformation registry values + */ +VOID +PiSetDevNodeText( + _In_ PDEVICE_NODE DeviceNode, + _In_ HANDLE InstanceKey) +{ + PAGED_CODE(); + + LCID localeId; + + // Get the Locale ID + NTSTATUS status = ZwQueryDefaultLocale(FALSE, &localeId); + if (!NT_SUCCESS(status)) + { + DPRINT1("ZwQueryDefaultLocale() failed with status %x\n", status); + return; + } + + // Step 1: write DeviceDesc key if not exists + + UNICODE_STRING valDeviceDesc = RTL_CONSTANT_STRING(L"DeviceDesc"); + ULONG len; + + status = ZwQueryValueKey(InstanceKey, &valDeviceDesc, KeyValueBasicInformation, NULL, 0, &len); + if (!NT_SUCCESS(status)) + { + PWSTR deviceDesc = NULL; + status = PiIrpQueryDeviceText(DeviceNode, localeId, DeviceTextDescription, &deviceDesc); + + if (deviceDesc && deviceDesc[0] != UNICODE_NULL) + { + status = ZwSetValueKey(InstanceKey, + &valDeviceDesc, + 0, + REG_SZ, + deviceDesc, + ((ULONG)wcslen(deviceDesc) + 1) * sizeof(WCHAR)); + + if (!NT_SUCCESS(status)) + { + DPRINT1("ZwSetValueKey() failed (Status %x)\n", status); + } + } + else + { + // This key is mandatory, so even if the Irp fails, we still write it + UNICODE_STRING unknownDeviceDesc = RTL_CONSTANT_STRING(L"Unknown device"); + DPRINT("Driver didn't return DeviceDesc (status %x)\n", status); + + status = ZwSetValueKey(InstanceKey, + &valDeviceDesc, + 0, + REG_SZ, + unknownDeviceDesc.Buffer, + unknownDeviceDesc.MaximumLength); + if (!NT_SUCCESS(status)) + { + DPRINT1("ZwSetValueKey() failed (Status %x)\n", status); + } + } + + if (deviceDesc) + { + ExFreePoolWithTag(deviceDesc, 0); + } + } + + // Step 2: LocaltionInformation is overwritten unconditionally + + PWSTR deviceLocationInfo = NULL; + status = PiIrpQueryDeviceText(DeviceNode, + localeId, + DeviceTextLocationInformation, + &deviceLocationInfo); + + if (deviceLocationInfo && deviceLocationInfo[0] != UNICODE_NULL) + { + UNICODE_STRING valLocationInfo = RTL_CONSTANT_STRING(L"LocationInformation"); + + status = ZwSetValueKey(InstanceKey, + &valLocationInfo, + 0, + REG_SZ, + deviceLocationInfo, + ((ULONG)wcslen(deviceLocationInfo) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(status)) + { + DPRINT1("ZwSetValueKey() failed (Status %x)\n", status); + } + } + + if (deviceLocationInfo) + { + ExFreePoolWithTag(deviceLocationInfo, 0); + } + else + { + DPRINT("Driver didn't return LocationInformation (status %x)\n", status); + } +} + static NTSTATUS PiInitializeDevNode( _In_ PDEVICE_NODE DeviceNode) { IO_STATUS_BLOCK IoStatusBlock; - PWSTR DeviceDescription; - PWSTR LocationInformation; - IO_STACK_LOCATION Stack; NTSTATUS Status; - ULONG RequiredLength; - LCID LocaleId; HANDLE InstanceKey = NULL; - UNICODE_STRING ValueName; UNICODE_STRING InstancePathU; PDEVICE_OBJECT OldDeviceObject; DPRINT("PiProcessNewDevNode(%p)\n", DeviceNode); DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject); - /* Get Locale ID */ - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwQueryDefaultLocale() failed with status 0x%lx\n", Status); - return Status; - } - /* * FIXME: For critical errors, cleanup and disable device, but always * return STATUS_SUCCESS. @@ -1163,86 +1252,8 @@ PiInitializeDevNode( DeviceNode->Flags |= DNF_IDS_QUERIED; - DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextDescription to device stack\n"); - - Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription; - Stack.Parameters.QueryDeviceText.LocaleId = LocaleId; - Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject, - &IoStatusBlock, - IRP_MN_QUERY_DEVICE_TEXT, - &Stack); - DeviceDescription = NT_SUCCESS(Status) ? (PWSTR)IoStatusBlock.Information - : NULL; - /* This key is mandatory, so even if the Irp fails, we still write it */ - RtlInitUnicodeString(&ValueName, L"DeviceDesc"); - if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) - { - if (DeviceDescription && - *DeviceDescription != UNICODE_NULL) - { - /* This key is overriden when a driver is installed. Don't write the - * new description if another one already exists */ - Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_SZ, - DeviceDescription, - ((ULONG)wcslen(DeviceDescription) + 1) * sizeof(WCHAR)); - } - else - { - UNICODE_STRING DeviceDesc = RTL_CONSTANT_STRING(L"Unknown device"); - DPRINT("Driver didn't return DeviceDesc (Status 0x%08lx), so place unknown device there\n", Status); - - Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_SZ, - DeviceDesc.Buffer, - DeviceDesc.MaximumLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status); - } - - } - } - - if (DeviceDescription) - { - ExFreePoolWithTag(DeviceDescription, 0); - } - - DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n"); - - Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextLocationInformation; - Stack.Parameters.QueryDeviceText.LocaleId = LocaleId; - Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject, - &IoStatusBlock, - IRP_MN_QUERY_DEVICE_TEXT, - &Stack); - if (NT_SUCCESS(Status) && IoStatusBlock.Information) - { - LocationInformation = (PWSTR)IoStatusBlock.Information; - DPRINT("LocationInformation: %S\n", LocationInformation); - RtlInitUnicodeString(&ValueName, L"LocationInformation"); - Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_SZ, - LocationInformation, - ((ULONG)wcslen(LocationInformation) + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); - } - - ExFreePoolWithTag(LocationInformation, 0); - } - else - { - DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); - } + // Set the device's DeviceDesc and LocationInformation fields + PiSetDevNodeText(DeviceNode, InstanceKey); DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n"); diff --git a/ntoskrnl/io/pnpmgr/pnpirp.c b/ntoskrnl/io/pnpmgr/pnpirp.c index 03fc0d1aafc..48d924d6c7c 100644 --- a/ntoskrnl/io/pnpmgr/pnpirp.c +++ b/ntoskrnl/io/pnpmgr/pnpirp.c @@ -196,6 +196,37 @@ PiIrpQueryDeviceRelations( return status; } +// IRP_MN_QUERY_DEVICE_TEXT (0x0C) +NTSTATUS +PiIrpQueryDeviceText( + _In_ PDEVICE_NODE DeviceNode, + _In_ LCID POINTER_ALIGNMENT LocaleId, + _In_ DEVICE_TEXT_TYPE Type, + _Out_ PWSTR *DeviceText) +{ + PAGED_CODE(); + + ASSERT(DeviceNode); + ASSERT(DeviceNode->State == DeviceNodeUninitialized); + + ULONG_PTR longText; + IO_STACK_LOCATION stack = { + .MajorFunction = IRP_MJ_PNP, + .MinorFunction = IRP_MN_QUERY_DEVICE_TEXT, + .Parameters.QueryDeviceText.DeviceTextType = Type, + .Parameters.QueryDeviceText.LocaleId = LocaleId + }; + + NTSTATUS status; + status = IopSynchronousCall(DeviceNode->PhysicalDeviceObject, &stack, (PVOID)&longText); + if (NT_SUCCESS(status)) + { + *DeviceText = (PVOID)longText; + } + + return status; +} + // IRP_MN_QUERY_PNP_DEVICE_STATE (0x14) NTSTATUS PiIrpQueryPnPDeviceState( diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 8104a8f178b..65e256075da 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -294,6 +294,9 @@ IoReportDetectedDevice( return Status; } + // Set the device's DeviceDesc and LocationInformation fields + PiSetDevNodeText(DeviceNode, InstanceKey); + /* Assign the resources to the device node */ DeviceNode->BootResources = ResourceList; DeviceNode->ResourceRequirements = ResourceRequirements;

1 0

[reactos] 01/01: [SHELL32] Fix assertion failure in CDirectoryWatcher.cpp
by Katayama Hirofumi MZ 18 Mar '21

18 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=880252fd463233fce20dd… commit 880252fd463233fce20ddacf77d561a808fd6397 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 19 08:30:10 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Mar 19 08:30:10 2021 +0900 [SHELL32] Fix assertion failure in CDirectoryWatcher.cpp CORE-17511 --- dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp index 1e4a7015287..d5056a64faa 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp @@ -162,8 +162,11 @@ void CDirectoryWatcher::ProcessNotification() // convert to long pathname if it contains '~' if (StrChrW(szPath, L'~') != NULL) { - GetLongPathNameW(szPath, szName, _countof(szName)); - lstrcpynW(szPath, szName, _countof(szPath)); + if (GetLongPathNameW(szPath, szName, _countof(szName)) && + !PathIsRelativeW(szName)) + { + lstrcpynW(szPath, szName, _countof(szPath)); + } } // convert action to event

1 0

[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

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