Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/12: [NTOS:MM] Make MiCalculatePageCommitment 64-bits aware
by Jérôme Gardou 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a80ae8f2ea3e9500b4f6c… commit a80ae8f2ea3e9500b4f6c6215fb52d0c20ccddea Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue May 25 16:08:25 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 9 11:27:18 2021 +0200 [NTOS:MM] Make MiCalculatePageCommitment 64-bits aware --- ntoskrnl/mm/ARM3/virtual.c | 208 ++++++++++++++++++++------------------------- 1 file changed, 93 insertions(+), 115 deletions(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index ace22a19887..c8a24e08231 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -46,157 +46,135 @@ MiCalculatePageCommitment(IN ULONG_PTR StartingAddress, { PMMPTE PointerPte, LastPte; PMMPDE PointerPde; - ULONG CommittedPages; + BOOLEAN OnPdeBoundary = TRUE; +#if _MI_PAGING_LEVELS >= 3 + PMMPPE PointerPpe; + BOOLEAN OnPpeBoundary = TRUE; +#if _MI_PAGING_LEVELS == 4 + PMMPXE PointerPxe; + BOOLEAN OnPxeBoundary = TRUE; +#endif +#endif - /* Compute starting and ending PTE and PDE addresses */ - PointerPde = MiAddressToPde(StartingAddress); + /* Make sure this all makes sense */ + ASSERT(PsGetCurrentThread()->OwnsProcessWorkingSetExclusive || PsGetCurrentThread()->OwnsProcessWorkingSetShared); + ASSERT(EndingAddress >= StartingAddress); PointerPte = MiAddressToPte(StartingAddress); LastPte = MiAddressToPte(EndingAddress); - /* Handle commited pages first */ - if (Vad->u.VadFlags.MemCommit == 1) - { - /* This is a committed VAD, so Assume the whole range is committed */ - CommittedPages = (ULONG)BYTES_TO_PAGES(EndingAddress - StartingAddress); + /* + * In case this is a committed VAD, assume the whole range is committed + * and count the individually decommitted pages. + * In case it is not, assume the range is not committed and count the individually committed pages. + */ + ULONG_PTR CommittedPages = Vad->u.VadFlags.MemCommit ? BYTES_TO_PAGES(EndingAddress - StartingAddress) : 0; - /* Is the PDE demand-zero? */ - PointerPde = MiPteToPde(PointerPte); - if (PointerPde->u.Long != 0) - { - /* It is not. Is it valid? */ - if (PointerPde->u.Hard.Valid == 0) - { - /* Fault it in */ - PointerPte = MiPteToAddress(PointerPde); - MiMakeSystemAddressValid(PointerPte, Process); - } - } - else + while (PointerPte <= LastPte) + { +#if _MI_PAGING_LEVELS == 4 + /* Check if PXE was ever paged in. */ + if (OnPxeBoundary) { - /* It is, skip it and move to the next PDE, unless we're done */ - PointerPde++; - PointerPte = MiPteToAddress(PointerPde); - if (PointerPte > LastPte) return CommittedPages; - } + PointerPxe = MiPteToPxe(PointerPte); - /* Now loop all the PTEs in the range */ - while (PointerPte <= LastPte) - { - /* Have we crossed a PDE boundary? */ - if (MiIsPteOnPdeBoundary(PointerPte)) - { - /* Is this PDE demand zero? */ - PointerPde = MiPteToPde(PointerPte); - if (PointerPde->u.Long != 0) - { - /* It isn't -- is it valid? */ - if (PointerPde->u.Hard.Valid == 0) - { - /* Nope, fault it in */ - PointerPte = MiPteToAddress(PointerPde); - MiMakeSystemAddressValid(PointerPte, Process); - } - } - else - { - /* It is, skip it and move to the next PDE */ - PointerPde++; - PointerPte = MiPteToAddress(PointerPde); - continue; - } - } + /* Check that this loop is sane */ + ASSERT(OnPpeBoundary); + ASSERT(OnPdeBoundary); - /* Is this PTE demand zero? */ - if (PointerPte->u.Long != 0) + if (PointerPxe->u.Long == 0) { - /* It isn't -- is it a decommited, invalid, or faulted PTE? */ - if ((PointerPte->u.Soft.Protection == MM_DECOMMIT) && - (PointerPte->u.Hard.Valid == 0) && - ((PointerPte->u.Soft.Prototype == 0) || - (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) - { - /* It is, so remove it from the count of commited pages */ - CommittedPages--; - } + PointerPxe++; + PointerPte = MiPxeToPte(PointerPde); + continue; } - /* Move to the next PTE */ - PointerPte++; + if (PointerPxe->u.Hard.Valid == 0) + MiMakeSystemAddressValid(MiPteToPpe(PointerPte), Process); } + ASSERT(PointerPxe->u.Hard.Valid == 1); +#endif - /* Return how many committed pages there still are */ - return CommittedPages; - } +#if _MI_PAGING_LEVELS >= 3 + /* Now PPE */ + if (OnPpeBoundary) + { + PointerPpe = MiPteToPpe(PointerPte); - /* This is a non-commited VAD, so assume none of it is committed */ - CommittedPages = 0; + /* Sanity again */ + ASSERT(OnPdeBoundary); - /* Is the PDE demand-zero? */ - PointerPde = MiPteToPde(PointerPte); - if (PointerPde->u.Long != 0) - { - /* It isn't -- is it invalid? */ - if (PointerPde->u.Hard.Valid == 0) - { - /* It is, so page it in */ - PointerPte = MiPteToAddress(PointerPde); - MiMakeSystemAddressValid(PointerPte, Process); + if (PointerPpe->u.Long == 0) + { + PointerPpe++; + PointerPte = MiPpeToPte(PointerPpe); +#if _MI_PAGING_LEVELS == 4 + OnPxeBoundary = MiIsPteOnPxeBoundary(PointerPte); +#endif + continue; + } + + if (PointerPpe->u.Hard.Valid == 0) + MiMakeSystemAddressValid(MiPteToPde(PointerPte), Process); } - } - else - { - /* It is, so skip it and move to the next PDE */ - PointerPde++; - PointerPte = MiPteToAddress(PointerPde); - if (PointerPte > LastPte) return CommittedPages; - } + ASSERT(PointerPpe->u.Hard.Valid == 1); +#endif - /* Loop all the PTEs in this PDE */ - while (PointerPte <= LastPte) - { - /* Have we crossed a PDE boundary? */ - if (MiIsPteOnPdeBoundary(PointerPte)) + /* Last level is the PDE */ + if (OnPdeBoundary) { - /* Is this new PDE demand-zero? */ PointerPde = MiPteToPde(PointerPte); - if (PointerPde->u.Long != 0) + if (PointerPde->u.Long == 0) { - /* It isn't. Is it valid? */ - if (PointerPde->u.Hard.Valid == 0) - { - /* It isn't, so make it valid */ - PointerPte = MiPteToAddress(PointerPde); - MiMakeSystemAddressValid(PointerPte, Process); - } - } - else - { - /* It is, so skip it and move to the next one */ PointerPde++; - PointerPte = MiPteToAddress(PointerPde); + PointerPte = MiPdeToPte(PointerPde); +#if _MI_PAGING_LEVELS >= 3 + OnPpeBoundary = MiIsPteOnPpeBoundary(PointerPte); +#if _MI_PAGING_LEVELS == 4 + OnPxeBoundary = MiIsPteOnPxeBoundary(PointerPte); +#endif +#endif continue; } + + if (PointerPde->u.Hard.Valid == 0) + MiMakeSystemAddressValid(PointerPte, Process); } + ASSERT(PointerPde->u.Hard.Valid == 1); - /* Is this PTE demand-zero? */ + /* Is this PTE demand zero? */ if (PointerPte->u.Long != 0) { - /* Nope. Is it a valid, non-decommited, non-paged out PTE? */ - if ((PointerPte->u.Soft.Protection != MM_DECOMMIT) || - (PointerPte->u.Hard.Valid == 1) || - ((PointerPte->u.Soft.Prototype == 1) && - (PointerPte->u.Soft.PageFileHigh != MI_PTE_LOOKUP_NEEDED))) + /* It isn't -- is it a decommited, invalid, or faulted PTE? */ + if ((PointerPte->u.Hard.Valid == 0) && + (PointerPte->u.Soft.Protection == MM_DECOMMIT) && + ((PointerPte->u.Soft.Prototype == 0) || + (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) { - /* It is! So we'll treat this as a committed page */ + /* It is, so remove it from the count of committed pages if we have to */ + if (Vad->u.VadFlags.MemCommit) + CommittedPages--; + } + else if (!Vad->u.VadFlags.MemCommit) + { + /* It is a valid, non-decommited, non-paged out PTE. Count it in. */ CommittedPages++; } } /* Move to the next PTE */ PointerPte++; + /* Manage page tables */ + OnPdeBoundary = MiIsPteOnPdeBoundary(PointerPte); +#if _MI_PAGING_LEVELS >= 3 + OnPpeBoundary = MiIsPteOnPpeBoundary(PointerPte); +#if _MI_PAGING_LEVELS == 4 + OnPxeBoundary = MiIsPteOnPxeBoundary(PointerPte); +#endif +#endif } - /* Return how many committed pages we found in this VAD */ + /* Make sure we didn't mess this up */ + ASSERT(CommittedPages <= BYTES_TO_PAGES(EndingAddress - StartingAddress)); return CommittedPages; }

1 0

[reactos] 04/12: [NTOS:MM] Add a few MiP*eToP*e helpers
by Jérôme Gardou 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b48e27ada1604afe1b851… commit b48e27ada1604afe1b851314f2f63222a6fea2b5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue May 25 16:05:57 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 9 11:27:18 2021 +0200 [NTOS:MM] Add a few MiP*eToP*e helpers And turn some of the existing ones into inline functions for the sake of type checking --- ntoskrnl/include/internal/amd64/mm.h | 67 +++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index e62df71cfe0..3d45788222e 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -231,10 +231,69 @@ MiPxeToAddress(PMMPTE PointerPxe) return (PVOID)(((LONG64)PointerPxe << 52) >> 16); } -/* Translate between P*Es */ -#define MiPdeToPte(_Pde) ((PMMPTE)MiPteToAddress(_Pde)) -#define MiPteToPde(_Pte) ((PMMPDE)MiAddressToPte(_Pte)) -#define MiPdeToPpe(_Pde) ((PMMPPE)MiAddressToPte(_Pde)) +/* Convert a PDE into its lowest PTE */ +FORCEINLINE +PMMPTE +MiPdeToPte(PMMPDE PointerPde) +{ + return (PMMPTE)MiPteToAddress(PointerPde); +} + +/* Convert a PPE into its lowest PTE */ +FORCEINLINE +PMMPTE +MiPpeToPte(PMMPPE PointerPpe) +{ + return (PMMPTE)MiPdeToAddress(PointerPpe); +} + +/* Convert a PXE into its lowest PTE */ +FORCEINLINE +PMMPTE +MiPxeToPte(PMMPXE PointerPxe) +{ + return (PMMPTE)MiPpeToAddress(PointerPxe); +} + +/* Convert a PTE to a corresponding PDE */ +FORCEINLINE +PMMPDE +MiPteToPde(PMMPTE PointerPte) +{ + return (PMMPDE)MiAddressToPte(PointerPte); +} + +/* Convert a PTE to a corresponding PPE */ +FORCEINLINE +PMMPPE +MiPteToPpe(PMMPTE PointerPte) +{ + return (PMMPPE)MiAddressToPde(PointerPte); +} + +/* Convert a PTE to a corresponding PXE */ +FORCEINLINE +PMMPXE +MiPteToPxe(PMMPTE PointerPte) +{ + return (PMMPXE)MiAddressToPpe(PointerPte); +} + +/* Convert a PDE to a corresponding PPE */ +FORCEINLINE +PMMPDE +MiPdeToPpe(PMMPDE PointerPde) +{ + return (PMMPPE)MiAddressToPte(PointerPde); +} + +/* Convert a PDE to a corresponding PXE */ +FORCEINLINE +PMMPXE +MiPdeToPxe(PMMPDE PointerPde) +{ + return (PMMPXE)MiAddressToPde(PointerPde); +} /* Check P*E boundaries */ #define MiIsPteOnPdeBoundary(PointerPte) \

1 0

[reactos] 03/12: [NTOS:MM] Properly initialize initial process address space on amd64
by Jérôme Gardou 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed1038ff9c41e640a04ad… commit ed1038ff9c41e640a04ad63b7c98f726b3f0ecad Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue May 25 10:44:11 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 9 11:27:18 2021 +0200 [NTOS:MM] Properly initialize initial process address space on amd64 By applying the same kludge on the relevant MMPFNs than on x86 --- ntoskrnl/mm/ARM3/procsup.c | 7 ------- ntoskrnl/mm/amd64/init.c | 24 +++++++++++++++++++++++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 2fc8dccae54..0d46aa9c05f 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -943,10 +943,6 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, ASSERT(Process->VadRoot.NumberGenericTableElements == 0); Process->VadRoot.BalancedRoot.u1.Parent = &Process->VadRoot.BalancedRoot; -#ifdef _M_AMD64 - /* On x64 the PFNs for the initial process are already set up */ - if (Process != &KiInitialProcess) { -#endif /* Lock our working set */ MiLockProcessWorkingSet(Process, PsGetCurrentThread()); @@ -1014,9 +1010,6 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, /* Release the process working set */ MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); -#ifdef _M_AMD64 - } /* On x64 the PFNs for the initial process are already set up */ -#endif #ifdef _M_AMD64 /* On x64 we need a VAD for the shared user page */ diff --git a/ntoskrnl/mm/amd64/init.c b/ntoskrnl/mm/amd64/init.c index eea9cc2c1bb..0c6a868b144 100644 --- a/ntoskrnl/mm/amd64/init.c +++ b/ntoskrnl/mm/amd64/init.c @@ -252,6 +252,8 @@ MiInitializePageTable(VOID) RtlZeroMemory(MiPteToAddress(PointerPxe), PAGE_SIZE); } } + PxePfn = PFN_FROM_PXE(MiAddressToPxe((PVOID)HYPER_SPACE)); + PsGetCurrentProcess()->Pcb.DirectoryTableBase[1] = PxePfn << PAGE_SHIFT; /* Map PPEs for paged pool */ MiMapPPEs(MmPagedPoolStart, MmPagedPoolEnd); @@ -713,7 +715,6 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) // PrototypePte.u.ProtoAddress PrototypePte.u.Soft.PageFileHigh = MI_PTE_LOOKUP_NEEDED; - MiInitializePageTable(); MiBuildNonPagedPool(); @@ -723,6 +724,27 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Map the PFN database pages */ MiBuildPfnDatabase(LoaderBlock); + /* Reset the ref/share count so that MmInitializeProcessAddressSpace works */ + PMMPFN Pfn = MiGetPfnEntry(PFN_FROM_PTE((PMMPTE)PXE_SELFMAP)); + Pfn->u2.ShareCount = 0; + Pfn->u3.e2.ReferenceCount = 0; + + Pfn = MiGetPfnEntry(PFN_FROM_PDE(MiAddressToPde((PVOID)HYPER_SPACE))); + Pfn->u2.ShareCount = 0; + Pfn->u3.e2.ReferenceCount = 0; + + Pfn = MiGetPfnEntry(PFN_FROM_PPE(MiAddressToPpe((PVOID)HYPER_SPACE))); + Pfn->u2.ShareCount = 0; + Pfn->u3.e2.ReferenceCount = 0; + + Pfn = MiGetPfnEntry(PFN_FROM_PXE(MiAddressToPxe((PVOID)HYPER_SPACE))); + Pfn->u2.ShareCount = 0; + Pfn->u3.e2.ReferenceCount = 0; + + Pfn = MiGetPfnEntry(PFN_FROM_PTE(MiAddressToPte(MmWorkingSetList))); + Pfn->u2.ShareCount = 0; + Pfn->u3.e2.ReferenceCount = 0; + /* Initialize the nonpaged pool */ InitializePool(NonPagedPool, 0);

1 0

[reactos] 02/12: [NTOS:MM] Unconditionally delete the PFN in MiDeletePte when PTE is in transition
by Jérôme Gardou 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9ea58dc978124b6b1e09… commit f9ea58dc978124b6b1e090301459ce94116ba6cc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Mar 22 09:46:06 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 9 11:27:18 2021 +0200 [NTOS:MM] Unconditionally delete the PFN in MiDeletePte when PTE is in transition When we will have a modified page writer, it will have to know if the written page is stale when being done, and act accordingly. CORE-8552 --- ntoskrnl/mm/ARM3/virtual.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 9396e18b05a..ace22a19887 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -401,6 +401,12 @@ MiDeletePte(IN PMMPTE PointerPte, /* PFN lock must be held */ MI_ASSERT_PFN_LOCK_HELD(); + /* WorkingSet must be exclusively locked */ + ASSERT(MM_ANY_WS_LOCK_HELD_EXCLUSIVE(PsGetCurrentThread())); + + /* This must be current process. */ + ASSERT(CurrentProcess == PsGetCurrentProcess()); + /* Capture the PTE */ TempPte = *PointerPte; @@ -428,9 +434,16 @@ MiDeletePte(IN PMMPTE PointerPte, /* Drop the reference on the page table. */ MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + /* In case of shared page, the prototype PTE must be in transition, not the process one */ ASSERT(Pfn1->u3.e1.PrototypePte == 0); - /* Make the page free. For prototypes, it will be made free when deleting the section object */ + /* Delete the PFN */ + MI_SET_PFN_DELETED(Pfn1); + + /* It must be either free (refcount == 0) or being written (refcount == 1) */ + ASSERT(Pfn1->u3.e2.ReferenceCount == Pfn1->u3.e1.WriteInProgress); + + /* See if we must free it ourselves, or if it will be freed once I/O is over */ if (Pfn1->u3.e2.ReferenceCount == 0) { /* And it should be in standby or modified list */ @@ -441,7 +454,6 @@ MiDeletePte(IN PMMPTE PointerPte, Pfn1->u3.e2.ReferenceCount++; /* This will put it back in free list and clean properly up */ - MI_SET_PFN_DELETED(Pfn1); MiDecrementReferenceCount(Pfn1, PageFrameIndex); } return;

1 0

[reactos] 01/12: [NTOS:MM] Remove some dead code from legacy Mm
by Jérôme Gardou 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82dd1afe33dda96e2dd52… commit 82dd1afe33dda96e2dd52e249335ef563009575e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 26 18:18:23 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 9 11:27:18 2021 +0200 [NTOS:MM] Remove some dead code from legacy Mm --- ntoskrnl/include/internal/mm.h | 2 +- ntoskrnl/mm/ARM3/procsup.c | 8 ++++- ntoskrnl/mm/balance.c | 33 ------------------- ntoskrnl/mm/marea.c | 72 ------------------------------------------ 4 files changed, 8 insertions(+), 107 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index c3391191a17..a68359da713 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -744,7 +744,7 @@ VOID NTAPI MmCleanProcessAddressSpace(IN PEPROCESS Process); -NTSTATUS +VOID NTAPI MmDeleteProcessAddressSpace(IN PEPROCESS Process); diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index c7abed0c794..2fc8dccae54 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -1326,12 +1326,18 @@ MmCleanProcessAddressSpace(IN PEPROCESS Process) VOID NTAPI -MmDeleteProcessAddressSpace2(IN PEPROCESS Process) +MmDeleteProcessAddressSpace(IN PEPROCESS Process) { PMMPFN Pfn1, Pfn2; KIRQL OldIrql; PFN_NUMBER PageFrameIndex; +#ifndef _M_AMD64 + OldIrql = MiAcquireExpansionLock(); + RemoveEntryList(&Process->MmProcessLinks); + MiReleaseExpansionLock(OldIrql); +#endif + //ASSERT(Process->CommitCharge == 0); /* Remove us from the list */ diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 93b05138df3..e6f1313b03f 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -254,13 +254,6 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) return STATUS_SUCCESS; } -static BOOLEAN -MiIsBalancerThread(VOID) -{ - return (MiBalancerThreadHandle != NULL) && - (PsGetCurrentThreadId() == MiBalancerThreadId.UniqueThread); -} - VOID NTAPI MmRebalanceMemoryConsumers(VOID) @@ -320,32 +313,6 @@ MiBalancerThread(PVOID Unused) { ULONG InitialTarget = 0; -#if (_MI_PAGING_LEVELS == 2) - if (!MiIsBalancerThread()) - { - /* Clean up the unused PDEs */ - ULONG_PTR Address; - PEPROCESS Process = PsGetCurrentProcess(); - - /* Acquire PFN lock */ - KIRQL OldIrql = MiAcquirePfnLock(); - PMMPDE pointerPde; - for (Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; - Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; - Address += PTE_PER_PAGE * PAGE_SIZE) - { - if (MiQueryPageTableReferences((PVOID)Address) == 0) - { - pointerPde = MiAddressToPde(Address); - if (pointerPde->u.Hard.Valid) - MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); - ASSERT(pointerPde->u.Hard.Valid == 0); - } - } - /* Release lock */ - MiReleasePfnLock(OldIrql); - } -#endif do { ULONG OldTarget = InitialTarget; diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 1942dd76b27..78d07c75cd6 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -547,76 +547,4 @@ MiRosCleanupMemoryArea( /* Make sure this worked! */ ASSERT(NT_SUCCESS(Status)); } - -VOID -NTAPI -MmDeleteProcessAddressSpace2(IN PEPROCESS Process); - -NTSTATUS -NTAPI -MmDeleteProcessAddressSpace(PEPROCESS Process) -{ -#ifndef _M_AMD64 - KIRQL OldIrql; -#endif - - DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process, - Process->ImageFileName); - -#ifndef _M_AMD64 - OldIrql = MiAcquireExpansionLock(); - RemoveEntryList(&Process->MmProcessLinks); - MiReleaseExpansionLock(OldIrql); -#endif - MmLockAddressSpace(&Process->Vm); - -#if (_MI_PAGING_LEVELS == 2) - { - KIRQL OldIrql; - PVOID Address; - PMMPDE pointerPde; - - /* Attach to Process */ - KeAttachProcess(&Process->Pcb); - - /* Acquire PFN lock */ - OldIrql = MiAcquirePfnLock(); - - for (Address = MI_LOWEST_VAD_ADDRESS; - Address < MM_HIGHEST_VAD_ADDRESS; - Address = (PVOID)((ULONG_PTR)Address + (PTE_PER_PAGE * PAGE_SIZE))) - { - /* At this point all references should be dead */ - if (MiQueryPageTableReferences(Address) != 0) - { - DPRINT1("Process %p, Address %p, UsedPageTableEntries %lu\n", - Process, - Address, - MiQueryPageTableReferences(Address)); - ASSERT(MiQueryPageTableReferences(Address) == 0); - } - - pointerPde = MiAddressToPde(Address); - /* Unlike in ARM3, we don't necesarrily free the PDE page as soon as reference reaches 0, - * so we must clean up a bit when process closes */ - if (pointerPde->u.Hard.Valid) - MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); - ASSERT(pointerPde->u.Hard.Valid == 0); - } - - /* Release lock */ - MiReleasePfnLock(OldIrql); - - /* Detach */ - KeDetachProcess(); - } -#endif - - MmUnlockAddressSpace(&Process->Vm); - - DPRINT("Finished MmDeleteProcessAddressSpace()\n"); - MmDeleteProcessAddressSpace2(Process); - return(STATUS_SUCCESS); -} - /* EOF */

1 0

[reactos] 01/01: [CMD] Use GetFullPathName instead of copying buffers when resolving executable names
by Jérôme Gardou 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=521d330d048af5df80b2f… commit 521d330d048af5df80b2ffdb268141f907de4844 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jun 8 18:04:35 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 9 11:23:39 2021 +0200 [CMD] Use GetFullPathName instead of copying buffers when resolving executable names This properly strips spaces & dots at the end of the file. Fixes the infinite loop with CreateProcess calling cmd over and over with e.g. 'cmd /c "some_script.bat "' Uncovered by recent ShellExecuteEx tests Dedicated to Katayama for the trigger & Hermès for the tests --- base/shell/cmd/where.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/cmd/where.c b/base/shell/cmd/where.c index 0ba4c08c5ec..4030a877a73 100644 --- a/base/shell/cmd/where.c +++ b/base/shell/cmd/where.c @@ -106,7 +106,7 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pPathExt, if (IsExistingFile (szPathBuffer)) { TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); - _tcscpy (pFullName, szPathBuffer); + GetFullPathName(szPathBuffer, MAX_PATH, pFullName, NULL); return TRUE; } @@ -130,7 +130,7 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pPathExt, if (IsExistingFile (szPathBuffer)) { TRACE ("Found: \'%s\'\n", debugstr_aw(szPathBuffer)); - _tcscpy (pFullName, szPathBuffer); + GetFullPathName(szPathBuffer, MAX_PATH, pFullName, NULL); return TRUE; } }

1 0

[reactos] 01/01: [USER32_APITEST] Add SetFocus testcase (#3732)
by Katayama Hirofumi MZ 09 Jun '21

09 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94d9e9c2a8d6436b6f1e5… commit 94d9e9c2a8d6436b6f1e50e5180acf19f74f60e0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 9 16:14:31 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 9 16:14:31 2021 +0900 [USER32_APITEST] Add SetFocus testcase (#3732) Investigate about setting keyboard focus. CORE-17550 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/SetFocus.c | 219 +++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + modules/rostests/apitests/user32/user32_apitest.rc | 10 + 4 files changed, 232 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index f0dca068549..99d7b4d3168 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -38,6 +38,7 @@ list(APPEND SOURCE SendMessageTimeout.c SetActiveWindow.c SetCursorPos.c + SetFocus.c SetParent.c SetProp.c SetScrollInfo.c diff --git a/modules/rostests/apitests/user32/SetFocus.c b/modules/rostests/apitests/user32/SetFocus.c new file mode 100644 index 00000000000..3c6e78302ca --- /dev/null +++ b/modules/rostests/apitests/user32/SetFocus.c @@ -0,0 +1,219 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for SetFocus/GetFocus/GetGUIThreadInfo + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include <dlgs.h> // psh1, ... +#include <process.h> + +#define INTERVAL 80 + +static DWORD s_dwMainThreadID; + +static HWND GetMainThreadFocus(void) +{ + GUITHREADINFO gui = { sizeof(gui) }; + GetGUIThreadInfo(s_dwMainThreadID, &gui); + return gui.hwndFocus; +} + +static unsigned __stdcall thread_proc_0(void *arg) +{ + HWND hwnd = arg; + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDOK), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, psh1), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDOK), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, TRUE, FALSE); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, psh1), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDOK), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, psh1), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDOK), TRUE); + + PostMessageA(hwnd, WM_COMMAND, psh3, 0); + return 0; +} + +static unsigned __stdcall thread_proc_1(void *arg) +{ + HWND hwnd = arg; + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == NULL, TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == NULL, TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == NULL, TRUE); + + PostMessageA(hwnd, WM_COMMAND, psh3, 0); + return 0; +} + +static unsigned __stdcall thread_proc_2(void *arg) +{ + HWND hwnd = arg; + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, psh1), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + ok_int(GetFocus() == NULL, TRUE); + ok_int(GetMainThreadFocus() == GetDlgItem(hwnd, IDOK), TRUE); + keybd_event(VK_TAB, KEYEVENTF_KEYUP, 0, 0); + Sleep(INTERVAL); + + PostMessageA(hwnd, WM_COMMAND, psh4, 0); + return 0; +} + +static INT_PTR CALLBACK +DialogProc_0(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HANDLE hThread; + switch (uMsg) + { + case WM_INITDIALOG: + ok_int(GetFocus() == NULL, TRUE); + SetFocus(GetDlgItem(hwnd, IDOK)); + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, TRUE, FALSE); + + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == GetDlgItem(hwnd, psh1), TRUE); + SendMessageA(hwnd, WM_NEXTDLGCTL, FALSE, FALSE); + + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + SetFocus(GetDlgItem(hwnd, IDCANCEL)); + PostMessageA(hwnd, WM_COMMAND, psh2, 0); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case psh2: + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + hThread = (HANDLE)_beginthreadex(NULL, 0, thread_proc_0, hwnd, 0, NULL); + CloseHandle(hThread); + break; + + case psh3: + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + EndDialog(hwnd, IDCLOSE); + break; + } + break; + } + return 0; +} + +static INT_PTR CALLBACK +DialogProc_1(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HANDLE hThread; + switch (uMsg) + { + case WM_INITDIALOG: + SetFocus(GetDlgItem(hwnd, IDCANCEL)); + PostMessageA(hwnd, WM_COMMAND, psh2, 0); + return FALSE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case psh2: + ok_int(GetFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + EnableWindow(GetDlgItem(hwnd, IDCANCEL), FALSE); + ok_int(GetFocus() == NULL, TRUE); + + hThread = (HANDLE)_beginthreadex(NULL, 0, thread_proc_1, hwnd, 0, NULL); + CloseHandle(hThread); + break; + + case psh3: + ok_int(GetFocus() == NULL, TRUE); + EnableWindow(GetDlgItem(hwnd, IDCANCEL), TRUE); + + ok_int(GetFocus() == NULL, TRUE); + SetFocus(GetDlgItem(hwnd, IDCANCEL)); + ok_int(GetFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + + hThread = (HANDLE)_beginthreadex(NULL, 0, thread_proc_2, hwnd, 0, NULL); + CloseHandle(hThread); + break; + + case psh4: + ok_int(GetFocus() == GetDlgItem(hwnd, IDCANCEL), TRUE); + ShowWindow(GetDlgItem(hwnd, IDCANCEL), SW_HIDE); + + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + ShowWindow(GetDlgItem(hwnd, IDCANCEL), SW_SHOW); + + ok_int(GetFocus() == GetDlgItem(hwnd, IDOK), TRUE); + EndDialog(hwnd, IDCLOSE); + break; + } + break; + } + return 0; +} + +START_TEST(SetFocus) +{ + s_dwMainThreadID = GetCurrentThreadId(); + Sleep(INTERVAL); + ok_int((INT)DialogBoxA(GetModuleHandleA(NULL), "SETFOCUS", NULL, DialogProc_0), IDCLOSE); + ok_int((INT)DialogBoxA(GetModuleHandleA(NULL), "SETFOCUS", NULL, DialogProc_1), IDCLOSE); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index b4ef3e04e4c..26325af0571 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -40,6 +40,7 @@ extern void func_ScrollWindowEx(void); extern void func_SendMessageTimeout(void); extern void func_SetActiveWindow(void); extern void func_SetCursorPos(void); +extern void func_SetFocus(void); extern void func_SetParent(void); extern void func_SetProp(void); extern void func_SetScrollInfo(void); @@ -90,6 +91,7 @@ const struct test winetest_testlist[] = { "SendMessageTimeout", func_SendMessageTimeout }, { "SetActiveWindow", func_SetActiveWindow }, { "SetCursorPos", func_SetCursorPos }, + { "SetFocus", func_SetFocus }, { "SetParent", func_SetParent }, { "SetProp", func_SetProp }, { "SetScrollInfo", func_SetScrollInfo }, diff --git a/modules/rostests/apitests/user32/user32_apitest.rc b/modules/rostests/apitests/user32/user32_apitest.rc index 6c7cfe5ec81..c6da5676f18 100644 --- a/modules/rostests/apitests/user32/user32_apitest.rc +++ b/modules/rostests/apitests/user32/user32_apitest.rc @@ -38,3 +38,13 @@ CAPTION "DM_REPOSITION" FONT 8, "MS Shell Dlg" { } + +SETFOCUS DIALOG 0, 0, 175, 101 +CAPTION "user32_apitest SetFocus" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +FONT 9, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 14, 23, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 42, 45, 60, 14 + PUSHBUTTON "psh1", psh1, 75, 73, 60, 14 +}

1 0

[reactos] 01/01: [HIVESYS] Use "Primary Disk" writing for this driver load order group
by Victor Perevertkin 08 Jun '21

08 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d220ea3e3c4b2a61fb312… commit d220ea3e3c4b2a61fb3125c36c252965b44b1267 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Jun 8 17:29:47 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jun 8 17:29:47 2021 +0300 [HIVESYS] Use "Primary Disk" writing for this driver load order group --- boot/bootdata/hivesys.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 28b89e2c115..651698173e2 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -130,7 +130,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Netlogon","",0x00000000, HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\PCI Configuration","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\PlugPlay","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\PNP Filter","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Primary disk","",0x00000000,"Driver Group" +HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Primary Disk","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\RpcSs","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\SCSI Class","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\sermouse.sys","",0x00000000,"Driver" @@ -195,7 +195,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\PCI Configuration","",0x HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\PlugPlay","",0x00000000,"Service" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\PNP Filter","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\PNP_TDI","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Primary disk","",0x00000000,"Driver Group" +HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Primary Disk","",0x00000000,"Driver Group" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\rdpcdd.sys","",0x00000000,"Driver" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\rdpdd.sys","",0x00000000,"Driver" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\rdpwd.sys","",0x00000000,"Driver"

1 0

[reactos] 03/03: [NTOS:SE] Use IQS_NONE for the first class which is not existent and barely used
by George Bișoc 08 Jun '21

08 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ca6bfb9945b8bdfbe844… commit 7ca6bfb9945b8bdfbe8440644dff16fddec1511a Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 6 19:48:34 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jun 8 09:26:11 2021 +0200 [NTOS:SE] Use IQS_NONE for the first class which is not existent and barely used --- ntoskrnl/se/token.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 256e4b31d4c..74ec4142917 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -32,7 +32,7 @@ static GENERIC_MAPPING SepTokenMapping = { static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { /* Class 0 not used, blame MS! */ - IQS_SAME(0, 0, 0), + IQS_NONE, /* TokenUser */ IQS_SAME(TOKEN_USER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),

1 0

[reactos] 02/03: [NTOS:PS] Use IQS_NONE for classes that do not exist
by George Bișoc 08 Jun '21

08 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=672c9068bbd6ae17229f0… commit 672c9068bbd6ae17229f08bf312193b7491fa824 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 6 19:47:51 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jun 8 09:26:11 2021 +0200 [NTOS:PS] Use IQS_NONE for classes that do not exist --- ntoskrnl/include/internal/ps_i.h | 128 ++++++--------------------------------- 1 file changed, 19 insertions(+), 109 deletions(-) diff --git a/ntoskrnl/include/internal/ps_i.h b/ntoskrnl/include/internal/ps_i.h index 85de26d8814..adec4cb8275 100644 --- a/ntoskrnl/include/internal/ps_i.h +++ b/ntoskrnl/include/internal/ps_i.h @@ -4,7 +4,7 @@ * PURPOSE: Info Classes for the Process Manager * COPYRIGHT: Copyright Alex Ionescu <alex.ionescu(a)reactos.org> * Copyright Thomas Weidenmueller <w3seek(a)reactos.org> - * Copyright 2020 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2020-2021 George Bișoc <george.bisoc(a)reactos.org> */ #include "icif.h" @@ -289,12 +289,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ), /* ProcessIoPriority */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessExecuteFlags */ IQS_SAME @@ -305,12 +300,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ), /* ProcessTlsInformation */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessCookie */ IQS_SAME @@ -329,44 +319,19 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ), /* ProcessCycleTime */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessPagePriority */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessInstrumentationCallback */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessThreadStackAllocation */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessWorkingSetWatchEx */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessImageFileNameWin32 */ IQS_SAME @@ -377,28 +342,13 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ), /* ProcessImageFileMapping */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessAffinityUpdateMode */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ProcessMemoryAllocationMode */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, }; // @@ -478,12 +428,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ), /* ThreadEventPair_Reusable */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadQuerySetWin32StartAddress */ IQS @@ -586,58 +531,23 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ), /* ThreadLastSystemCall */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadIoPriority */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadCycleTime */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadPagePriority */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadActualBasePriority */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadTebInformation */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, /* ThreadCSwitchMon */ - IQS_SAME - ( - CHAR, - CHAR, - ICIF_NONE - ), + IQS_NONE, };

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