Ros-diffs January 2021

ros-diffs@reactos.org

15 participants
146 discussions

[reactos] 01/01: [HALX86] Restore Windows compatibility on reporting device IDs

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8248f02ff46abbc5b9a1c… commit 8248f02ff46abbc5b9a1cec8703c88655cf1813a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Jan 31 05:37:27 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Jan 31 05:37:27 2021 +0300 [HALX86] Restore Windows compatibility on reporting device IDs And forwarding IRPs from FDO to PDO This along with 8aff2c9de7cf45dd306e447b0c27a379f827fe4c reverts the commit 74b889b3977594229a78d87066dfc22c1f9b46b8 --- hal/halx86/acpi/halpnpdd.c | 23 +++++++++++++++++------ hal/halx86/legacy/halpnpdd.c | 23 +++++++++++++++++------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/hal/halx86/acpi/halpnpdd.c b/hal/halx86/acpi/halpnpdd.c index 03c195293a5..3f3d895cf2c 100644 --- a/hal/halx86/acpi/halpnpdd.c +++ b/hal/halx86/acpi/halpnpdd.c @@ -561,10 +561,6 @@ HalpQueryIdFdo(IN PDEVICE_OBJECT DeviceObject, switch (IdType) { case BusQueryDeviceID: - /* HACK */ - Id = L"Root\\ACPI_HAL"; - break; - case BusQueryHardwareIDs: /* This is our hardware ID */ @@ -676,11 +672,26 @@ HalpDispatchPnp(IN PDEVICE_OBJECT DeviceObject, default: DPRINT("Other IRP: %lx\n", Minor); - Status = Irp->IoStatus.Status; + Status = STATUS_NOT_SUPPORTED; break; } - /* Nowhere for the IRP to go since we also own the PDO */ + /* What happpened? */ + if ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED)) + { + /* Set the IRP status, unless this isn't understood */ + if (Status != STATUS_NOT_SUPPORTED) + { + Irp->IoStatus.Status = Status; + } + + /* Pass it on */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FdoExtension->AttachedDeviceObject, Irp); + } + + /* Otherwise, we failed, so set the status and complete the request */ + DPRINT1("IRP failed with status: %lx\n", Status); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; diff --git a/hal/halx86/legacy/halpnpdd.c b/hal/halx86/legacy/halpnpdd.c index 716b0d269e7..b2c03f2e417 100644 --- a/hal/halx86/legacy/halpnpdd.c +++ b/hal/halx86/legacy/halpnpdd.c @@ -559,10 +559,6 @@ HalpQueryIdFdo(IN PDEVICE_OBJECT DeviceObject, switch (IdType) { case BusQueryDeviceID: - /* HACK */ - Id = L"Root\\PCI_HAL"; - break; - case BusQueryHardwareIDs: /* This is our hardware ID */ @@ -673,11 +669,26 @@ HalpDispatchPnp(IN PDEVICE_OBJECT DeviceObject, default: DPRINT("Other IRP: %lx\n", Minor); - Status = Irp->IoStatus.Status; + Status = STATUS_NOT_SUPPORTED; break; } - /* Nowhere for the IRP to go since we also own the PDO */ + /* What happpened? */ + if ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED)) + { + /* Set the IRP status, unless this isn't understood */ + if (Status != STATUS_NOT_SUPPORTED) + { + Irp->IoStatus.Status = Status; + } + + /* Pass it on */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FdoExtension->AttachedDeviceObject, Irp); + } + + /* Otherwise, we failed, so set the status and complete the request */ + DPRINT1("IRP failed with status: %lx\n", Status); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status;

3 years, 7 months

[reactos] 01/01: [SYSDM] Delete 2 forgotten defines

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f91efe1502a9e14cf27fd… commit f91efe1502a9e14cf27fd879d77c5d34e007a382 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jan 30 20:07:30 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jan 30 20:07:30 2021 +0100 [SYSDM] Delete 2 forgotten defines Addendum to 0.4.15-dev-1630-g be25187 (CORE-17429) --- dll/cpl/sysdm/general.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index df68c092e00..8d9187964a7 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -16,9 +16,6 @@ #include <buildno.h> #include <strsafe.h> -#define ANIM_STEP 2 -#define ANIM_TIME 50 - typedef struct _IMGINFO { HBITMAP hBitmap;

3 years, 7 months

[reactos] 01/01: [SYSSETUP] Refactor ApplyAccountSettings() and add NewAdministratorName and NewGuestName options

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86a65fccb6a61541cacde… commit 86a65fccb6a61541cacdebadd347d45de121a0db Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 30 13:52:14 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 30 13:52:14 2021 +0100 [SYSSETUP] Refactor ApplyAccountSettings() and add NewAdministratorName and NewGuestName options --- dll/win32/syssetup/security.c | 331 ++++++++++++++++++++++++++++-------------- 1 file changed, 219 insertions(+), 112 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 834962298da..47123e7286a 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -1104,19 +1104,208 @@ done: static VOID -ApplyAccountSettings( +SetLsaAnonymousNameLookup( _In_ HINF hSecurityInf, _In_ PWSTR pszSectionName) +{ +#if 0 + INFCONTEXT InfContext; + INT nValue = 0; + + DPRINT1("SetLsaAnonymousNameLookup()\n"); + + if (!SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"LSAAnonymousNameLookup", + &InfContext)) + { + return; + } + + if (!SetupGetIntField(&InfContext, 1, &nValue)) + { + return; + } + + if (nValue == 0) + { + } + else + { + } +#endif +} + + +static +VOID +EnableAccount( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName, + _In_ PWSTR pszValueName, + _In_ SAM_HANDLE DomainHandle, + _In_ DWORD dwAccountRid) +{ + INFCONTEXT InfContext; + SAM_HANDLE UserHandle = NULL; + USER_CONTROL_INFORMATION ControlInfo; + INT nValue = 0; + NTSTATUS Status; + + DPRINT("EnableAccount()\n"); + + if (!SetupFindFirstLineW(hSecurityInf, + pszSectionName, + pszValueName, + &InfContext)) + return; + + if (!SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT1("No valid integer value\n"); + goto done; + } + + DPRINT("Value: %d\n", nValue); + + Status = SamOpenUser(DomainHandle, + USER_READ_ACCOUNT | USER_WRITE_ACCOUNT, + dwAccountRid, + &UserHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenUser() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamQueryInformationUser(UserHandle, + UserControlInformation, + (PVOID)&ControlInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamQueryInformationUser() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + if (nValue == 0) + { + ControlInfo.UserAccountControl |= USER_ACCOUNT_DISABLED; + } + else + { + ControlInfo.UserAccountControl &= ~USER_ACCOUNT_DISABLED; + } + + Status = SamSetInformationUser(UserHandle, + UserControlInformation, + (PVOID)&ControlInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationUser() failed (Status: 0x%08lx)\n", Status); + } + +done: + if (UserHandle != NULL) + SamCloseHandle(UserHandle); +} + + +static +VOID +SetNewAccountName( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName, + _In_ PWSTR pszValueName, + _In_ SAM_HANDLE DomainHandle, + _In_ DWORD dwAccountRid) { INFCONTEXT InfContext; + DWORD dwLength = 0; + PWSTR pszName = NULL; + SAM_HANDLE UserHandle = NULL; + USER_NAME_INFORMATION NameInfo; + NTSTATUS Status; + + DPRINT("SetNewAccountName()\n"); + + if (!SetupFindFirstLineW(hSecurityInf, + pszSectionName, + pszValueName, + &InfContext)) + return; + + SetupGetStringFieldW(&InfContext, + 1, + NULL, + 0, + &dwLength); + if (dwLength == 0) + return; + + pszName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength * sizeof(WCHAR)); + if (pszName == NULL) + { + DPRINT1("HeapAlloc() failed\n"); + return; + } + + if (!SetupGetStringFieldW(&InfContext, + 1, + pszName, + dwLength, + &dwLength)) + { + DPRINT1("No valid string value\n"); + goto done; + } + + DPRINT("NewAccountName: '%S'\n", pszName); + + Status = SamOpenUser(DomainHandle, + USER_WRITE_ACCOUNT, + dwAccountRid, + &UserHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenUser() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + NameInfo.UserName.Length = wcslen(pszName) * sizeof(WCHAR); + NameInfo.UserName.MaximumLength = NameInfo.UserName.Length + sizeof(WCHAR); + NameInfo.UserName.Buffer = pszName; + NameInfo.FullName.Length = 0; + NameInfo.FullName.MaximumLength = 0; + NameInfo.FullName.Buffer = NULL; + + Status = SamSetInformationUser(UserHandle, + UserNameInformation, + (PVOID)&NameInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationUser() failed (Status: 0x%08lx)\n", Status); + } + +done: + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (pszName != NULL) + HeapFree(GetProcessHeap(), 0, pszName); +} + + +static +VOID +ApplyAccountSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName) +{ PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle = NULL; SAM_HANDLE ServerHandle = NULL; SAM_HANDLE DomainHandle = NULL; - SAM_HANDLE UserHandle = NULL; - USER_CONTROL_INFORMATION ControlInfo; - INT nValue; NTSTATUS Status; DPRINT("ApplyAccountSettings()\n"); @@ -1163,114 +1352,32 @@ ApplyAccountSettings( goto done; } -#if 0 - if (SetupFindFirstLineW(hSecurityInf, - pszSectionName, - L"LSAAnonymousNameLookup", - &InfContext)) - { - if (SetupGetIntField(&InfContext, 1, &nValue)) - { - if (nValue == 0) - { - } - else - { - } - - } - } -#endif - - if (SetupFindFirstLineW(hSecurityInf, - pszSectionName, - L"EnableAdminAccount", - &InfContext)) - { - if (SetupGetIntField(&InfContext, 1, &nValue)) - { - Status = SamOpenUser(DomainHandle, - USER_READ_ACCOUNT | USER_WRITE_ACCOUNT, - DOMAIN_USER_RID_ADMIN, - &UserHandle); - if (NT_SUCCESS(Status)) - { - Status = SamQueryInformationUser(UserHandle, - UserControlInformation, - (PVOID)&ControlInfo); - if (NT_SUCCESS(Status)) - { - if (nValue == 0) - { - ControlInfo.UserAccountControl |= USER_ACCOUNT_DISABLED; - } - else - { - ControlInfo.UserAccountControl &= ~USER_ACCOUNT_DISABLED; - } - - SamSetInformationUser(UserHandle, - UserControlInformation, - (PVOID)&ControlInfo); - } - - SamCloseHandle(UserHandle); - } - } - } - - if (SetupFindFirstLineW(hSecurityInf, - pszSectionName, - L"EnableGuestAccount", - &InfContext)) - { - if (SetupGetIntField(&InfContext, 1, &nValue)) - { - Status = SamOpenUser(DomainHandle, - USER_READ_ACCOUNT | USER_WRITE_ACCOUNT, - DOMAIN_USER_RID_GUEST, - &UserHandle); - if (NT_SUCCESS(Status)) - { - Status = SamQueryInformationUser(UserHandle, - UserControlInformation, - (PVOID)&ControlInfo); - if (NT_SUCCESS(Status)) - { - if (nValue == 0) - { - ControlInfo.UserAccountControl |= USER_ACCOUNT_DISABLED; - } - else - { - ControlInfo.UserAccountControl &= ~USER_ACCOUNT_DISABLED; - } - - SamSetInformationUser(UserHandle, - UserControlInformation, - (PVOID)&ControlInfo); - } - - SamCloseHandle(UserHandle); - } - } - } - -#if 0 - if (SetupFindFirstLineW(hSecurityInf, - pszSectionName, - L"NewAdministratorName", - &InfContext)) - { - } - - if (SetupFindFirstLineW(hSecurityInf, - pszSectionName, - L"NewGuestName", - &InfContext)) - { - } -#endif + SetLsaAnonymousNameLookup(hSecurityInf, + pszSectionName); + + EnableAccount(hSecurityInf, + pszSectionName, + L"EnableAdminAccount", + DomainHandle, + DOMAIN_USER_RID_ADMIN); + + EnableAccount(hSecurityInf, + pszSectionName, + L"EnableGuestAccount", + DomainHandle, + DOMAIN_USER_RID_GUEST); + + SetNewAccountName(hSecurityInf, + pszSectionName, + L"NewAdministratorName", + DomainHandle, + DOMAIN_USER_RID_ADMIN); + + SetNewAccountName(hSecurityInf, + pszSectionName, + L"NewGuestName", + DomainHandle, + DOMAIN_USER_RID_GUEST); done: if (DomainHandle != NULL)

3 years, 7 months

[reactos] 01/01: [INF] defltwk.inf: Reset NewGuestName to default value

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cddc57431f1ad29695063… commit cddc57431f1ad296950636c435d753754dcb88c2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 30 13:49:21 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 30 13:49:21 2021 +0100 [INF] defltwk.inf: Reset NewGuestName to default value --- media/inf/defltwk.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index e34f7f587c9..95b565096f1 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -24,7 +24,7 @@ LSAAnonymousNameLookup = 0 ;EnableAdminAccount = 0 EnableGuestAccount = 0 ;NewAdministratorName = -NewGuestName = Guestore +;NewGuestName = [Application Log] MaximumLogSize = 512

3 years, 7 months

[reactos] 01/01: [SYSSETUP][INF] Add account settings

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0edaeba452c21a7e8b3a3… commit 0edaeba452c21a7e8b3a3e157577303fe18f6da6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 30 09:38:00 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 30 09:38:00 2021 +0100 [SYSSETUP][INF] Add account settings - Add EnableAdminAccount and EnableGuestAccount options - Fix typo: TICKS_PER_SECOND --> TICKS_PER_MINUTE --- dll/win32/syssetup/security.c | 192 +++++++++++++++++++++++++++++++++++++++++- media/inf/defltsv.inf | 7 ++ media/inf/defltwk.inf | 7 ++ 3 files changed, 203 insertions(+), 3 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 4a2f0b41e29..834962298da 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -19,7 +19,7 @@ #include <debug.h> #define TICKS_PER_DAY -864000000000LL -#define TICKS_PER_SECOND -600000000LL +#define TICKS_PER_MINUTE -600000000LL /* FUNCTIONS ****************************************************************/ @@ -1055,7 +1055,7 @@ ApplyLockoutSettings( { if (nValue >= 0) { - LockoutInfo.LockoutObservationWindow.QuadPart = (LONGLONG)nValue * TICKS_PER_SECOND; + LockoutInfo.LockoutObservationWindow.QuadPart = (LONGLONG)nValue * TICKS_PER_MINUTE; } } } @@ -1073,7 +1073,7 @@ ApplyLockoutSettings( } else if ((nValue >= 0) && (nValue < 100000)) { - LockoutInfo.LockoutDuration.QuadPart = (LONGLONG)nValue * TICKS_PER_SECOND; + LockoutInfo.LockoutDuration.QuadPart = (LONGLONG)nValue * TICKS_PER_MINUTE; } } } @@ -1102,6 +1102,191 @@ done: } +static +VOID +ApplyAccountSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName) +{ + INFCONTEXT InfContext; + PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE UserHandle = NULL; + USER_CONTROL_INFORMATION ControlInfo; + INT nValue; + NTSTATUS Status; + + DPRINT("ApplyAccountSettings()\n"); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION | POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + DPRINT1("LsaOpenPolicy() failed (Status: 0x%08lx)\n", Status); + return; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&OrigInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaQueryInformationPolicy() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamConnect() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + OrigInfo->DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenDomain() failed (Status: 0x%08lx)\n", Status); + goto done; + } + +#if 0 + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"LSAAnonymousNameLookup", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == 0) + { + } + else + { + } + + } + } +#endif + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"EnableAdminAccount", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + Status = SamOpenUser(DomainHandle, + USER_READ_ACCOUNT | USER_WRITE_ACCOUNT, + DOMAIN_USER_RID_ADMIN, + &UserHandle); + if (NT_SUCCESS(Status)) + { + Status = SamQueryInformationUser(UserHandle, + UserControlInformation, + (PVOID)&ControlInfo); + if (NT_SUCCESS(Status)) + { + if (nValue == 0) + { + ControlInfo.UserAccountControl |= USER_ACCOUNT_DISABLED; + } + else + { + ControlInfo.UserAccountControl &= ~USER_ACCOUNT_DISABLED; + } + + SamSetInformationUser(UserHandle, + UserControlInformation, + (PVOID)&ControlInfo); + } + + SamCloseHandle(UserHandle); + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"EnableGuestAccount", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + Status = SamOpenUser(DomainHandle, + USER_READ_ACCOUNT | USER_WRITE_ACCOUNT, + DOMAIN_USER_RID_GUEST, + &UserHandle); + if (NT_SUCCESS(Status)) + { + Status = SamQueryInformationUser(UserHandle, + UserControlInformation, + (PVOID)&ControlInfo); + if (NT_SUCCESS(Status)) + { + if (nValue == 0) + { + ControlInfo.UserAccountControl |= USER_ACCOUNT_DISABLED; + } + else + { + ControlInfo.UserAccountControl &= ~USER_ACCOUNT_DISABLED; + } + + SamSetInformationUser(UserHandle, + UserControlInformation, + (PVOID)&ControlInfo); + } + + SamCloseHandle(UserHandle); + } + } + } + +#if 0 + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"NewAdministratorName", + &InfContext)) + { + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"NewGuestName", + &InfContext)) + { + } +#endif + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + if (OrigInfo != NULL) + LsaFreeMemory(OrigInfo); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); +} + + static VOID ApplyAuditEvents( @@ -1270,6 +1455,7 @@ InstallSecurity(VOID) ApplyPasswordSettings(hSecurityInf, L"System Access"); ApplyLockoutSettings(hSecurityInf, L"System Access"); + ApplyAccountSettings(hSecurityInf, L"System Access"); ApplyAuditEvents(hSecurityInf); diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf index 8aba23b7a60..e96497d06d5 100644 --- a/media/inf/defltsv.inf +++ b/media/inf/defltsv.inf @@ -19,6 +19,13 @@ LockoutBadCount = 0 ;ResetLockoutCount = 30 ;LockoutDuration = 30 +; Account Options +LSAAnonymousLookup = 0 +;EnableAdminAccount = 0 +EnableGuestAccount = 0 +;NewAdministratorName = +;NewGuestName = + [Application Log] MaximumLogSize = 16384 AuditLogRetentionPeriod = 0 diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 2996a6d94ed..e34f7f587c9 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -19,6 +19,13 @@ LockoutBadCount = 0 ;ResetLockoutCount = 30 ;LockoutDuration = 30 +; Account Options +LSAAnonymousNameLookup = 0 +;EnableAdminAccount = 0 +EnableGuestAccount = 0 +;NewAdministratorName = +NewGuestName = Guestore + [Application Log] MaximumLogSize = 512 AuditLogRetentionPeriod = 1

3 years, 7 months

[reactos] 01/01: [RTL] Implement RtlTryAcquireSRWLockExclusive & RtlTryAcquireSRWLockShared

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a4c6ea5d03dd304d3b7f… commit 6a4c6ea5d03dd304d3b7f3de59b19bb4c8f1420a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 29 18:41:38 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 29 18:42:54 2021 +0100 [RTL] Implement RtlTryAcquireSRWLockExclusive & RtlTryAcquireSRWLockShared --- sdk/include/ndk/rtlfuncs.h | 43 +++++++++++++++++++++++++++++++++++++++++++ sdk/lib/rtl/srw.c | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index c2a823f17f6..7817278a17f 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -4888,6 +4888,49 @@ RtlGetNativeSystemInformation( _Out_opt_ PULONG ReturnLength ); +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (defined(__REACTOS__) && defined(_NTDLLBUILD_)) +/* Put NTSYSAPI back when this will be really exported. Only statically linked for now */ +// NTSYSAPI +VOID +NTAPI +RtlInitializeSRWLock(OUT PRTL_SRWLOCK SRWLock); + +// NTSYSAPI +VOID +NTAPI +RtlAcquireSRWLockShared(IN OUT PRTL_SRWLOCK SRWLock); + +// NTSYSAPI +VOID +NTAPI +RtlAcquireSRWLockExclusive(IN OUT PRTL_SRWLOCK SRWLock); + +// NTSYSAPI +VOID +NTAPI +RtlReleaseSRWLockShared(IN OUT PRTL_SRWLOCK SRWLock); + +// NTSYSAPI +VOID +NTAPI +RtlReleaseSRWLockExclusive(IN OUT PRTL_SRWLOCK SRWLock); + +#endif /* Win vista or Reactos Ntdll build */ + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) || (defined(__REACTOS__) && defined(_NTDLLBUILD_)) + +// NTSYSAPI +BOOLEAN +NTAPI +RtlTryAcquireSRWLockShared(PRTL_SRWLOCK SRWLock); + +// NTSYSAPI +BOOLEAN +NTAPI +RtlTryAcquireSRWLockExclusive(PRTL_SRWLOCK SRWLock); + +#endif /* Win7 or Reactos Ntdll build */ + #endif // NTOS_MODE_USER NTSYSAPI diff --git a/sdk/lib/rtl/srw.c b/sdk/lib/rtl/srw.c index 31730174888..8b5b47ce59f 100644 --- a/sdk/lib/rtl/srw.c +++ b/sdk/lib/rtl/srw.c @@ -25,21 +25,23 @@ #define InterlockedAddPointer(ptr,val) InterlockedAdd64((PLONGLONG)ptr,(LONGLONG)val) #define InterlockedAndPointer(ptr,val) InterlockedAnd64((PLONGLONG)ptr,(LONGLONG)val) #define InterlockedOrPointer(ptr,val) InterlockedOr64((PLONGLONG)ptr,(LONGLONG)val) +#define _ONE 1LL #else #define InterlockedBitTestAndSetPointer(ptr,val) InterlockedBitTestAndSet((PLONG)ptr,(LONG)val) #define InterlockedAddPointer(ptr,val) InterlockedAdd((PLONG)ptr,(LONG)val) #define InterlockedAndPointer(ptr,val) InterlockedAnd((PLONG)ptr,(LONG)val) #define InterlockedOrPointer(ptr,val) InterlockedOr((PLONG)ptr,(LONG)val) +#define _ONE 1L #endif #define RTL_SRWLOCK_OWNED_BIT 0 #define RTL_SRWLOCK_CONTENDED_BIT 1 #define RTL_SRWLOCK_SHARED_BIT 2 #define RTL_SRWLOCK_CONTENTION_LOCK_BIT 3 -#define RTL_SRWLOCK_OWNED (1 << RTL_SRWLOCK_OWNED_BIT) -#define RTL_SRWLOCK_CONTENDED (1 << RTL_SRWLOCK_CONTENDED_BIT) -#define RTL_SRWLOCK_SHARED (1 << RTL_SRWLOCK_SHARED_BIT) -#define RTL_SRWLOCK_CONTENTION_LOCK (1 << RTL_SRWLOCK_CONTENTION_LOCK_BIT) +#define RTL_SRWLOCK_OWNED (_ONE << RTL_SRWLOCK_OWNED_BIT) +#define RTL_SRWLOCK_CONTENDED (_ONE << RTL_SRWLOCK_CONTENDED_BIT) +#define RTL_SRWLOCK_SHARED (_ONE << RTL_SRWLOCK_SHARED_BIT) +#define RTL_SRWLOCK_CONTENTION_LOCK (_ONE << RTL_SRWLOCK_CONTENTION_LOCK_BIT) #define RTL_SRWLOCK_MASK (RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED | \ RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENTION_LOCK) #define RTL_SRWLOCK_BITS 4 @@ -763,3 +765,31 @@ RtlReleaseSRWLockExclusive(IN OUT PRTL_SRWLOCK SRWLock) YieldProcessor(); } } + +BOOLEAN +NTAPI +RtlTryAcquireSRWLockShared(PRTL_SRWLOCK SRWLock) +{ + + LONG_PTR CompareValue, NewValue, GotValue; + + do + { + CompareValue = *(volatile LONG_PTR *)&SRWLock->Ptr; + NewValue = ((CompareValue >> RTL_SRWLOCK_BITS) + 1) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; + + /* Only increment shared count if there is no waiter */ + CompareValue &= ~RTL_SRWLOCK_MASK | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; + } while ( + ((GotValue = (LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, (LONG_PTR*)NewValue, (LONG_PTR*)CompareValue)) != CompareValue) + && (((GotValue & RTL_SRWLOCK_MASK) == (RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED)) || (GotValue == 0))); + + return ((GotValue & RTL_SRWLOCK_MASK) == (RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED)) || (GotValue == 0); +} + +BOOLEAN +NTAPI +RtlTryAcquireSRWLockExclusive(PRTL_SRWLOCK SRWLock) +{ + return InterlockedCompareExchangePointer(&SRWLock->Ptr, (ULONG_PTR*)(ULONG_PTR)RTL_SRWLOCK_SHARED, 0) == 0; +}

3 years, 7 months

[reactos] 01/01: [RTL] Do not mess with critical section lock when there is no reason to.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2486558ae1d15e878e2df… commit 2486558ae1d15e878e2df4d067858a710f168580 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 29 18:15:17 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 29 18:18:09 2021 +0100 [RTL] Do not mess with critical section lock when there is no reason to. - When process is shutting down. - When the caller is so drunk that they leave twice the pub altough they entered it only once. --- sdk/lib/rtl/critical.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index c9b9c68ff6d..0911a8ce76f 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -114,12 +114,6 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) EXCEPTION_RECORD ExceptionRecord; BOOLEAN LastChance = FALSE; - /* Do we have an Event yet? */ - if (!CriticalSection->LockSemaphore) - { - RtlpCreateCriticalSectionSem(CriticalSection); - } - /* Increase the Debug Entry count */ DPRINT("Waiting on Critical Section Event: %p %p\n", CriticalSection, @@ -136,10 +130,15 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) LdrpShutdownThreadId == NtCurrentTeb()->RealClientId.UniqueThread) { DPRINT("Forcing ownership of critical section %p\n", CriticalSection); - CriticalSection->LockCount = 0; return STATUS_SUCCESS; } + /* Do we have an Event yet? */ + if (!CriticalSection->LockSemaphore) + { + RtlpCreateCriticalSectionSem(CriticalSection); + } + for (;;) { /* Increase the number of times we've had contention */ @@ -715,9 +714,13 @@ RtlLeaveCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) */ if (--CriticalSection->RecursionCount) { + if (CriticalSection->RecursionCount < 0) + { + DPRINT1("CRITICAL SECTION MESS: Section %p is not acquired!\n", CriticalSection); + return STATUS_UNSUCCESSFUL; + } /* Someone still owns us, but we are free. This needs to be done atomically. */ InterlockedDecrement(&CriticalSection->LockCount); - } else {

3 years, 7 months

[reactos] 01/01: [RTL] Fix heap usage flags

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d697561f0ae70875858c… commit 6d697561f0ae70875858c808f14c20ab2602f6d5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jan 28 18:42:59 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 29 09:42:13 2021 +0100 [RTL] Fix heap usage flags - Use Heap->ForceFlags where needed - Use passed-in flags instead of the heap flags in some places - Do not recursively acquire the heap lock --- sdk/lib/rtl/heap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index a75c18f5d2a..2eba86e046e 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -2681,7 +2681,8 @@ RtlReAllocateHeap(HANDLE HeapPtr, { RtlEnterHeapLock(Heap->LockVariable, TRUE); HeapLocked = TRUE; - Flags &= ~HEAP_NO_SERIALIZE; + /* Do not acquire the lock anymore for re-entrant call */ + Flags |= HEAP_NO_SERIALIZE; } /* Get the pointer to the in-use entry */ @@ -3656,7 +3657,7 @@ BOOLEAN NTAPI RtlValidateHeap( } /* Force flags */ - Flags = Heap->ForceFlags; + Flags |= Heap->ForceFlags; /* Acquire the lock if necessary */ if (!(Flags & HEAP_NO_SERIALIZE)) @@ -3744,7 +3745,7 @@ RtlSetUserValueHeap(IN PVOID HeapHandle, BOOLEAN HeapLocked = FALSE, ValueSet = FALSE; /* Force flags */ - Flags |= Heap->Flags; + Flags |= Heap->ForceFlags; /* Call special heap */ if (RtlpHeapIsSpecial(Flags)) @@ -3806,14 +3807,14 @@ RtlSetUserFlagsHeap(IN PVOID HeapHandle, BOOLEAN HeapLocked = FALSE; /* Force flags */ - Flags |= Heap->Flags; + Flags |= Heap->ForceFlags; /* Call special heap */ if (RtlpHeapIsSpecial(Flags)) return RtlDebugSetUserFlagsHeap(Heap, Flags, BaseAddress, UserFlagsReset, UserFlagsSet); /* Lock if it's lockable */ - if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + if (!(Flags & HEAP_NO_SERIALIZE)) { RtlEnterHeapLock(Heap->LockVariable, TRUE); HeapLocked = TRUE; @@ -3862,14 +3863,14 @@ RtlGetUserInfoHeap(IN PVOID HeapHandle, BOOLEAN HeapLocked = FALSE; /* Force flags */ - Flags |= Heap->Flags; + Flags |= Heap->ForceFlags; /* Call special heap */ if (RtlpHeapIsSpecial(Flags)) return RtlDebugGetUserInfoHeap(Heap, Flags, BaseAddress, UserValue, UserFlags); /* Lock if it's lockable */ - if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + if (!(Flags & HEAP_NO_SERIALIZE)) { RtlEnterHeapLock(Heap->LockVariable, TRUE); HeapLocked = TRUE;

3 years, 7 months

[reactos] 01/01: [SDK x64] Fix MSVC x64 compilation after 5d7dd4a3b5cd7927f110925f30ced6171249762f

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74df8af741590bd33375… commit d74df8af741590bd33375a6d128d090b91db323f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Jan 29 08:34:56 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Jan 29 08:36:04 2021 +0100 [SDK x64] Fix MSVC x64 compilation after 5d7dd4a3b5cd7927f110925f30ced6171249762f --- sdk/include/asm/trapamd64.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/include/asm/trapamd64.inc b/sdk/include/asm/trapamd64.inc index 6cf846907ab..d3772689938 100644 --- a/sdk/include/asm/trapamd64.inc +++ b/sdk/include/asm/trapamd64.inc @@ -156,9 +156,17 @@ MACRO(ExitTrap, Flags) /* Check previous irql */ mov rax, cr8 cmp [rbp + KTRAP_FRAME_PreviousIrql], al +#ifdef _USE_ML + je .irql_ok +#else je 1f +#endif int 3 +#ifdef _USE_ML + .irql_ok: +#else 1: +#endif #endif if (Flags AND TF_SEGMENTS)

3 years, 7 months

[reactos] 01/01: [FREELDR] Fix MSVC x64 compilation after d2f73877b7695aa0a51c3b403dd659f458d5aa90

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db35a7861f6cb2ff669a8… commit db35a7861f6cb2ff669a8b47ee32a49f3dcc133d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Jan 29 07:45:13 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Jan 29 07:46:13 2021 +0100 [FREELDR] Fix MSVC x64 compilation after d2f73877b7695aa0a51c3b403dd659f458d5aa90 --- boot/freeldr/freeldr/arch/amd64/entry.S | 8 ++++++++ boot/freeldr/freeldr/arch/realmode/amd64.S | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index a0149ef9daf..758eae4b677 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -222,7 +222,11 @@ __fastfail: // void __lgdt(void *Source<rcx>); PUBLIC __lgdt __lgdt: +#ifdef _USE_ML + lgdt fword ptr [rcx] +#else lgdt cs:[rcx] +#endif ret // void __ltr(unsigned short Source<rcx>); @@ -234,7 +238,11 @@ __ltr: // void _sgdt(void *Destination<rcx>); PUBLIC __sgdt __sgdt: +#ifdef _USE_ML + sgdt fword ptr [rcx] +#else sgdt cs:[rcx] +#endif ret diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index 393b3f43016..c07110c2c0e 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -67,7 +67,11 @@ Msg_LongModeSupported: call writestr /* Load the GDT */ +#ifdef _USE_ML + lgdt fword ptr [gdtptr] +#else lgdt cs:[gdtptr] +#endif /* Build the startup page tables */ call BuildPageTables

3 years, 7 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 January 2021