Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/09: [BOOTDATA] Don't remove critical device DB for the setup
by Victor Perevertkin 27 Jan '21

27 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=942f2e43c1300d2ca7f68… commit 942f2e43c1300d2ca7f682b821e59e0ff2003a47 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Dec 10 03:03:54 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jan 27 05:15:14 2021 +0300 [BOOTDATA] Don't remove critical device DB for the setup We need the CDDB during the setup, so don't delete it for now. The "proper" way for filling it is yet to be decided, Windows does that from the data in txtsetup.sif file. Our final approach may be different --- boot/bootdata/setupreg.inf | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf index ed841fdd044..e7c50e0c201 100644 --- a/boot/bootdata/setupreg.inf +++ b/boot/bootdata/setupreg.inf @@ -1,44 +1,4 @@ [Version] Signature = "$Windows NT$" -[DelReg] - -; Critical Device Database -;; -;; WARNING! Keep it in sync with hivesys.inf -;; - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A08" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_KEYBOARD" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0303" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F0E" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F19" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PS2_MOUSE" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F13" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*IBM3780" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F12" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F03" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\ROOT#SWENUM" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase" - ; EOF

1 0

[reactos] 01/09: [DEVMGR] Remove no longer needed hack CORE-5643
by Victor Perevertkin 27 Jan '21

27 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b816918063b87a17b00b… commit 0b816918063b87a17b00b536f262baf97ea67076 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Dec 10 01:20:27 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jan 27 05:15:03 2021 +0300 [DEVMGR] Remove no longer needed hack CORE-5643 This reverts commit f9739601b380b9bd8ab43d8fa87c940c65517d94. --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 8a59b6ef85e..1bb0fab7dee 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -1203,11 +1203,6 @@ CDeviceView::RefreshDeviceList() // create a new device node and add it to the list DeviceNode = new CDeviceNode(DeviceInfoData.DevInst, &m_ImageListData); - /* FIXME: Start of Hack for CORE-5643 */ - if (!DeviceNode->IsInstalled()) - continue; - /* FIXME: End of Hack for CORE-5643 */ - if (DeviceNode->SetupNode()) { m_DeviceNodeList.AddTail(DeviceNode);

1 0

[reactos] 01/01: [SYSSETUP][INF] Add lockout setup to the security profile
by Eric Kohl 24 Jan '21

24 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0caa5c0aeed5f20b4af1… commit c0caa5c0aeed5f20b4af12f1fdcd46f1db6db0d2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 24 21:35:33 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 24 21:35:33 2021 +0100 [SYSSETUP][INF] Add lockout setup to the security profile --- dll/win32/syssetup/security.c | 141 ++++++++++++++++++++++++++++++++++++++++++ media/inf/defltsv.inf | 6 ++ media/inf/defltwk.inf | 6 ++ 3 files changed, 153 insertions(+) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index d92c201831d..4a2f0b41e29 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -19,6 +19,7 @@ #include <debug.h> #define TICKS_PER_DAY -864000000000LL +#define TICKS_PER_SECOND -600000000LL /* FUNCTIONS ****************************************************************/ @@ -962,6 +963,145 @@ done: } +static +VOID +ApplyLockoutSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName) +{ + INFCONTEXT InfContext; + DOMAIN_LOCKOUT_INFORMATION LockoutInfo; + PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + INT nValue; + NTSTATUS Status; + + DPRINT("ApplyLockoutSettings()\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_READ_PASSWORD_PARAMETERS | DOMAIN_WRITE_PASSWORD_PARAMS, + OrigInfo->DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenDomain() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamQueryInformationDomain(DomainHandle, + DomainLockoutInformation, + (PVOID*)&LockoutInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamQueryInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"LockoutBadCount", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue >= 0) + { + LockoutInfo.LockoutThreshold = nValue; + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"ResetLockoutCount", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue >= 0) + { + LockoutInfo.LockoutObservationWindow.QuadPart = (LONGLONG)nValue * TICKS_PER_SECOND; + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"LockoutDuration", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == -1) + { + LockoutInfo.LockoutDuration.QuadPart = 0x8000000000000000LL; + } + else if ((nValue >= 0) && (nValue < 100000)) + { + LockoutInfo.LockoutDuration.QuadPart = (LONGLONG)nValue * TICKS_PER_SECOND; + } + } + } + + Status = SamSetInformationDomain(DomainHandle, + DomainLockoutInformation, + (PVOID*)&LockoutInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + if (OrigInfo != NULL) + LsaFreeMemory(OrigInfo); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); +} + + static VOID ApplyAuditEvents( @@ -1129,6 +1269,7 @@ InstallSecurity(VOID) ApplyEventlogSettings(hSecurityInf, L"System Log", L"System"); ApplyPasswordSettings(hSecurityInf, L"System Access"); + ApplyLockoutSettings(hSecurityInf, L"System Access"); ApplyAuditEvents(hSecurityInf); diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf index ce3b7d78ba6..8aba23b7a60 100644 --- a/media/inf/defltsv.inf +++ b/media/inf/defltsv.inf @@ -5,6 +5,7 @@ Signature = "$Windows NT$" [System Access] +; Password Options MinimumPasswordAge = 0 MaximumPasswordAge = 42 MinimumPasswordLength = 0 @@ -13,6 +14,11 @@ PasswordHistorySize = 0 RequireLogonToChangePassword = 0 ClearTextPassword = 0 +; Lockout Options +LockoutBadCount = 0 +;ResetLockoutCount = 30 +;LockoutDuration = 30 + [Application Log] MaximumLogSize = 16384 AuditLogRetentionPeriod = 0 diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 020b59c4d26..2996a6d94ed 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -5,6 +5,7 @@ Signature = "$Windows NT$" [System Access] +; Password Options MinimumPasswordAge = 0 MaximumPasswordAge = 42 MinimumPasswordLength = 0 @@ -13,6 +14,11 @@ PasswordHistorySize = 0 RequireLogonToChangePassword = 0 ClearTextPassword = 0 +; Lockout Options +LockoutBadCount = 0 +;ResetLockoutCount = 30 +;LockoutDuration = 30 + [Application Log] MaximumLogSize = 512 AuditLogRetentionPeriod = 1

1 0

[reactos] 01/01: [SYSSETUP][INF] Add password setup to the security profile
by Eric Kohl 24 Jan '21

24 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83f3bd8bd646c73ed99d3… commit 83f3bd8bd646c73ed99d3b6595b2d54e7c5ae543 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 24 15:28:23 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 24 15:28:23 2021 +0100 [SYSSETUP][INF] Add password setup to the security profile --- dll/win32/syssetup/security.c | 208 ++++++++++++++++++++++++++++++++++++++++++ media/inf/defltsv.inf | 9 ++ media/inf/defltwk.inf | 11 ++- 3 files changed, 227 insertions(+), 1 deletion(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index ff2c329dc2e..d92c201831d 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -18,6 +18,8 @@ #define NDEBUG #include <debug.h> +#define TICKS_PER_DAY -864000000000LL + /* FUNCTIONS ****************************************************************/ NTSTATUS @@ -756,6 +758,210 @@ ApplyEventlogSettings( } +static +VOID +ApplyPasswordSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName) +{ + INFCONTEXT InfContext; + DOMAIN_PASSWORD_INFORMATION PasswordInfo; + PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + INT nValue; + NTSTATUS Status; + + DPRINT("ApplyPasswordSettings()\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_READ_PASSWORD_PARAMETERS | DOMAIN_WRITE_PASSWORD_PARAMS, + OrigInfo->DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenDomain() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamQueryInformationDomain(DomainHandle, + DomainPasswordInformation, + (PVOID*)&PasswordInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamQueryInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + + DPRINT("MaximumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo.MaxPasswordAge.QuadPart); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MaximumPasswordAge", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Value: %ld\n", nValue); + if (nValue == -1) + { + PasswordInfo.MaxPasswordAge.QuadPart = 0x8000000000000000; + } + else if ((nValue >= 1) && (nValue < 1000)) + { + PasswordInfo.MaxPasswordAge.QuadPart = (LONGLONG)nValue * TICKS_PER_DAY; + } + DPRINT("MaximumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo.MaxPasswordAge.QuadPart); + } + } + + DPRINT("MinimumPasswordAge (OldValue) : 0x%I64x\n", PasswordInfo.MinPasswordAge.QuadPart); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MinimumPasswordAge", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + 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; + } + DPRINT("MinimumPasswordAge (NewValue) : 0x%I64x\n", PasswordInfo.MinPasswordAge.QuadPart); + } + } + + DPRINT("MinimumPasswordLength (OldValue) : %lu\n", PasswordInfo.MinPasswordLength); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MinimumPasswordLength", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Value: %ld\n", nValue); + if ((nValue >= 0) && (nValue <= 65535)) + { + PasswordInfo.MinPasswordLength = nValue; + } + DPRINT("MinimumPasswordLength (NewValue) : %lu\n", PasswordInfo.MinPasswordLength); + } + } + + DPRINT("PasswordHistoryLength (OldValue) : %lu\n", PasswordInfo.PasswordHistoryLength); + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"PasswordHistorySize", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + DPRINT("Value: %ld\n", nValue); + if ((nValue >= 0) && (nValue <= 65535)) + { + PasswordInfo.PasswordHistoryLength = nValue; + } + DPRINT("PasswordHistoryLength (NewValue) : %lu\n", PasswordInfo.PasswordHistoryLength); + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"PasswordComplexity", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == 0) + { + PasswordInfo.PasswordProperties &= ~DOMAIN_PASSWORD_COMPLEX; + } + else + { + PasswordInfo.PasswordProperties |= DOMAIN_PASSWORD_COMPLEX; + } + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"ClearTextPassword", + &InfContext)) + { + if (SetupGetIntField(&InfContext, 1, &nValue)) + { + if (nValue == 0) + { + PasswordInfo.PasswordProperties &= ~DOMAIN_PASSWORD_STORE_CLEARTEXT; + } + else + { + PasswordInfo.PasswordProperties |= DOMAIN_PASSWORD_STORE_CLEARTEXT; + } + } + } + + /* Windows ignores the RequireLogonToChangePassword option */ + + Status = SamSetInformationDomain(DomainHandle, + DomainPasswordInformation, + (PVOID*)&PasswordInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationDomain() failed (Status %08lx)\n", Status); + goto done; + } + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + if (OrigInfo != NULL) + LsaFreeMemory(OrigInfo); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); +} + + static VOID ApplyAuditEvents( @@ -922,6 +1128,8 @@ InstallSecurity(VOID) ApplyEventlogSettings(hSecurityInf, L"Security Log", L"Security"); ApplyEventlogSettings(hSecurityInf, L"System Log", L"System"); + ApplyPasswordSettings(hSecurityInf, L"System Access"); + ApplyAuditEvents(hSecurityInf); SetupCloseInfFile(hSecurityInf); diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf index d64c30d339a..ce3b7d78ba6 100644 --- a/media/inf/defltsv.inf +++ b/media/inf/defltsv.inf @@ -4,6 +4,15 @@ [Version] Signature = "$Windows NT$" +[System Access] +MinimumPasswordAge = 0 +MaximumPasswordAge = 42 +MinimumPasswordLength = 0 +PasswordComplexity = 0 +PasswordHistorySize = 0 +RequireLogonToChangePassword = 0 +ClearTextPassword = 0 + [Application Log] MaximumLogSize = 16384 AuditLogRetentionPeriod = 0 diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 540edd39416..020b59c4d26 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -4,6 +4,15 @@ [Version] Signature = "$Windows NT$" +[System Access] +MinimumPasswordAge = 0 +MaximumPasswordAge = 42 +MinimumPasswordLength = 0 +PasswordComplexity = 0 +PasswordHistorySize = 0 +RequireLogonToChangePassword = 0 +ClearTextPassword = 0 + [Application Log] MaximumLogSize = 512 AuditLogRetentionPeriod = 1 @@ -38,8 +47,8 @@ SeAuditPrivilege = *S-1-5-19, *S-1-5-20 SeBackupPrivilege = *S-1-5-32-544, *S-1-5-32-551 SeBatchLogonRight = SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-551 -SeCreatePagefilePrivilege = *S-1-5-32-544 SeCreateGlobalPrivilege = *S-1-5-4, *S-1-5-6, *S-1-5-32-544 +SeCreatePagefilePrivilege = *S-1-5-32-544 SeCreatePermanentPrivilege = SeCreateTokenPrivilege = SeDebugPrivilege = *S-1-5-32-544

1 0

[reactos] 01/01: [NTOS:MM] Fix compilation for amd64 port.
by Jérôme Gardou 22 Jan '21

22 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f63401060d2de91f68816… commit f63401060d2de91f68816fe5c8a15ee4e48b6573 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 22 10:34:20 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 22 10:34:20 2021 +0100 [NTOS:MM] Fix compilation for amd64 port. Addendum to 0919324772d288d2ae54df460b97c4577cf7e812 --- ntoskrnl/mm/amd64/page.c | 55 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index 6b311fb34da..90a5d74b3b2 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -125,11 +125,11 @@ MiIsHyperspaceAddress(PVOID Address) } VOID -MiFlushTlb(PMMPTE Pte, PVOID Address) +MiFlushTlb(PMMPTE Pte, PVOID Address, KIRQL OldIrql) { if (MiIsHyperspaceAddress(Pte)) { - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); } else { @@ -142,16 +142,20 @@ PMMPTE MiGetPteForProcess( PEPROCESS Process, PVOID Address, - BOOLEAN Create) + BOOLEAN Create, + PKIRQL OldIrql +) { PMMPTE Pte; PMMPDE Pde; PMMPPE Ppe; PMMPXE Pxe; + *OldIrql = 0; /* Make sure the process is correct */ if (Address < MmSystemRangeStart) { + /* FIXME: Implement this case */ ASSERT(Process == PsGetCurrentProcess()); } else @@ -213,12 +217,13 @@ MiGetPteValueForProcess( { PMMPTE Pte; ULONG64 PteValue; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); PteValue = Pte ? Pte->u.Long : 0; if (MiIsHyperspaceAddress(Pte)) - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); return PteValue; } @@ -303,7 +308,7 @@ MmIsDisabledPage(PEPROCESS Process, PVOID Address) MMPTE Pte; Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return (Pte.u.Hard.Valid == 0) && + return (Pte.u.Hard.Valid == 0) && (Pte.u.Trans.Transition == 0) && (Pte.u.Hard.PageFrameNumber != 0); } @@ -358,8 +363,9 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) { PMMPTE Pte; MMPTE NewPte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); ASSERT(Pte != NULL); NewPte = *Pte; @@ -368,7 +374,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) InterlockedExchangePte(Pte, NewPte); - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -376,8 +382,9 @@ NTAPI MmSetCleanPage(PEPROCESS Process, PVOID Address) { PMMPTE Pte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (!Pte) { KeBugCheckEx(MEMORY_MANAGEMENT, 0x1234, (ULONG64)Address, 0, 0); @@ -390,7 +397,7 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) __invlpg(Address); } - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -398,8 +405,9 @@ NTAPI MmSetDirtyPage(PEPROCESS Process, PVOID Address) { PMMPTE Pte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (!Pte) { KeBugCheckEx(MEMORY_MANAGEMENT, 0x1234, (ULONG64)Address, 0, 0); @@ -412,7 +420,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) __invlpg(Address); } - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -426,8 +434,9 @@ MmDeleteVirtualMapping( PFN_NUMBER Pfn; PMMPTE Pte; MMPTE OldPte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (Pte) { @@ -454,7 +463,7 @@ MmDeleteVirtualMapping( if (Page) *Page = Pfn; - MiFlushTlb(Pte, Address); + MiFlushTlb(Pte, Address, OldIrql); } VOID @@ -463,8 +472,9 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY* SwapEntry) { PMMPTE Pte; + KIRQL OldIrql; - Pte = MiGetPteForProcess(Process, Address, FALSE); + Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); if (Pte == NULL) { *SwapEntry = 0; @@ -479,6 +489,9 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, *SwapEntry = Pte->u.Long >> 1; MI_ERASE_PTE(Pte); + + if (MiIsHyperspaceAddress(Pte)) + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); } NTSTATUS @@ -489,6 +502,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { PMMPTE Pte; MMPTE PteValue; + KIRQL OldIrql; if (Process == NULL && Address < MmSystemRangeStart) { @@ -507,7 +521,7 @@ MmCreatePageFileMapping(PEPROCESS Process, } /* Allocate a PTE */ - Pte = MiGetPteForProcess(Process, Address, TRUE); + Pte = MiGetPteForProcess(Process, Address, TRUE, &OldIrql); if (Pte == NULL) { return STATUS_UNSUCCESSFUL; @@ -517,6 +531,9 @@ MmCreatePageFileMapping(PEPROCESS Process, PteValue.u.Long = SwapEntry << 1; MI_WRITE_INVALID_PTE(Pte, PteValue); + if (MiIsHyperspaceAddress(Pte)) + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); + return STATUS_UNSUCCESSFUL; } @@ -553,9 +570,11 @@ MmCreateVirtualMappingUnsafe( for (i = 0; i < PageCount; i++) { + KIRQL OldIrql; + TmplPte.u.Hard.PageFrameNumber = Pages[i]; - Pte = MiGetPteForProcess(Process, Address, TRUE); + Pte = MiGetPteForProcess(Process, Address, TRUE, &OldIrql); DPRINT("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", Address, TmplPte.u.Long, Pte); @@ -566,7 +585,7 @@ DPRINT("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", } if (MiIsHyperspaceAddress(Pte)) - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); Address = (PVOID)((ULONG64)Address + PAGE_SIZE); }

1 0

[reactos] 02/02: [NTOS:MM] Get rid of "compatibility layer" for hyper space mappings
by Jérôme Gardou 22 Jan '21

22 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0919324772d288d2ae54d… commit 0919324772d288d2ae54df460b97c4577cf7e812 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 29 19:15:04 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 22 09:33:06 2021 +0100 [NTOS:MM] Get rid of "compatibility layer" for hyper space mappings Let's call that a bug layer instead. --- ntoskrnl/include/internal/mm.h | 17 ---------- ntoskrnl/mm/ARM3/hypermap.c | 2 -- ntoskrnl/mm/i386/page.c | 77 +++++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 53 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index e34f2fbb856..d1754ec4f5c 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -993,10 +993,6 @@ MmZeroPageThread( ); /* hypermap.c *****************************************************************/ - -extern PEPROCESS HyperProcess; -extern KIRQL HyperIrql; - PVOID NTAPI MiMapPageInHyperSpace(IN PEPROCESS Process, @@ -1019,19 +1015,6 @@ NTAPI MiUnmapPagesInZeroSpace(IN PVOID VirtualAddress, IN PFN_NUMBER NumberOfPages); -// -// ReactOS Compatibility Layer -// -FORCEINLINE -PVOID -MmCreateHyperspaceMapping(IN PFN_NUMBER Page) -{ - HyperProcess = (PEPROCESS)KeGetCurrentThread()->ApcState.Process; - return MiMapPageInHyperSpace(HyperProcess, Page, &HyperIrql); -} - -#define MmDeleteHyperspaceMapping(x) MiUnmapPageInHyperSpace(HyperProcess, x, HyperIrql); - /* i386/page.c *********************************************************/ NTSTATUS diff --git a/ntoskrnl/mm/ARM3/hypermap.c b/ntoskrnl/mm/ARM3/hypermap.c index 6f7c32aa45e..4113814e6a6 100644 --- a/ntoskrnl/mm/ARM3/hypermap.c +++ b/ntoskrnl/mm/ARM3/hypermap.c @@ -20,8 +20,6 @@ PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; PMMPTE MiFirstReservedZeroingPte; MMPTE HyperTemplatePte; -PEPROCESS HyperProcess; -KIRQL HyperIrql; /* PRIVATE FUNCTIONS **********************************************************/ diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 83c52423d5a..bcc2be911b1 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -134,12 +134,12 @@ ULONG MmProtectToValue[32] = /* FUNCTIONS ***************************************************************/ -static BOOLEAN MmUnmapPageTable(PULONG Pt); +static BOOLEAN MmUnmapPageTable(PULONG Pt, KIRQL OldIrql); VOID -MiFlushTlb(PULONG Pt, PVOID Address) +MiFlushTlb(PULONG Pt, PVOID Address, KIRQL OldIrql) { - if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) + if ((Pt && MmUnmapPageTable(Pt, OldIrql)) || Address >= MmSystemRangeStart) { KeInvalidateTlbEntry(Address); } @@ -203,7 +203,7 @@ MiFillSystemPageDirectory(IN PVOID Base, IN SIZE_T NumberOfBytes); static PULONG -MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) +MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create, PKIRQL OldIrql) { PFN_NUMBER Pfn; PULONG Pt; @@ -219,7 +219,9 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) PMMPDE PdeBase; ULONG PdeOffset = MiGetPdeOffset(Address); - PdeBase = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + PdeBase = MiMapPageInHyperSpace(PsGetCurrentProcess(), + PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0]), + OldIrql); if (PdeBase == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -232,7 +234,7 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) if (!Create) { - MmDeleteHyperspaceMapping(PdeBase); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PdeBase, *OldIrql); return NULL; } @@ -253,8 +255,8 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) } Pfn = PointerPde->u.Hard.PageFrameNumber; - MmDeleteHyperspaceMapping(PdeBase); - Pt = MmCreateHyperspaceMapping(Pfn); + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PdeBase, *OldIrql); + Pt = MiMapPageInHyperSpace(PsGetCurrentProcess(), Pfn, OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -308,17 +310,15 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) return Pt; } -static BOOLEAN MmUnmapPageTable(PULONG Pt) +static BOOLEAN MmUnmapPageTable(PULONG Pt, KIRQL OldIrql) { if (!IS_HYPERSPACE(Pt)) { return TRUE; } - if (Pt) - { - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pt)); - } + MiUnmapPageInHyperSpace(PsGetCurrentProcess(), Pt, OldIrql); + return FALSE; } @@ -326,12 +326,13 @@ static ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) { ULONG Pte; PULONG Pt; + KIRQL OldIrql; - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt) { Pte = *Pt; - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); return Pte; } return 0; @@ -363,11 +364,12 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, PFN_NUMBER Pfn; ULONG Pte; PULONG Pt; + KIRQL OldIrql; DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", Process, Address, WasDirty, Page); - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { @@ -395,7 +397,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, /* Flush the TLB since we transitioned this PTE * from valid to invalid so any stale translations * are removed from the cache */ - MiFlushTlb(Pt, Address); + MiFlushTlb(Pt, Address, OldIrql); if (Address < MmSystemRangeStart) { @@ -408,7 +410,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, } else { - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); Pfn = 0; } @@ -447,8 +449,9 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, { ULONG Pte; PULONG Pt; + KIRQL OldIrql; - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { @@ -470,7 +473,7 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, /* We don't need to flush here because page file entries * are invalid translations, so the processor won't cache them */ - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); if ((Pte & PA_PRESENT) || !(Pte & 0x800)) { @@ -512,6 +515,7 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) { PULONG Pt; ULONG Pte; + KIRQL OldIrql; if (Address < MmSystemRangeStart && Process == NULL) { @@ -519,7 +523,7 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -536,11 +540,11 @@ MmSetCleanPage(PEPROCESS Process, PVOID Address) } else if (Pte & PA_DIRTY) { - MiFlushTlb(Pt, Address); + MiFlushTlb(Pt, Address, OldIrql); } else { - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); } } @@ -550,6 +554,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) { PULONG Pt; ULONG Pte; + KIRQL OldIrql; if (Address < MmSystemRangeStart && Process == NULL) { @@ -557,7 +562,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -576,7 +581,7 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) { /* The processor will never clear this bit itself, therefore * we do not need to flush the TLB here when setting it */ - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); } } @@ -612,6 +617,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { PULONG Pt; ULONG Pte; + KIRQL OldIrql; if (Process == NULL && Address < MmSystemRangeStart) { @@ -629,7 +635,7 @@ MmCreatePageFileMapping(PEPROCESS Process, KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { /* Nobody should page out an address that hasn't even been mapped */ @@ -638,7 +644,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, TRUE); + Pt = MmGetPageTableForProcess(Process, Address, TRUE, &OldIrql); } Pte = InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) @@ -656,7 +662,7 @@ MmCreatePageFileMapping(PEPROCESS Process, /* We don't need to flush the TLB here because it * only caches valid translations and a zero PTE * is not a valid translation */ - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); return(STATUS_SUCCESS); } @@ -676,6 +682,8 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, ULONG oldPdeOffset, PdeOffset; PULONG Pt = NULL; ULONG Pte; + KIRQL OldIrql; + DPRINT("MmCreateVirtualMappingUnsafe(%p, %p, %lu, %p (%x), %lu)\n", Process, Address, flProtect, Pages, *Pages, PageCount); @@ -738,8 +746,8 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, PdeOffset = ADDR_TO_PDE_OFFSET(Addr); if (oldPdeOffset != PdeOffset) { - if(Pt) MmUnmapPageTable(Pt); - Pt = MmGetPageTableForProcess(Process, Addr, TRUE); + if(Pt) MmUnmapPageTable(Pt, OldIrql); + Pt = MmGetPageTableForProcess(Process, Addr, TRUE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -772,7 +780,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, } ASSERT(Addr > Address); - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); return(STATUS_SUCCESS); } @@ -852,6 +860,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) ULONG Attributes = 0; PULONG Pt; ULONG Pte; + KIRQL OldIrql; DPRINT("MmSetPageProtect(Process %p Address %p flProtect %x)\n", Process, Address, flProtect); @@ -868,7 +877,7 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) Attributes |= PA_USER; } - Pt = MmGetPageTableForProcess(Process, Address, FALSE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -883,9 +892,9 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) } if((Pte & Attributes) != Attributes) - MiFlushTlb(Pt, Address); + MiFlushTlb(Pt, Address, OldIrql); else - MmUnmapPageTable(Pt); + MmUnmapPageTable(Pt, OldIrql); } CODE_SEG("INIT")

1 0

[reactos] 01/02: [NTOS:MM] Allow "creating" a PDE in legacy Mm for foreign process
by Jérôme Gardou 22 Jan '21

22 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57e8684bc60e9cf54105e… commit 57e8684bc60e9cf54105e0dcf6c3a13a621cde41 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 22 09:31:34 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Jan 22 09:32:36 2021 +0100 [NTOS:MM] Allow "creating" a PDE in legacy Mm for foreign process --- ntoskrnl/mm/i386/page.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 336e65a3c45..83c52423d5a 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -219,10 +219,6 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) PMMPDE PdeBase; ULONG PdeOffset = MiGetPdeOffset(Address); - /* Nobody but page fault should ask for creating the PDE, - * Which imples that Process is the current one */ - ASSERT(Create == FALSE); - PdeBase = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); if (PdeBase == NULL) { @@ -231,13 +227,32 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) PointerPde = PdeBase + PdeOffset; if (PointerPde->u.Hard.Valid == 0) { - MmDeleteHyperspaceMapping(PdeBase); - return NULL; - } - else - { - Pfn = PointerPde->u.Hard.PageFrameNumber; + KAPC_STATE ApcState; + NTSTATUS Status; + + if (!Create) + { + MmDeleteHyperspaceMapping(PdeBase); + return NULL; + } + + KeStackAttachProcess(&Process->Pcb, &ApcState); + + Status = MiDispatchFault(0x1, + MiAddressToPte(Address), + MiAddressToPde(Address), + NULL, + FALSE, + Process, + NULL, + NULL); + + KeUnstackDetachProcess(&ApcState); + if (!NT_SUCCESS(Status)) + return NULL; } + + Pfn = PointerPde->u.Hard.PageFrameNumber; MmDeleteHyperspaceMapping(PdeBase); Pt = MmCreateHyperspaceMapping(Pfn); if (Pt == NULL)

1 0

[reactos] 01/01: [MSVCRTEX] Do not include _CI* math functions
by Jérôme Gardou 22 Jan '21

22 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af3527d4d2e616a6da82f… commit af3527d4d2e616a6da82fcfe13734c9fd1239790 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jan 21 09:43:04 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Jan 21 09:43:43 2021 +0100 [MSVCRTEX] Do not include _CI* math functions They are exported by msvcrt CORE-17423 --- sdk/lib/crt/msvcrtex.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 06bab6a5021..a9ebe297330 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -50,13 +50,6 @@ if(ARCH STREQUAL "i386") except/i386/chkstk_asm.s except/i386/chkstk_ms.s math/i386/alldiv_asm.s) - list(APPEND MSVCRTEX_SOURCE - math/i386/ci.c - math/i386/cicos.c - math/i386/cilog.c - math/i386/cipow.c - math/i386/cisin.c - math/i386/cisqrt.c) if (GCC AND CLANG) # CLang performs some optimisations requiring those funtions list(APPEND MSVCRTEX_ASM_SOURCE

1 0

[reactos] 01/01: [SYSDM] Addendum CORE-17429
by Joachim Henze 20 Jan '21

20 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e289ce0cc93ca385e71b… commit 4e289ce0cc93ca385e71bd9ab224069dd86dce2d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 20 03:42:39 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 20 03:42:39 2021 +0100 [SYSDM] Addendum CORE-17429 This define in resource.h is also not needed anymore. --- dll/cpl/sysdm/resource.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 94744806b0a..20481bf2fa1 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -209,5 +209,3 @@ #define IDC_LICENCEEDIT 1501 #define RC_LICENSE 1502 #define RTDATA 1503 - -#define IDS_DEVS 2000

1 0

[reactos] 01/01: [SYSDM] Improve de-DE Uptime format translation
by Joachim Henze 20 Jan '21

20 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a0246ef650fb3dce0982… commit 9a0246ef650fb3dce09829a3f1201ca7f403b1f9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 20 03:16:07 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 20 03:16:07 2021 +0100 [SYSDM] Improve de-DE Uptime format translation I tried initially to use Tag(e) but that does look too crowded with the stuff after it. Since Windows is also not consistent with the () for singular vs plural, I did chose always plural "Tage". Most often people will see "0 Tage" anyway, and that fits well. --- dll/cpl/sysdm/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index aad3fc771e4..ec635f2e81e 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -319,7 +319,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%u Tage, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Wert" IDS_NO_DUMP "(Keine)"

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