Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 02/02: [GITHUB] build.yml: Remove superfluous '${{github.workspace}}'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eae3db10ae3d0541a49bd… commit eae3db10ae3d0541a49bd800f6672d6a467e8255 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Sep 8 04:28:50 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed May 19 09:37:07 2021 +0200 [GITHUB] build.yml: Remove superfluous '${{github.workspace}}' --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d7cceac84b..f302a1f048d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,9 +112,9 @@ jobs: - name: Configure run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - name: Build - run: cmake --build ${{github.workspace}}\build -- -k0 + run: cmake --build build -- -k0 - name: Generate ISOs - run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd + run: cmake --build build --target bootcd --target livecd - name: Upload ISOs uses: actions/upload-artifact@v2 with: @@ -175,9 +175,9 @@ jobs: - name: Configure run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=TRUE - name: Build - run: cmake --build ${{github.workspace}}\build -- -k0 + run: cmake --build build -- -k0 - name: Generate ISOs - run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd + run: cmake --build build --target bootcd --target livecd - name: Upload ISOs uses: actions/upload-artifact@v2 with:

3 years, 7 months

[reactos] 01/02: [GITHUB] build.yml: Sync' 'if:' syntax

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b783ce07a7e79e97ad70… commit 9b783ce07a7e79e97ad7086b428a9432b7fa9ec1 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Sep 8 04:28:50 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed May 19 09:37:07 2021 +0200 [GITHUB] build.yml: Sync' 'if:' syntax Addendum to 3644f3e. --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42de2d16973..5d7cceac84b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: path: RosBE-CI key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}} - name: Compile RosBE - if: steps.get_rosbe.outputs.cache-hit != 'true' + if: ${{ steps.get_rosbe.outputs.cache-hit != 'true' }} run: | chmod +x build_rosbe_ci.sh ./build_rosbe_ci.sh ${{github.workspace}}/RosBE-CI @@ -55,7 +55,7 @@ jobs: echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV - name: Ease ccache compiler check (GCC) - if: matrix.compiler == 'gcc' + if: ${{ matrix.compiler == 'gcc' }} run: echo "CCACHE_COMPILERCHECK=string:${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}" >> $GITHUB_ENV - name: Configure run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} @@ -98,13 +98,13 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_x86 - toolset: ${{ matrix.toolset }} + toolset: ${{matrix.toolset}} - name: Activate VS cmd (amd64) if: ${{ matrix.arch == 'amd64' }} uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64 - toolset: ${{ matrix.toolset }} + toolset: ${{matrix.toolset}} - name: Source checkout uses: actions/checkout@v2 with:

3 years, 7 months

[reactos] 01/01: [NTOS:MM] Fix build on whatever MSVC version triggered this

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=826aec48de506ed44b840… commit 826aec48de506ed44b8409b53c4873641e12acc8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed May 19 00:12:05 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed May 19 00:12:05 2021 +0200 [NTOS:MM] Fix build on whatever MSVC version triggered this There is no real need to put static or extern "C" function in a special namespace anyway --- ntoskrnl/mm/ARM3/wslist.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/ARM3/wslist.cpp b/ntoskrnl/mm/ARM3/wslist.cpp index 91cd87b354f..73067dfa910 100644 --- a/ntoskrnl/mm/ARM3/wslist.cpp +++ b/ntoskrnl/mm/ARM3/wslist.cpp @@ -20,8 +20,6 @@ PMMWSL MmWorkingSetList; KEVENT MmWorkingSetManagerEvent; /* LOCAL FUNCTIONS ************************************************************/ -namespace ntoskrnl -{ static MMPTE GetPteTemplateForWsList(PMMWSL WsList) { @@ -86,7 +84,7 @@ static void FreeWsleIndex(PMMWSL WsList, ULONG Index) PFN_NUMBER Page = PFN_FROM_PTE(PointerPte); { - MiPfnLockGuard PfnLock; + ntoskrnl::MiPfnLockGuard PfnLock; PMMPFN Pfn = MiGetPfnEntry(Page); MI_SET_PFN_DELETED(Pfn); @@ -177,7 +175,7 @@ static ULONG GetFreeWsleIndex(PMMWSL WsList) ASSERT(PointerPte->u.Hard.Valid == 0); MMPTE TempPte = GetPteTemplateForWsList(WsList); { - MiPfnLockGuard PfnLock; + ntoskrnl::MiPfnLockGuard PfnLock; TempPte.u.Hard.PageFrameNumber = MiRemoveAnyPage(GetNextPageColorForWsList(WsList)); MiInitializePfnAndMakePteValid(TempPte.u.Hard.PageFrameNumber, PointerPte, TempPte); @@ -271,7 +269,7 @@ TrimWsList(PMMWSL WsList) /* Please put yourself aside and make place for the younger ones */ PFN_NUMBER Page = PFN_FROM_PTE(PointerPte); { - MiPfnLockGuard PfnLock; + ntoskrnl::MiPfnLockGuard PfnLock; PMMPFN Pfn = MiGetPfnEntry(Page); @@ -489,5 +487,3 @@ MmWorkingSetManager(VOID) } } // extern "C" - -} // namespace ntoskrnl

3 years, 7 months

[reactos] 03/03: [NTOS:MM] Add private pages to process working sets

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=374fef2d59f39b714ff31… commit 374fef2d59f39b714ff3152f1590f6af843c8bf5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 30 16:21:11 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue May 18 23:42:19 2021 +0200 [NTOS:MM] Add private pages to process working sets --- ntoskrnl/include/internal/mm.h | 15 +++++++++ ntoskrnl/mm/ARM3/pagfault.c | 66 ++++++++++++++++++++++++++---------- ntoskrnl/mm/ARM3/virtual.c | 76 +++++++++++++++++++++--------------------- ntoskrnl/mm/marea.c | 12 +++---- 4 files changed, 106 insertions(+), 63 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index c3391191a17..a591feeec62 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1674,6 +1674,21 @@ VOID NTAPI MiInitializeWorkingSetList(_Inout_ PMMSUPPORT WorkingSet); +_Requires_exclusive_lock_held_(Vm->WorkingSetMutex) +VOID +NTAPI +MiInsertInWorkingSetList( + _Inout_ PMMSUPPORT Vm, + _In_ PVOID Address, + _In_ ULONG Protection); + +_Requires_exclusive_lock_held_(Vm->WorkingSetMutex) +VOID +NTAPI +MiRemoveFromWorkingSetList( + _Inout_ PMMSUPPORT Vm, + _In_ PVOID Address); + #ifdef __cplusplus } // extern "C" diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 87c789c1742..061577671e9 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -697,16 +697,6 @@ MiResolveDemandZeroFault(IN PVOID Address, /* Increment demand zero faults */ KeGetCurrentPrcb()->MmDemandZeroCount++; - /* Do we have the lock? */ - if (HaveLock) - { - /* Release it */ - MiReleasePfnLock(OldIrql); - - /* Update performance counters */ - if (Process > HYDRA_PROCESS) Process->NumberOfPrivatePages++; - } - /* Zero the page if need be */ if (NeedZero) MiZeroPfn(PageFrameNumber); @@ -743,6 +733,19 @@ MiResolveDemandZeroFault(IN PVOID Address, /* Windows does these sanity checks */ ASSERT(Pfn1->u1.Event == 0); ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + /* Release it */ + MiReleasePfnLock(OldIrql); + + /* Update performance counters */ + if (Process > HYDRA_PROCESS) Process->NumberOfPrivatePages++; + } + + /* Add the page to our working set, if it's not a proto PTE */ + if ((Process > HYDRA_PROCESS) && (PointerPte == MiAddressToPte(Address))) + { + /* FIXME: Also support session VM scenario */ + MiInsertInWorkingSetList(&Process->Vm, Address, Protection); } // @@ -962,6 +965,9 @@ MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, KeSetEvent(Pfn1->u1.Event, IO_NO_INCREMENT, FALSE); } + /* And we can insert this into the working set */ + MiInsertInWorkingSetList(&CurrentProcess->Vm, FaultingAddress, Protection); + return Status; } @@ -979,6 +985,8 @@ MiResolveTransitionFault(IN BOOLEAN StoreInstruction, PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; + ULONG Protection; + DPRINT("Transition fault on 0x%p with PTE 0x%p in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName); @@ -1072,8 +1080,9 @@ MiResolveTransitionFault(IN BOOLEAN StoreInstruction, ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(PointerPte->u.Trans.Prototype == 0); ASSERT(PointerPte->u.Trans.Transition == 1); + Protection = TempPte.u.Trans.Protection; TempPte.u.Long = (PointerPte->u.Long & ~0xFFF) | - (MmProtectToPteMask[PointerPte->u.Trans.Protection]) | + (MmProtectToPteMask[Protection]) | MiDetermineUserGlobalPteMask(PointerPte); /* Is the PTE writeable? */ @@ -1093,6 +1102,10 @@ MiResolveTransitionFault(IN BOOLEAN StoreInstruction, /* Write the valid PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* If this was a user fault, add it to the working set */ + if (CurrentProcess > HYDRA_PROCESS) + MiInsertInWorkingSetList(&CurrentProcess->Vm, FaultingAddress, Protection); + /* Return success */ return STATUS_PAGE_FAULT_TRANSITION; } @@ -1234,6 +1247,9 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + /* The caller expects us to release the PFN lock */ + MiReleasePfnLock(OldIrql); + /* Fix the protection */ Protection &= ~MM_WRITECOPY; Protection |= MM_READWRITE; @@ -1251,8 +1267,12 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, /* And finally, write the valid PTE */ MI_WRITE_VALID_PTE(PointerPte, PteContents); - /* The caller expects us to release the PFN lock */ - MiReleasePfnLock(OldIrql); + /* Add the page to our working set */ + if (Process > HYDRA_PROCESS) + { + /* FIXME: Also support session VM scenario */ + MiInsertInWorkingSetList(&Process->Vm, Address, Protection); + } return Status; } @@ -2211,6 +2231,7 @@ UserFault: { PFN_NUMBER PageFrameIndex, OldPageFrameIndex; PMMPFN Pfn1; + ProtectionCode = TempPte.u.Soft.Protection; LockIrql = MiAcquirePfnLock(); @@ -2234,13 +2255,18 @@ UserFault: /* And make a new shiny one with our page */ MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + + MiReleasePfnLock(LockIrql); + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; TempPte.u.Hard.Write = 1; TempPte.u.Hard.CopyOnWrite = 0; MI_WRITE_VALID_PTE(PointerPte, TempPte); - MiReleasePfnLock(LockIrql); + /* We can now add it to our working set */ + MiInsertInWorkingSetList(&CurrentProcess->Vm, Address, ProtectionCode); + /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); @@ -2357,6 +2383,7 @@ UserFault: TempPte.u.Soft.Protection = ProtectionCode; MI_WRITE_INVALID_PTE(PointerPte, TempPte); } + ProtectionCode = PointerPte->u.Soft.Protection; /* Lock the PFN database since we're going to grab a page */ OldIrql = MiAcquirePfnLock(); @@ -2388,14 +2415,14 @@ UserFault: /* Initialize the PFN entry now */ MiInitializePfn(PageFrameIndex, PointerPte, 1); + /* And be done with the lock */ + MiReleasePfnLock(OldIrql); + /* Increment the count of pages in the process */ CurrentProcess->NumberOfPrivatePages++; /* One more demand-zero fault */ - KeGetCurrentPrcb()->MmDemandZeroCount++; - - /* And we're done with the lock */ - MiReleasePfnLock(OldIrql); + InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); /* Fault on user PDE, or fault on user PTE? */ if (PointerPte <= MiHighestUserPte) @@ -2423,6 +2450,9 @@ UserFault: Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); ASSERT(Pfn1->u1.Event == NULL); + /* We can now insert it into the working set */ + MiInsertInWorkingSetList(&CurrentProcess->Vm, Address, ProtectionCode); + /* Demand zero */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index eb03fa15e75..938be15c585 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -398,9 +398,6 @@ MiDeletePte(IN PMMPTE PointerPte, PFN_NUMBER PageFrameIndex; PMMPDE PointerPde; - /* PFN lock must be held */ - MI_ASSERT_PFN_LOCK_HELD(); - /* Capture the PTE */ TempPte = *PointerPte; @@ -425,6 +422,8 @@ MiDeletePte(IN PMMPTE PointerPte, /* Destroy the PTE */ MI_ERASE_PTE(PointerPte); + KIRQL OldIrql = MiAcquirePfnLock(); + /* Drop the reference on the page table. */ MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); @@ -444,6 +443,8 @@ MiDeletePte(IN PMMPTE PointerPte, MI_SET_PFN_DELETED(Pfn1); MiDecrementReferenceCount(Pfn1, PageFrameIndex); } + + MiReleasePfnLock(OldIrql); return; } } @@ -474,6 +475,8 @@ MiDeletePte(IN PMMPTE PointerPte, #if (_MI_PAGING_LEVELS == 2) } #endif + + KIRQL OldIrql = MiAcquirePfnLock(); /* Drop the share count on the page table */ PointerPde = MiPteToPde(PointerPte); MiDecrementShareCount(MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber), @@ -481,6 +484,7 @@ MiDeletePte(IN PMMPTE PointerPte, /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex); + MiReleasePfnLock(OldIrql); /* Either a fork, or this is the shared user data page */ if ((PointerPte <= MiHighestUserPte) && (PrototypePte != Pfn1->PteAddress)) @@ -503,6 +507,9 @@ MiDeletePte(IN PMMPTE PointerPte, } else { + /* Remove this address from the WS list */ + MiRemoveFromWorkingSetList(&CurrentProcess->Vm, VirtualAddress); + /* Make sure the saved PTE address is valid */ if ((PMMPTE)((ULONG_PTR)Pfn1->PteAddress & ~0x1) != PointerPte) { @@ -517,6 +524,7 @@ MiDeletePte(IN PMMPTE PointerPte, /* Erase the PTE */ MI_ERASE_PTE(PointerPte); + KIRQL OldIrql = MiAcquirePfnLock(); /* There should only be 1 shared reference count */ ASSERT(Pfn1->u2.ShareCount == 1); @@ -526,6 +534,7 @@ MiDeletePte(IN PMMPTE PointerPte, /* Mark the PFN for deletion and dereference what should be the last ref */ MI_SET_PFN_DELETED(Pfn1); MiDecrementShareCount(Pfn1, PageFrameIndex); + MiReleasePfnLock(OldIrql); /* We should eventually do this */ //CurrentProcess->NumberOfPrivatePages--; @@ -2339,24 +2348,23 @@ MiProtectVirtualMemory(IN PEPROCESS Process, if ((NewAccessProtection & PAGE_NOACCESS) || (NewAccessProtection & PAGE_GUARD)) { - KIRQL OldIrql = MiAcquirePfnLock(); + /* Remove this from the working set */ + MiRemoveFromWorkingSetList(AddressSpace, MiPteToAddress(PointerPte)); /* Mark the PTE as transition and change its protection */ PteContents.u.Hard.Valid = 0; PteContents.u.Soft.Transition = 1; PteContents.u.Trans.Protection = ProtectionMask; /* Decrease PFN share count and write the PTE */ + KIRQL OldIrql = MiAcquirePfnLock(); MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&PteContents)); - // FIXME: remove the page from the WS + MiReleasePfnLock(OldIrql); MI_WRITE_INVALID_PTE(PointerPte, PteContents); #ifdef CONFIG_SMP // FIXME: Should invalidate entry in every CPU TLB ASSERT(FALSE); #endif KeInvalidateTlbEntry(MiPteToAddress(PointerPte)); - - /* We are done for this PTE */ - MiReleasePfnLock(OldIrql); } else { @@ -2485,41 +2493,44 @@ MiMakePdeExistAndMakeValid(IN PMMPDE PointerPde, VOID NTAPI -MiProcessValidPteList(IN PMMPTE *ValidPteList, - IN ULONG Count) +MiProcessValidPteList( + _Inout_ PMMSUPPORT Vm, + _Inout_ PMMPTE *ValidPteList, + _In_ ULONG Count) { - KIRQL OldIrql; ULONG i; - MMPTE TempPte; - PFN_NUMBER PageFrameIndex; - PMMPFN Pfn1, Pfn2; - // - // Acquire the PFN lock and loop all the PTEs in the list + // Loop all the PTEs in the list // - OldIrql = MiAcquirePfnLock(); for (i = 0; i != Count; i++) { // // The PTE must currently be valid // - TempPte = *ValidPteList[i]; + MMPTE TempPte = *ValidPteList[i]; ASSERT(TempPte.u.Hard.Valid == 1); + // + // We can now remove this addres from the working set + // + MiRemoveFromWorkingSetList(Vm, MiPteToAddress(ValidPteList[i])); + // // Get the PFN entry for the page itself, and then for its page table // - PageFrameIndex = PFN_FROM_PTE(&TempPte); - Pfn1 = MiGetPfnEntry(PageFrameIndex); - Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); + PFN_NUMBER PageFrameIndex = PFN_FROM_PTE(&TempPte); + PMMPFN Pfn1 = MiGetPfnEntry(PageFrameIndex); + PMMPFN Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); // // Decrement the share count on the page table, and then on the page // itself // + KIRQL OldIrql = MiAcquirePfnLock(); MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); MI_SET_PFN_DELETED(Pfn1); MiDecrementShareCount(Pfn1, PageFrameIndex); + MiReleasePfnLock(OldIrql); // // Make the page decommitted @@ -2532,7 +2543,6 @@ MiProcessValidPteList(IN PMMPTE *ValidPteList, // and then release the PFN lock // KeFlushCurrentTb(); - MiReleasePfnLock(OldIrql); } ULONG @@ -2547,7 +2557,6 @@ MiDecommitPages(IN PVOID StartingAddress, ULONG CommitReduction = 0; PMMPTE ValidPteList[256]; ULONG PteCount = 0; - PMMPFN Pfn1; MMPTE PteContents; PETHREAD CurrentThread = PsGetCurrentThread(); @@ -2579,10 +2588,10 @@ MiDecommitPages(IN PVOID StartingAddress, // such, and does not flush the entire TLB all the time, but right // now we have bigger problems to worry about than TLB flushing. // - PointerPde = MiAddressToPde(StartingAddress); + PointerPde = MiPteToPde(PointerPte); if (PteCount) { - MiProcessValidPteList(ValidPteList, PteCount); + MiProcessValidPteList(&Process->Vm, ValidPteList, PteCount); PteCount = 0; } @@ -2617,21 +2626,13 @@ MiDecommitPages(IN PVOID StartingAddress, //Process->NumberOfPrivatePages--; if (PteContents.u.Hard.Valid) { - // - // It's valid. At this point make sure that it is not a ROS - // PFN. Also, we don't support ProtoPTEs in this code path. - // - Pfn1 = MiGetPfnEntry(PteContents.u.Hard.PageFrameNumber); - ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE); - ASSERT(Pfn1->u3.e1.PrototypePte == FALSE); - // // Flush any pending PTEs that we had not yet flushed, if our // list has gotten too big, then add this PTE to the flush list. // if (PteCount == 256) { - MiProcessValidPteList(ValidPteList, PteCount); + MiProcessValidPteList(&Process->Vm, ValidPteList, PteCount); PteCount = 0; } ValidPteList[PteCount++] = PointerPte; @@ -2661,7 +2662,7 @@ MiDecommitPages(IN PVOID StartingAddress, // This used to be a zero PTE and it no longer is, so we must add a // reference to the pagetable. // - MiIncrementPageTableReferences(StartingAddress); + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); // // Next, we account for decommitted PTEs and make the PTE as such @@ -2671,17 +2672,16 @@ MiDecommitPages(IN PVOID StartingAddress, } // - // Move to the next PTE and the next address + // Move to the next PTE // PointerPte++; - StartingAddress = (PVOID)((ULONG_PTR)StartingAddress + PAGE_SIZE); } // // Flush any dangling PTEs from the loop in the last page table, and then // release the working set and return the commit reduction accounting. // - if (PteCount) MiProcessValidPteList(ValidPteList, PteCount); + if (PteCount) MiProcessValidPteList(&Process->Vm, ValidPteList, PteCount); MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); return CommitReduction; } diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 1942dd76b27..d2ade0eb04b 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -572,15 +572,14 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) #if (_MI_PAGING_LEVELS == 2) { - KIRQL OldIrql; PVOID Address; PMMPDE pointerPde; + KAPC_STATE ApcState; /* Attach to Process */ - KeAttachProcess(&Process->Pcb); + KeStackAttachProcess(&Process->Pcb, &ApcState); - /* Acquire PFN lock */ - OldIrql = MiAcquirePfnLock(); + MiLockProcessWorkingSet(Process, PsGetCurrentThread()); for (Address = MI_LOWEST_VAD_ADDRESS; Address < MM_HIGHEST_VAD_ADDRESS; @@ -604,11 +603,10 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) ASSERT(pointerPde->u.Hard.Valid == 0); } - /* Release lock */ - MiReleasePfnLock(OldIrql); + MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); /* Detach */ - KeDetachProcess(); + KeUnstackDetachProcess(&ApcState); } #endif

3 years, 7 months

[reactos] 02/03: [NTOS:MM] Relax requirements with regards to PFN lock when adding & removing entries in Working Sets

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a5fd8f48795ab1819484… commit 6a5fd8f48795ab1819484b433194ee9357eb8bf1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue May 11 12:03:52 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue May 18 23:42:19 2021 +0200 [NTOS:MM] Relax requirements with regards to PFN lock when adding & removing entries in Working Sets Once a page is used, holding the WS lock is enough until you want to free it. --- ntoskrnl/mm/ARM3/miarm.h | 9 ++++++ ntoskrnl/mm/ARM3/procsup.c | 6 ++-- ntoskrnl/mm/ARM3/wslist.cpp | 79 +++++++++++++++++++++++++-------------------- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index adb6af3fd91..730acdd8bf1 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -1052,6 +1052,15 @@ MM_ANY_WS_LOCK_HELD(IN PETHREAD Thread) (Thread->OwnsSessionWorkingSetShared)); } +FORCEINLINE +BOOLEAN +MM_ANY_WS_LOCK_HELD_EXCLUSIVE(_In_ PETHREAD Thread) +{ + return ((Thread->OwnsProcessWorkingSetExclusive) || + (Thread->OwnsSystemWorkingSetExclusive) || + (Thread->OwnsSessionWorkingSetExclusive)); +} + // // Checks if the process owns the working set lock // diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index aa9133b1929..5f24a8a0b95 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -993,6 +993,9 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, PageFrameNumber = PFN_FROM_PTE(PointerPte); MiInitializePfn(PageFrameNumber, PointerPte, TRUE); + /* All our pages are now active & valid. Release the lock. */ + MiReleasePfnLock(OldIrql); + /* This should be in hyper space, but not in the mapping range */ Process->Vm.VmWorkingSetList = MmWorkingSetList; ASSERT(((ULONG_PTR)MmWorkingSetList >= MI_MAPPING_RANGE_END) && ((ULONG_PTR)MmWorkingSetList <= HYPER_SPACE_END)); @@ -1016,9 +1019,6 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, /* Sanity check */ ASSERT(Process->PhysicalVadRoot == NULL); - /* Release PFN lock */ - MiReleasePfnLock(OldIrql); - /* Release the process working set */ MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); #ifdef _M_AMD64 diff --git a/ntoskrnl/mm/ARM3/wslist.cpp b/ntoskrnl/mm/ARM3/wslist.cpp index 430e2c1a564..91cd87b354f 100644 --- a/ntoskrnl/mm/ARM3/wslist.cpp +++ b/ntoskrnl/mm/ARM3/wslist.cpp @@ -84,11 +84,15 @@ static void FreeWsleIndex(PMMWSL WsList, ULONG Index) ASSERT(MiPteToAddress(PointerPte) != WsList); PFN_NUMBER Page = PFN_FROM_PTE(PointerPte); - PMMPFN Pfn = MiGetPfnEntry(Page); - MI_SET_PFN_DELETED(Pfn); - MiDecrementShareCount(MiGetPfnEntry(Pfn->u4.PteFrame), Pfn->u4.PteFrame); - MiDecrementShareCount(Pfn, Page); + { + MiPfnLockGuard PfnLock; + + PMMPFN Pfn = MiGetPfnEntry(Page); + MI_SET_PFN_DELETED(Pfn); + MiDecrementShareCount(MiGetPfnEntry(Pfn->u4.PteFrame), Pfn->u4.PteFrame); + MiDecrementShareCount(Pfn, Page); + } PointerPte->u.Long = 0; @@ -172,8 +176,13 @@ static ULONG GetFreeWsleIndex(PMMWSL WsList) PMMPTE PointerPte = MiAddressToPte(&WsList->Wsle[WsList->LastInitializedWsle]); ASSERT(PointerPte->u.Hard.Valid == 0); MMPTE TempPte = GetPteTemplateForWsList(WsList); - TempPte.u.Hard.PageFrameNumber = MiRemoveAnyPage(GetNextPageColorForWsList(WsList)); - MiInitializePfnAndMakePteValid(TempPte.u.Hard.PageFrameNumber, PointerPte, TempPte); + { + MiPfnLockGuard PfnLock; + + TempPte.u.Hard.PageFrameNumber = MiRemoveAnyPage(GetNextPageColorForWsList(WsList)); + MiInitializePfnAndMakePteValid(TempPte.u.Hard.PageFrameNumber, PointerPte, TempPte); + } + WsList->LastInitializedWsle += PAGE_SIZE / sizeof(MMWSLE); } } @@ -187,8 +196,7 @@ VOID RemoveFromWsList(PMMWSL WsList, PVOID Address) { /* Make sure that we are holding the right locks. */ - ASSERT(MM_ANY_WS_LOCK_HELD(PsGetCurrentThread())); - MI_ASSERT_PFN_LOCK_HELD(); + ASSERT(MM_ANY_WS_LOCK_HELD_EXCLUSIVE(PsGetCurrentThread())); PMMPTE PointerPte = MiAddressToPte(Address); @@ -262,37 +270,37 @@ TrimWsList(PMMWSL WsList) /* Please put yourself aside and make place for the younger ones */ PFN_NUMBER Page = PFN_FROM_PTE(PointerPte); - KIRQL OldIrql = MiAcquirePfnLock(); + { + MiPfnLockGuard PfnLock; - PMMPFN Pfn = MiGetPfnEntry(Page); + PMMPFN Pfn = MiGetPfnEntry(Page); - /* Not supported yet */ - ASSERT(Pfn->u3.e1.PrototypePte == 0); - ASSERT(!MI_IS_ROS_PFN(Pfn)); + /* Not supported yet */ + ASSERT(Pfn->u3.e1.PrototypePte == 0); + ASSERT(!MI_IS_ROS_PFN(Pfn)); - /* FIXME: Remove this hack when possible */ - if (Pfn->Wsle.u1.e1.LockedInMemory || (Pfn->Wsle.u1.e1.LockedInWs)) - { - MiReleasePfnLock(OldIrql); - continue; - } + /* FIXME: Remove this hack when possible */ + if (Pfn->Wsle.u1.e1.LockedInMemory || (Pfn->Wsle.u1.e1.LockedInWs)) + { + continue; + } - /* We can remove it from the list. Save Protection first */ - ULONG Protection = Entry.u1.e1.Protection; - RemoveFromWsList(WsList, Entry.u1.VirtualAddress); + /* We can remove it from the list. Save Protection first */ + ULONG Protection = Entry.u1.e1.Protection; + RemoveFromWsList(WsList, Entry.u1.VirtualAddress); - /* Dirtify the page, if needed */ - if (PointerPte->u.Hard.Dirty) - Pfn->u3.e1.Modified = 1; + /* Dirtify the page, if needed */ + if (PointerPte->u.Hard.Dirty) + Pfn->u3.e1.Modified = 1; - /* Make this a transition PTE */ - MI_MAKE_TRANSITION_PTE(PointerPte, Page, Protection); - KeInvalidateTlbEntry(MiAddressToPte(PointerPte)); + /* Make this a transition PTE */ + MI_MAKE_TRANSITION_PTE(PointerPte, Page, Protection); + KeInvalidateTlbEntry(MiAddressToPte(PointerPte)); - /* Drop the share count. This will take care of putting it in the standby or modified list. */ - MiDecrementShareCount(Pfn, Page); + /* Drop the share count. This will take care of putting it in the standby or modified list. */ + MiDecrementShareCount(Pfn, Page); + } - MiReleasePfnLock(OldIrql); Ret++; } return Ret; @@ -302,6 +310,7 @@ TrimWsList(PMMWSL WsList) extern "C" { +_Use_decl_annotations_ VOID NTAPI MiInsertInWorkingSetList( @@ -311,9 +320,8 @@ MiInsertInWorkingSetList( { PMMWSL WsList = Vm->VmWorkingSetList; - /* Make sure that we are holding the right locks. */ - ASSERT(MM_ANY_WS_LOCK_HELD(PsGetCurrentThread())); - MI_ASSERT_PFN_LOCK_HELD(); + /* Make sure that we are holding the WS lock. */ + ASSERT(MM_ANY_WS_LOCK_HELD_EXCLUSIVE(PsGetCurrentThread())); PMMPTE PointerPte = MiAddressToPte(Address); @@ -345,6 +353,7 @@ MiInsertInWorkingSetList( Vm->PeakWorkingSetSize = Vm->WorkingSetSize; } +_Use_decl_annotations_ VOID NTAPI MiRemoveFromWorkingSetList( @@ -356,7 +365,7 @@ MiRemoveFromWorkingSetList( Vm->WorkingSetSize -= PAGE_SIZE; } -_Requires_exclusive_lock_held_(WorkingSet->WorkingSetMutex) +_Use_decl_annotations_ VOID NTAPI MiInitializeWorkingSetList(_Inout_ PMMSUPPORT WorkingSet)

3 years, 7 months

[reactos] 01/03: [NTOS] Introduce KiQueuedSpinLockGuard, similar to std::lock_guard for Queued Spin lock

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aeffd16b382435998b100… commit aeffd16b382435998b100007395660f85cd1abea Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue May 11 16:14:03 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue May 18 23:42:19 2021 +0200 [NTOS] Introduce KiQueuedSpinLockGuard, similar to std::lock_guard for Queued Spin lock And use it in Mm as MiPfnLockGuard --- ntoskrnl/include/internal/ke.h | 34 ++++++++++++++++++++++++++++++++++ ntoskrnl/include/internal/mm.h | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index e5551a5527b..92558517f0f 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -1065,6 +1065,40 @@ KeBugCheckUnicodeToAnsi( #ifdef __cplusplus } // extern "C" + +namespace ntoskrnl +{ + +/* Like std::lock_guard, but for a Queued Spinlock */ +template <KSPIN_LOCK_QUEUE_NUMBER n> +class KiQueuedSpinLockGuard +{ +private: + KIRQL m_OldIrql; +public: + + _Requires_lock_not_held_(n) + _Acquires_lock_(n) + _IRQL_raises_(DISPATCH_LEVEL) + explicit KiQueuedSpinLockGuard() + { + m_OldIrql = KeAcquireQueuedSpinLock(n); + } + + _Requires_lock_held_(n) + _Releases_lock_(n) + ~KiQueuedSpinLockGuard() + { + KeReleaseQueuedSpinLock(n, m_OldIrql); + } + +private: + KiQueuedSpinLockGuard(KiQueuedSpinLockGuard const&) = delete; + KiQueuedSpinLockGuard& operator=(KiQueuedSpinLockGuard const&) = delete; +}; + +} + #endif #include "ke_x.h" diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 7b284a01335..c3391191a17 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1676,4 +1676,10 @@ MiInitializeWorkingSetList(_Inout_ PMMSUPPORT WorkingSet); #ifdef __cplusplus } // extern "C" + +namespace ntoskrnl +{ +using MiPfnLockGuard = const KiQueuedSpinLockGuard<LockQueuePfnLock>; +} // namespace ntoskrnl + #endif

3 years, 7 months

[reactos] 01/01: [INF] Remove remnants of XboxVmp driver which has its own INF file

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffa7cfc1ff2e4b599c215… commit ffa7cfc1ff2e4b599c215bb7b7282e84d623f3db Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 18 20:22:22 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue May 18 20:22:22 2021 +0300 [INF] Remove remnants of XboxVmp driver which has its own INF file --- media/inf/display.inf | 9 --------- win32ss/drivers/miniport/xboxvmp/xboxdisp.inf | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/media/inf/display.inf b/media/inf/display.inf index 219f3f8242a..6b8b3de7ba0 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -40,7 +40,6 @@ CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT [VGA.Miniport_CopyFiles.NT] vgamp.sys vbemp.sys -xboxvmp.sys [VGA.Display_CopyFiles.NT] vgaddi.dll @@ -50,7 +49,6 @@ framebuf.dll AddService = , 0x00000002 ;AddService = VGA, , VGA_Service_Inst AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE -;AddService = XboxVmp, 0x00000003, XBOX_Service_Inst [VGA_Service_Inst] ServiceType = 1 @@ -66,13 +64,6 @@ ErrorControl = 0 ServiceBinary = %12%\vbemp.sys LoadOrderGroup = Video Save -[XBOX_Service_Inst] -ServiceType = 1 -StartType = 1 -ErrorControl = 0 -ServiceBinary = %12%\xboxvmp.sys -LoadOrderGroup = Video Save - ;-------------------------------- STRINGS ------------------------------- [Strings] diff --git a/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf index ba91e012ab8..c103ee304c3 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf +++ b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf @@ -36,7 +36,7 @@ ServiceType = 1 StartType = 1 ErrorControl = 0 ServiceBinary = %12%\xboxvmp.sys -LoadOrderGroup = Video +LoadOrderGroup = Video Save [xboxvmp.SoftwareSettings] AddReg = xboxvmp_SoftwareDeviceSettings

3 years, 7 months

[reactos] 01/01: [PC98VID] Fix MSVC 2015 build for PC-98 target

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7d825e62034dee120a24… commit f7d825e62034dee120a24e238e5e3c1d8dce2ff9 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu May 13 02:17:27 2021 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue May 18 19:30:29 2021 +0300 [PC98VID] Fix MSVC 2015 build for PC-98 target Addendum to 3adf45086743d5f075e4270af7af64017eb01d63 Also isolate the constant structures into page section and restore the previous sections for start IO and entrypoint routines. --- win32ss/drivers/miniport/pc98vid/ioctl.c | 1 + win32ss/drivers/miniport/pc98vid/pc98vid.c | 17 ++++++++++++++--- win32ss/drivers/miniport/pc98vid/pc98vid.h | 10 ++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/win32ss/drivers/miniport/pc98vid/ioctl.c b/win32ss/drivers/miniport/pc98vid/ioctl.c index 918beb117d6..d89a17510cd 100644 --- a/win32ss/drivers/miniport/pc98vid/ioctl.c +++ b/win32ss/drivers/miniport/pc98vid/ioctl.c @@ -206,6 +206,7 @@ Pc98VidGetChildState( return NO_ERROR; } +CODE_SEG("PAGE") BOOLEAN NTAPI Pc98VidStartIO( diff --git a/win32ss/drivers/miniport/pc98vid/pc98vid.c b/win32ss/drivers/miniport/pc98vid/pc98vid.c index 8705aee35ea..4fe45f7bc54 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98vid.c +++ b/win32ss/drivers/miniport/pc98vid/pc98vid.c @@ -11,6 +11,7 @@ /* GLOBALS ********************************************************************/ +DATA_SEG("PAGECONS") const VIDEOMODE VideoModes[] = { {640, 480, GRAPH_HF_31KHZ, GDC2_CLOCK1_5MHZ, GDC2_CLOCK2_5MHZ, @@ -18,7 +19,8 @@ const VIDEOMODE VideoModes[] = {0, 80, 12, 2, 4, 4, 6, 480, 37}, {0, 80, 12, 2, 4, 132, 6, 480, 37}} }; -static VIDEO_ACCESS_RANGE LegacyRangeList[] = +DATA_SEG("PAGECONS") +const VIDEO_ACCESS_RANGE LegacyRangeList[] = { { {{0x60, 0}}, 0x00000001, 1, 1, 1, 0 }, { {{0x62, 0}}, 0x00000001, 1, 1, 1, 0 }, @@ -72,7 +74,7 @@ Pc98VidFindAdapter( Status = VideoPortVerifyAccessRanges(DeviceExtension, RTL_NUMBER_OF(LegacyRangeList), - LegacyRangeList); + (PVIDEO_ACCESS_RANGE)LegacyRangeList); if (Status != NO_ERROR) { VideoDebugPrint((Error, "%s() Resource conflict was found\n", __FUNCTION__)); @@ -193,6 +195,15 @@ Pc98VidGetVideoChildDescriptor( return ERROR_NO_MORE_DEVICES; } +#if defined(_MSC_VER) +/* + * Avoid C2983 error for MSVC 2015. There is no such thing + * as DRIVER_INITIALIZE for video miniport drivers. + */ +#pragma alloc_text(INIT, DriverEntry) +#else +CODE_SEG("INIT") +#endif ULONG NTAPI DriverEntry( @@ -227,7 +238,7 @@ DriverEntry( InitData.HwGetVideoChildDescriptor = Pc98VidGetVideoChildDescriptor; } - InitData.HwLegacyResourceList = LegacyRangeList; + InitData.HwLegacyResourceList = (PVIDEO_ACCESS_RANGE)LegacyRangeList; InitData.HwLegacyResourceCount = RTL_NUMBER_OF(LegacyRangeList); InitData.AdapterInterfaceType = Isa; diff --git a/win32ss/drivers/miniport/pc98vid/pc98vid.h b/win32ss/drivers/miniport/pc98vid/pc98vid.h index 75cb4402c26..7cb9b15ef44 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98vid.h +++ b/win32ss/drivers/miniport/pc98vid/pc98vid.h @@ -22,6 +22,10 @@ #define READ_PORT_UCHAR(p) VideoPortReadPortUchar(p) #include <drivers/pc98/video.h> +#if defined(_MSC_VER) +#pragma section("PAGECONS", read) +#endif + #define MONITOR_HW_ID 0x1033FACE /* Dummy */ typedef struct _VIDEOMODE @@ -54,23 +58,27 @@ NTAPI HasPegcController( _In_ PHW_DEVICE_EXTENSION DeviceExtension); +CODE_SEG("PAGE") BOOLEAN NTAPI Pc98VidStartIO( _In_ PVOID HwDeviceExtension, _Inout_ PVIDEO_REQUEST_PACKET RequestPacket); +CODE_SEG("PAGE") VP_STATUS FASTCALL Pc98VidSetCurrentMode( _In_ PHW_DEVICE_EXTENSION DeviceExtension, _In_ PVIDEO_MODE RequestedMode); +CODE_SEG("PAGE") VP_STATUS FASTCALL Pc98VidSetColorRegisters( _In_ PVIDEO_CLUT ColorLookUpTable); +CODE_SEG("PAGE") VP_STATUS NTAPI Pc98VidGetPowerState( @@ -78,6 +86,7 @@ Pc98VidGetPowerState( _In_ ULONG HwId, _In_ PVIDEO_POWER_MANAGEMENT VideoPowerControl); +CODE_SEG("PAGE") VP_STATUS NTAPI Pc98VidSetPowerState( @@ -85,6 +94,7 @@ Pc98VidSetPowerState( _In_ ULONG HwId, _In_ PVIDEO_POWER_MANAGEMENT VideoPowerControl); +DATA_SEG("PAGECONS") extern const VIDEOMODE VideoModes[]; #endif /* _PC98VID_PCH_ */

3 years, 7 months

[reactos] 01/01: [WIN32SS] Always build all video miniport drivers

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bd8a2110b02f38346116… commit 0bd8a2110b02f3834611636ff719cd31ca3dd8bb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 18 14:24:10 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue May 18 19:24:57 2021 +0300 [WIN32SS] Always build all video miniport drivers But include registry changes and INF files depending on SARCH variable. This commit is expected to uncover pc98vid build error on MSVC 2015. Addendum to 8c475e4. CORE-17529 --- win32ss/drivers/miniport/CMakeLists.txt | 13 ++++++------- win32ss/drivers/miniport/pc98vid/CMakeLists.txt | 9 ++++++--- win32ss/drivers/miniport/xboxvmp/CMakeLists.txt | 9 ++++++--- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/win32ss/drivers/miniport/CMakeLists.txt b/win32ss/drivers/miniport/CMakeLists.txt index 2196bb034f9..e84effcc4db 100644 --- a/win32ss/drivers/miniport/CMakeLists.txt +++ b/win32ss/drivers/miniport/CMakeLists.txt @@ -1,11 +1,10 @@ -if(SARCH STREQUAL "pc98") +add_subdirectory(vbe) +add_subdirectory(vga) +add_subdirectory(vga_new) +add_subdirectory(vmx_svga) + +if(ARCH STREQUAL "i386") add_subdirectory(pc98vid) -elseif(SARCH STREQUAL "xbox") add_subdirectory(xboxvmp) -else() - add_subdirectory(vbe) - add_subdirectory(vga) - add_subdirectory(vga_new) - add_subdirectory(vmx_svga) endif() diff --git a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt index e40f99481d9..db0f8ae4a39 100644 --- a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt +++ b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt @@ -12,6 +12,9 @@ set_module_type(pc98vid kernelmodedriver) set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vga" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_pch(pc98vid pc98vid.h SOURCE) add_importlibs(pc98vid ntoskrnl videoprt) -add_cd_file(TARGET pc98vid DESTINATION reactos/system32/drivers FOR all) -add_registry_inf(pc98vid_reg.inf) -add_driver_inf(pc98vid pc98disp.inf) + +if(SARCH STREQUAL "pc98") + add_cd_file(TARGET pc98vid DESTINATION reactos/system32/drivers FOR all) + add_registry_inf(pc98vid_reg.inf) + add_driver_inf(pc98vid pc98disp.inf) +endif() diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt index 2595ebb13a7..4c50cee954f 100644 --- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt +++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt @@ -9,6 +9,9 @@ add_library(xboxvmp MODULE set_module_type(xboxvmp kernelmodedriver) add_importlibs(xboxvmp ntoskrnl videoprt) -add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all) -add_registry_inf(xboxvmp_reg.inf) -add_driver_inf(xboxvmp xboxdisp.inf) + +if(SARCH STREQUAL "xbox") + add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all) + add_registry_inf(xboxvmp_reg.inf) + add_driver_inf(xboxvmp xboxdisp.inf) +endif()

3 years, 7 months

[reactos] 01/01: [PC98VID] Use unique target name but rename as vga.sys

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81987761d96de211e6be1… commit 81987761d96de211e6be1a2de6df8bb04d46e7bf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 18 14:18:01 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue May 18 19:24:35 2021 +0300 [PC98VID] Use unique target name but rename as vga.sys This allows building pc98vid driver without conflict with vga_new. --- win32ss/drivers/miniport/CMakeLists.txt | 1 - win32ss/drivers/miniport/pc98vid/CMakeLists.txt | 15 ++++++++------- win32ss/drivers/miniport/vga_new/CMakeLists.txt | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/win32ss/drivers/miniport/CMakeLists.txt b/win32ss/drivers/miniport/CMakeLists.txt index 5418581b554..2196bb034f9 100644 --- a/win32ss/drivers/miniport/CMakeLists.txt +++ b/win32ss/drivers/miniport/CMakeLists.txt @@ -1,6 +1,5 @@ if(SARCH STREQUAL "pc98") - # Actual binary filename is vga.sys add_subdirectory(pc98vid) elseif(SARCH STREQUAL "xbox") add_subdirectory(xboxvmp) diff --git a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt index f86abc2edf3..e40f99481d9 100644 --- a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt +++ b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt @@ -5,12 +5,13 @@ list(APPEND SOURCE pc98vid.c pc98vid.h) -# Actual binary filename is vga.sys -add_library(vga MODULE ${SOURCE} pc98vid.rc) +add_library(pc98vid MODULE ${SOURCE} pc98vid.rc) -set_module_type(vga kernelmodedriver) -add_pch(vga pc98vid.h SOURCE) -add_importlibs(vga ntoskrnl videoprt) -add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) +set_module_type(pc98vid kernelmodedriver) +# Actual binary filename is vga.sys +set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vga" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") +add_pch(pc98vid pc98vid.h SOURCE) +add_importlibs(pc98vid ntoskrnl videoprt) +add_cd_file(TARGET pc98vid DESTINATION reactos/system32/drivers FOR all) add_registry_inf(pc98vid_reg.inf) -add_driver_inf(vga pc98disp.inf) +add_driver_inf(pc98vid pc98disp.inf) diff --git a/win32ss/drivers/miniport/vga_new/CMakeLists.txt b/win32ss/drivers/miniport/vga_new/CMakeLists.txt index b278c71e87e..b0e304ba906 100644 --- a/win32ss/drivers/miniport/vga_new/CMakeLists.txt +++ b/win32ss/drivers/miniport/vga_new/CMakeLists.txt @@ -15,4 +15,8 @@ target_link_libraries(vga libcntpr) set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) add_pch(vga vga.h SOURCE) -add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) + +# pc98vid takes place of vga.sys on PC-98 platform +if(NOT SARCH STREQUAL "pc98") + add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) +endif()

3 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

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 May 2021