Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 48999: [NTOS]: Delete a bunch of junk, 5 less files in Mm now (also moved some functions around). Delete unused functions where found. [NTOS]: The modified page writer should run at a...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 15:55:52 2010 New Revision: 48999 URL: http://svn.reactos.org/svn/reactos?rev=48999&view=rev Log: [NTOS]: Delete a bunch of junk, 5 less files in Mm now (also moved some functions around). Delete unused functions where found. [NTOS]: The modified page writer should run at a high priority such as 27, not in idle mode at priority 1 -- otherwise dirty pages never get flushed out. [NTOS]: Reimplement MmGetFileNameForAddress, MmGetFileNameForSection, MmGetFileObjectForSection to also support ARM3 sections. Shouldn't affect anything other than the user-mode debugging support. Removed: trunk/reactos/ntoskrnl/mm/mpw.c trunk/reactos/ntoskrnl/mm/pe.c trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=48… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… Removed: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=4899… Removed: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=48998… Removed: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=48… Removed: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… Removed: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…

1 0

[sir_richard] 48998: [NTOS]: When shutting down, call Cc to flush the dirty cached pages, otherwise these might've gotten lost (and lead to lost/corrupted data on disk). [NTOS]: Don't assume that C...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 15:52:00 2010 New Revision: 48998 URL: http://svn.reactos.org/svn/reactos?rev=48998&view=rev Log: [NTOS]: When shutting down, call Cc to flush the dirty cached pages, otherwise these might've gotten lost (and lead to lost/corrupted data on disk). [NTOS]: Don't assume that CcFlushDirtyPages will run with APCs disabled. Go ahead and actually enter/leave a critical region (Acquire/ReleaseForLazyWrite depend on this). The guarded mutex does disable APCs, but it's released when the actual flush happens. Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Tue Oct 5 15:52:00 2010 @@ -189,6 +189,7 @@ (*Count) = 0; + KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); WriteCount[0] = WriteCount[1]; @@ -278,6 +279,7 @@ } KeReleaseGuardedMutex(&ViewLock); + KeLeaveCriticalRegion(); DPRINT("CcRosFlushDirtyPages() finished\n"); return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Tue Oct 5 15:52:00 2010 @@ -659,6 +659,7 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); POP_POWER_ACTION Action = {0}; NTSTATUS Status; + ULONG Dummy; /* Check for invalid parameter combinations */ if ((MinSystemState >= PowerSystemMaximum) || @@ -742,9 +743,12 @@ /* Check if we're still in an invalid status */ if (!NT_SUCCESS(Status)) break; + + /* Flush dirty cache pages */ + CcRosFlushDirtyPages(-1, &Dummy); /* Flush all volumes and the registry */ - DPRINT1("Flushing volumes\n"); + DPRINT1("Flushing volumes, cache flushed %d pages\n", Dummy); PopFlushVolumes(PopAction.Shutdown); /* Set IRP for drivers */

1 0

[sir_richard] 48997: [NTOS]: Implement ARM3 version of MmMapViewOfSection, only for ARM3 pagefile-backed sections, and without any special flag support. Tested and works great, with the new pagefau...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 14:36:09 2010 New Revision: 48997 URL: http://svn.reactos.org/svn/reactos?rev=48997&view=rev Log: [NTOS]: Implement ARM3 version of MmMapViewOfSection, only for ARM3 pagefile-backed sections, and without any special flag support. Tested and works great, with the new pagefault code correctly finding the Prototype PTE for the VAD. [NTOS]: Make every VAD insert also create a MEMORY_AREA. Now the two address space views should be completely synchronized and we can try removing the hack that was done for PEB/TEB support (which will remove the 200 thread regression). [NTOS]: Implement MiGetNextNode and MiFindEmptyAddressRangeInTree. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Oct 5 14:36:09 2010 @@ -460,6 +460,159 @@ /* Return the base adress of the mapping and success */ *MappedBase = Base; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, + IN PEPROCESS Process, + IN PVOID *BaseAddress, + IN PLARGE_INTEGER SectionOffset, + IN PSIZE_T ViewSize, + IN PSECTION Section, + IN SECTION_INHERIT InheritDisposition, + IN ULONG ProtectionMask, + IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN ULONG AllocationType) +{ + PMMVAD Vad; + PETHREAD Thread = PsGetCurrentThread(); + ULONG_PTR StartAddress, EndingAddress; + PSUBSECTION Subsection; + PSEGMENT Segment; + PFN_NUMBER PteOffset; + NTSTATUS Status; + + /* Get the segment and subection for this section */ + Segment = ControlArea->Segment; + Subsection = (PSUBSECTION)(ControlArea + 1); + + /* Non-pagefile-backed sections not supported */ + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + ASSERT(ControlArea->u.Flags.Rom == 0); + ASSERT(ControlArea->FilePointer == NULL); + ASSERT(Segment->SegmentFlags.TotalNumberOfPtes4132 == 0); + + /* Based sections not supported */ + ASSERT(Section->Address.StartingVpn == 0); + + /* These flags/parameters are not supported */ + ASSERT((AllocationType & MEM_DOS_LIM) == 0); + ASSERT((AllocationType & MEM_RESERVE) == 0); + ASSERT((AllocationType & MEM_TOP_DOWN) == 0); + ASSERT(Process->VmTopDown == 0); + ASSERT(Section->u.Flags.CopyOnWrite == FALSE); + ASSERT(ZeroBits == 0); + + /* First, increase the map count. No purging is supported yet */ + Status = MiCheckPurgeAndUpMapCount(ControlArea, FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Check if the caller specified the view size */ + if (!(*ViewSize)) + { + /* The caller did not, so pick a 64K aligned view size based on the offset */ + SectionOffset->LowPart &= ~(_64K - 1); + *ViewSize = Section->SizeOfSection.QuadPart - SectionOffset->QuadPart; + } + else + { + /* A size was specified, align it to a 64K boundary */ + *ViewSize += SectionOffset->LowPart & (_64K - 1); + + /* Align the offset as well to make this an aligned map */ + SectionOffset->LowPart &= ~((ULONG)_64K - 1); + } + + /* We must be dealing with a 64KB aligned offset */ + ASSERT((SectionOffset->LowPart & ((ULONG)_64K - 1)) == 0); + + /* It's illegal to try to map more than 2GB */ + if (*ViewSize >= 0x80000000) return STATUS_INVALID_VIEW_SIZE; + + /* Within this section, figure out which PTEs will describe the view */ + PteOffset = SectionOffset->QuadPart >> PAGE_SHIFT; + + /* The offset must be in this segment's PTE chunk and it must be valid */ + ASSERT(PteOffset < Segment->TotalNumberOfPtes); + ASSERT(((SectionOffset->QuadPart + *ViewSize + PAGE_SIZE - 1) >> PAGE_SHIFT) >= PteOffset); + + /* In ARM3, only one subsection is used for now. It must contain these PTEs */ + ASSERT(PteOffset < Subsection->PtesInSubsection); + ASSERT(Subsection->SubsectionBase != NULL); + + /* In ARM3, only MEM_COMMIT is supported for now. The PTEs must've been committed */ + ASSERT(Segment->NumberOfCommittedPages >= Segment->TotalNumberOfPtes); + + /* Did the caller specify an address? */ + if (!(*BaseAddress)) + { + /* No, find an address bottom-up */ + Status = MiFindEmptyAddressRangeInTree(*ViewSize, + _64K, + &Process->VadRoot, + (PMMADDRESS_NODE*)&Process->VadFreeHint, + &StartAddress); + ASSERT(NT_SUCCESS(Status)); + } + else + { + /* This (rather easy) code path is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); + + /* A VAD can now be allocated. Do so and zero it out */ + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'ldaV'); + ASSERT(Vad); + RtlZeroMemory(Vad, sizeof(MMVAD)); + + /* Write all the data required in the VAD for handling a fault */ + Vad->StartingVpn = StartAddress >> PAGE_SHIFT; + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; + Vad->ControlArea = ControlArea; + Vad->u.VadFlags.Protection = ProtectionMask; + Vad->u2.VadFlags2.FileOffset = SectionOffset->QuadPart >> 16; + Vad->u2.VadFlags2.Inherit = (InheritDisposition == ViewShare); + if ((AllocationType & SEC_NO_CHANGE) || (Section->u.Flags.NoChange)) + { + /* This isn't really implemented yet, but handle setting the flag */ + Vad->u.VadFlags.NoChange = 1; + Vad->u2.VadFlags2.SecNoChange = 1; + } + + /* Finally, write down the first and last prototype PTE */ + Vad->FirstPrototypePte = &Subsection->SubsectionBase[PteOffset]; + PteOffset += (Vad->EndingVpn - Vad->StartingVpn); + Vad->LastContiguousPte = &Subsection->SubsectionBase[PteOffset]; + + /* Make sure the last PTE is valid and still within the subsection */ + ASSERT(PteOffset < Subsection->PtesInSubsection); + ASSERT(Vad->FirstPrototypePte <= Vad->LastContiguousPte); + + /* FIXME: Should setup VAD bitmap */ + Status = STATUS_SUCCESS; + + /* Pretend as if we own the working set */ + MiLockProcessWorkingSet(Process, Thread); + + /* Insert the VAD */ + MiInsertVad(Vad, Process); + + /* Release the working set */ + MiUnlockProcessWorkingSet(Process, Thread); + + /* Windows stores this for accounting purposes, do so as well */ + if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; + + /* Finally, let the caller know where, and for what size, the view was mapped */ + *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; + *BaseAddress = (PVOID)StartAddress; return STATUS_SUCCESS; } @@ -668,6 +821,146 @@ return Status; } +/* + * @implemented + */ +NTSTATUS +NTAPI +MmMapViewOfArm3Section(IN PVOID SectionObject, + IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PSIZE_T ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect) +{ + KAPC_STATE ApcState; + BOOLEAN Attached = FALSE; + PSECTION Section; + PCONTROL_AREA ControlArea; + ULONG ProtectionMask; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the segment and control area */ + Section = (PSECTION)SectionObject; + ControlArea = Section->Segment->ControlArea; + + /* These flags/states are not yet supported by ARM3 */ + ASSERT(Section->u.Flags.Image == 0); + ASSERT(Section->u.Flags.NoCache == 0); + ASSERT(Section->u.Flags.WriteCombined == 0); + ASSERT((AllocationType & MEM_RESERVE) == 0); + ASSERT(ControlArea->u.Flags.PhysicalMemory == 0); + + +#if 0 + /* FIXME: Check if the mapping protection is compatible with the create */ + if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect)) + { + DPRINT1("Mapping protection is incompatible\n"); + return STATUS_SECTION_PROTECTION; + } +#endif + + /* Check if the offset and size would cause an overflow */ + if ((SectionOffset->QuadPart + *ViewSize) < SectionOffset->QuadPart) + { + DPRINT1("Section offset overflows\n"); + return STATUS_INVALID_VIEW_SIZE; + } + + /* Check if the offset and size are bigger than the section itself */ + if ((SectionOffset->QuadPart + *ViewSize) > Section->SizeOfSection.QuadPart) + { + DPRINT1("Section offset is larger than section\n"); + return STATUS_INVALID_VIEW_SIZE; + } + + /* Check if the caller did not specify a view size */ + if (!(*ViewSize)) + { + /* Compute it for the caller */ + *ViewSize = Section->SizeOfSection.QuadPart - SectionOffset->QuadPart; + + /* Check if it's larger than 4GB or overflows into kernel-mode */ + if ((*ViewSize > 0xFFFFFFFF) || + (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)*BaseAddress) < *ViewSize)) + { + DPRINT1("Section view won't fit\n"); + return STATUS_INVALID_VIEW_SIZE; + } + } + + /* Check if the commit size is larger than the view size */ + if (CommitSize > *ViewSize) + { + DPRINT1("Attempting to commit more than the view itself\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check if the view size is larger than the section */ + if (*ViewSize > Section->SizeOfSection.QuadPart) + { + DPRINT1("The view is larger than the section\n"); + return STATUS_INVALID_VIEW_SIZE; + } + + /* Compute and validate the protection mask */ + ProtectionMask = MiMakeProtectionMask(Protect); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("The protection is invalid\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* We only handle pagefile-backed sections, which cannot be writecombined */ + if (Protect & PAGE_WRITECOMBINE) + { + DPRINT1("Cannot write combine a pagefile-backed section\n"); + return STATUS_INVALID_PARAMETER_10; + } + + /* Start by attaching to the current process if needed */ + if (PsGetCurrentProcess() != Process) + { + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + /* Lock the address space and make sure the process is alive */ + MmLockAddressSpace(&Process->Vm); + if (!Process->VmDeleted) + { + /* Do the actual mapping */ + Status = MiMapViewOfDataSection(ControlArea, + Process, + BaseAddress, + SectionOffset, + ViewSize, + Section, + InheritDisposition, + ProtectionMask, + CommitSize, + ZeroBits, + AllocationType); + } + else + { + /* The process is being terminated, fail */ + DPRINT1("The process is dying\n"); + Status = STATUS_PROCESS_IS_TERMINATING; + } + + /* Unlock the address space and detatch if needed, then return status */ + MmUnlockAddressSpace(&Process->Vm); + if (Attached) KeUnstackDetachProcess(&ApcState); + return Status; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Tue Oct 5 14:36:09 2010 @@ -121,6 +121,28 @@ /* Do the actual insert operation */ MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + + /* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */ + if (Vad->u.VadFlags.Spare == 0) + { + NTSTATUS Status; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + SIZE_T Size; + PVOID AllocatedBase = (PVOID)(Vad->StartingVpn << PAGE_SHIFT); + BoundaryAddressMultiple.QuadPart = 0; + Size = ((Vad->EndingVpn + 1) - Vad->StartingVpn) << PAGE_SHIFT; + Status = MmCreateMemoryArea(&Process->Vm, + MEMORY_AREA_OWNED_BY_ARM3, + &AllocatedBase, + Size, + PAGE_READWRITE, + &MemoryArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(NT_SUCCESS(Status)); + } } VOID @@ -179,6 +201,112 @@ /* Nothing found */ return NULL; +} + +PMMADDRESS_NODE +NTAPI +MiGetNextNode(IN PMMADDRESS_NODE Node) +{ + PMMADDRESS_NODE Parent; + + /* Get the right child */ + if (RtlRightChildAvl(Node)) + { + /* Get left-most child */ + Node = RtlRightChildAvl(Node); + while (RtlLeftChildAvl(Node)) Node = RtlLeftChildAvl(Node); + return Node; + } + + Parent = RtlParentAvl(Node); + ASSERT(Parent != NULL); + while (Parent != Node) + { + /* The parent should be a left child, return the real predecessor */ + if (RtlIsLeftChildAvl(Node)) + { + /* Return it */ + return Parent; + } + + /* Keep lopping until we find our parent */ + Node = Parent; + Parent = RtlParentAvl(Node); + } + + /* Nothing found */ + return NULL; +} + +NTSTATUS +NTAPI +MiFindEmptyAddressRangeInTree(IN SIZE_T Length, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PMMADDRESS_NODE *PreviousVad, + OUT PULONG_PTR Base) +{ + PMMADDRESS_NODE Node; + PMMADDRESS_NODE NextNode; + ULONG_PTR StartingVpn, HighestVpn, AlignmentVpn, LengthVpn, LowVpn; + ASSERT(Length != 0); + + /* Precompute page numbers for the length, alignment, and starting address */ + LengthVpn = (Length + (PAGE_SIZE - 1)) >> PAGE_SHIFT; + AlignmentVpn = Alignment >> PAGE_SHIFT; + StartingVpn = ROUND_DOWN((ULONG_PTR)MM_LOWEST_USER_ADDRESS >> PAGE_SHIFT, + AlignmentVpn); + + /* Check if the table is free, so the lowest possible address is available */ + if (!Table->NumberGenericTableElements) goto FoundAtBottom; + + /* Otherwise, follow the leftmost child of the right root node's child */ + Node = RtlRightChildAvl(&Table->BalancedRoot); + while (RtlLeftChildAvl(Node)) Node = RtlLeftChildAvl(Node); + + /* This is the node for the remaining gap at the bottom, can it be used? */ + if ((Node->StartingVpn > StartingVpn) && + (LengthVpn < Node->StartingVpn - StartingVpn)) + { +FoundAtBottom: + /* Use this VAD to store the allocation */ + *PreviousVad = NULL; + *Base = StartingVpn << PAGE_SHIFT; + return STATUS_SUCCESS; + } + + /* Otherwise, we start a search to find a gap */ + while (TRUE) + { + /* The last aligned page number in this entry */ + LowVpn = ROUND_DOWN(Node->EndingVpn + 1, AlignmentVpn); + + /* Keep going as long as there's still a next node */ + NextNode = MiGetNextNode(Node); + if (!NextNode) break; + + /* Can this allocation fit in this node? */ + if ((LengthVpn <= (NextNode->StartingVpn - LowVpn)) && + (NextNode->StartingVpn > LowVpn)) + { +Found: + /* Yes! Use this VAD to store the allocation */ + *PreviousVad = Node; + *Base = ROUND_DOWN((Node->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1), + Alignment); + return STATUS_SUCCESS; + } + + /* Try the next node */ + Node = NextNode; + } + + /* We're down to the last (top) VAD, will this allocation fit inside it? */ + HighestVpn = ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) >> PAGE_SHIFT; + if ((HighestVpn > LowVpn) && (LengthVpn <= HighestVpn - LowVpn)) goto Found; + + /* Nyet, there's no free address space for this allocation, so we'll fail */ + return STATUS_NO_MEMORY; } TABLE_SEARCH_RESULT Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Oct 5 14:36:09 2010 @@ -3956,7 +3956,19 @@ - +NTSTATUS +NTAPI +MmMapViewOfArm3Section(IN PVOID SectionObject, + IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PSIZE_T ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect); + /********************************************************************** * NAME EXPORTED * MmMapViewOfSection @@ -4023,6 +4035,20 @@ ULONG ViewOffset; NTSTATUS Status = STATUS_SUCCESS; + if ((ULONG_PTR)SectionObject & 1) + { + return MmMapViewOfArm3Section((PVOID)((ULONG_PTR)SectionObject & ~1), + Process, + BaseAddress, + ZeroBits, + CommitSize, + SectionOffset, + ViewSize, + InheritDisposition, + AllocationType, + Protect); + } + ASSERT(Process); if (!Protect || Protect & ~PAGE_FLAGS_VALID_FOR_SECTION) @@ -4280,10 +4306,10 @@ PROS_SECTION_OBJECT Section; PMMSUPPORT AddressSpace; NTSTATUS Status; - + PAGED_CODE(); + if ((ULONG_PTR)SectionObject & 1) { - PAGED_CODE(); extern PVOID MmSession; return MiMapViewInSystemSpace((PVOID)((ULONG_PTR)SectionObject & ~1), &MmSession,

1 0

[akhaldi] 48996: [CMAKE] Alexey Komarov: - More work on base modules. - Add some dlls to build.
by akhaldi＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: akhaldi Date: Tue Oct 5 13:03:47 2010 New Revision: 48996 URL: http://svn.reactos.org/svn/reactos?rev=48996&view=rev Log: [CMAKE] Alexey Komarov: - More work on base modules. - Add some dlls to build. Added: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt (with props) branches/cmake-bringup/base/services/eventlog/CMakeLists.txt (with props) branches/cmake-bringup/base/services/rpcss/CMakeLists.txt (with props) branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt (with props) branches/cmake-bringup/base/services/svchost/CMakeLists.txt (with props) branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt (with props) branches/cmake-bringup/base/services/telnetd/CMakeLists.txt (with props) branches/cmake-bringup/base/services/tftpd/CMakeLists.txt (with props) branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt (with props) branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/reactos/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/setup/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/welcome/CMakeLists.txt (with props) branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/version/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/CMakeLists.txt branches/cmake-bringup/base/services/CMakeLists.txt branches/cmake-bringup/base/setup/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt Modified: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,6 +1,6 @@ add_subdirectory(applications) -#add_subdirectory(services) +add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) add_subdirectory(system) Modified: branches/cmake-bringup/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/CMa… ============================================================================== --- branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,11 +1,11 @@ -#add_subdirectory(audiosrv) -#add_subdirectory(eventlog) +add_subdirectory(audiosrv) +add_subdirectory(eventlog) #add_subdirectory(rpcss) -#add_subdirectory(spoolsv) -#add_subdirectory(svchost) -#add_subdirectory(tcpsvcs) -#add_subdirectory(telnetd) -#add_subdirectory(tftpd) -#add_subdirectory(umpnpmgr) -#add_subdirectory(wlansvc) +add_subdirectory(spoolsv) +add_subdirectory(svchost) +add_subdirectory(tcpsvcs) +add_subdirectory(telnetd) +add_subdirectory(tftpd) +add_subdirectory(umpnpmgr) +add_subdirectory(wlansvc) Added: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/aud… ============================================================================== --- branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,15 @@ + +set_unicode(audiosrv yes) + +add_executable(audiosrv + main.c + pnp_list_manager.c + pnp_list_lock.c + pnp.c + services.c + debug.c + audiosrv.rc) + +set_module_type(audiosrv win32cui) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt) + Propchange: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,21 @@ + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +set_unicode() + +list(APPEND SOURCE + eventlog.c + logport.c + eventlog.rc + rpc.c + file.c) + +add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE}) + +target_link_libraries(eventlog eventlogrpc_server pseh) + +add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) + +set_module_type(eventlog win32cui) + +add_importlibs(eventlog advapi32 rpcrt4 msvcrt) Propchange: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,19 @@ + +set_unicode() + +add_executable(rpcss + epmp.c + irotp.c + rpcss_main.c + service_main.c + epm.idl + irot.idl + rpcss.rc) + +target_link_libraries(rpcss rpcss_epm_server rpcss_irot_server pseh) + +add_pch(rpcss ${CMAKE_CURRENT_SOURCE_DIR}/rpcss.h ${SOURCE}) + +set_module_type(rpcss win32cui) + +add_importlibs(rpcss advapi32 rpcrt4 msvcrt) Propchange: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/spo… ============================================================================== --- branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(spoolsv spoolsv.c spoolsv.rc) + +target_link_libraries(spoolsv wine) + +set_module_type(spoolsv win32cui) +add_importlibs(spoolsv advapi32 msvcrt) Propchange: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/svc… ============================================================================== --- branches/cmake-bringup/base/services/svchost/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,5 @@ + +add_executable(svchost svchost.c svchost.rc) + +set_module_type(svchost win32cui) +add_importlibs(svchost advapi32 msvcrt) Propchange: branches/cmake-bringup/base/services/svchost/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tcp… ============================================================================== --- branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,20 @@ + +set_unicode() + +list(APPEND SOURCE + tcpsvcs.c + skelserver.c + echo.c + discard.c + daytime.c + qotd.c + chargen.c + tcpsvcs.rc + log.c) + +add_executable(tcpsvcs ${CMAKE_CURRENT_BINARY_DIR}/tcpsvcs_tcpsvcs.h.gch ${SOURCE}) + +add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE}) +set_module_type(tcpsvcs win32cui) +add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt) + Propchange: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tel… ============================================================================== --- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,11 @@ + +add_executable(telnetd + telnetd.c + serviceentry.c + telnetd.rc) + +target_link_libraries(telnetd wine) + +set_module_type(telnetd win32cui) +add_importlibs(telnetd advapi32 ws2_32 msvcrt) + Propchange: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/tftpd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tft… ============================================================================== --- branches/cmake-bringup/base/services/tftpd/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/tftpd/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,7 @@ + +add_executable(tftpd tftpd.cpp) + +target_link_libraries(tftpd wine) + +set_module_type(tftpd win32cui) +add_importlibs(tftpd advapi32 ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/services/tftpd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,16 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc) + +target_link_libraries(umpnpmgr pnp_server wdmguid pseh) + +set_module_type(umpnpmgr win32cui) +add_importlibs(umpnpmgr + advapi32 + rpcrt4 + userenv + msvcrt) Propchange: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,14 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +add_executable(wlansvc wlansvc.c rpcserver.c) + +target_link_libraries(wlansvc wlansvc_server pseh) + +set_module_type(wlansvc win32cui) +add_importlibs(wlansvc + advapi32 + rpcrt4 + iphlpapi + msvcrt) Propchange: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/CMakeL… ============================================================================== --- branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,6 +1,6 @@ -#add_subdirectory(reactos) -#add_subdirectory(setup) +add_subdirectory(reactos) +add_subdirectory(setup) add_subdirectory(usetup) -#add_subdirectory(vmwinst) -#add_subdirectory(welcome) +add_subdirectory(vmwinst) +add_subdirectory(welcome) Added: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,16 @@ + +set_unicode() + +add_executable(reactos + reactos.c + reactos.rc) + +target_link_libraries(reactos uuid) + +set_module_type(reactos win32gui) +add_importlibs(reactos + gdi32 + user32 + comctl32 + setupapi + msvcrt) Propchange: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/setup/… ============================================================================== --- branches/cmake-bringup/base/setup/setup/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(setup + setup.c + setup.rc) + +set_module_type(setup win32gui) +add_importlibs(setup userenv msvcrt) Propchange: branches/cmake-bringup/base/setup/setup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,19 @@ + +set_unicode() + +add_executable(vmwinst + vmwinst.c + vmwinst.rc) + +target_link_libraries(vmwinst pseh) + +set_module_type(vmwinst win32gui) +add_importlibs(vmwinst + advapi32 + comctl32 + comdlg32 + newdev + user32 + setupapi + shell32 + msvcrt) Propchange: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(welcome + welcome.c + welcome.rc) + +set_module_type(welcome win32gui) +add_importlibs(welcome gdi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) add_subdirectory(explorer) -#add_subdirectory(explorer_new) +add_subdirectory(explorer-new) Added: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,34 @@ + +set_unicode() + +add_definitions(-DWIN32) + +list(APPEND SOURCE + desktop.c + dragdrop.c + explorer.c + startmnu.c + taskband.c + taskswnd.c + tbsite.c + trayntfy.c + trayprop.c + traywnd.c + explorer.rc) + +add_executable(explorer_new ${CMAKE_CURRENT_BINARY_DIR}/explorer_new_precomp.h.gch ${SOURCE}) + +target_link_libraries(explorer_new uuid) + +add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +set_module_type(explorer_new win32gui) +add_importlibs(explorer_new + advapi32 + gdi32 + user32 + comctl32 + ole32 + oleaut32 + shell32 + shlwapi + msvcrt) Propchange: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -192,11 +192,11 @@ add_subdirectory(url) #add_subdirectory(urlmon) add_subdirectory(user32) -#add_subdirectory(userenv) +add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) -#add_subdirectory(vdmdbg) -#add_subdirectory(version) +add_subdirectory(vdmdbg) +add_subdirectory(version) add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) #add_subdirectory(winemp3.acm) Added: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv… ============================================================================== --- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,28 @@ + +spec2def(userenv ${CMAKE_CURRENT_SOURCE_DIR}/userenv.spec ${CMAKE_CURRENT_BINARY_DIR}/userenv.def) + +list(APPEND SOURCE + desktop.c + directory.c + environment.c + gpolicy.c + misc.c + profile.c + registry.c + setup.c + userenv.c + userenv.rc) + +add_library(userenv SHARED + ${CMAKE_CURRENT_BINARY_DIR}/userenv_precomp.h.gch + ${SOURCE}) + +set_module_type(userenv win32dll) + +target_link_libraries(userenv + ${CMAKE_CURRENT_BINARY_DIR}/userenv.def + uuid) + +add_importlibs(userenv advapi32 user32 kernel32 ntdll) +add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(userenv userenv_def) Propchange: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,18 @@ + +set_unicode() + +spec2def(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.spec ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) + +list(APPEND SOURCE vdmdbg.c) + +add_library(vdmdbg SHARED + ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch + ${SOURCE}) + +set_module_type(vdmdbg win32dll) + +target_link_libraries(vdmdbg ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) + +add_importlibs(vdmdbg kernel32 ntdll) +add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) +add_dependencies(vdmdbg vdmdbg_def) Propchange: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,20 @@ + +add_definitions(-D__WINESRC__) +spec2def(version ${CMAKE_CURRENT_SOURCE_DIR}/version.spec ${CMAKE_CURRENT_BINARY_DIR}/version.def) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(version SHARED + info.c + install.c + resource.c + version.rc) + +set_entrypoint(version 0) + +target_link_libraries(version + ${CMAKE_CURRENT_BINARY_DIR}/version.def + wine) + +add_importlibs(version lz32 kernel32 ntdll) +add_dependencies(version version_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/version/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -33,4 +33,4 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) -add_dependencies(wdmaud.drv wdmaud.drv_def psdk) +add_dependencies(wdmaud.drv wdmaud.drv_def) Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -24,4 +24,4 @@ wine) add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll) -add_dependencies(wuapi wuapi_def psdk buildno_header) +add_dependencies(wuapi wuapi_def)

1 0

[akhaldi] 48995: [CMAKE] - Improve mciwave and mmdrv.
by akhaldi＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: akhaldi Date: Tue Oct 5 12:43:23 2010 New Revision: 48995 URL: http://svn.reactos.org/svn/reactos?rev=48995&view=rev Log: [CMAKE] - Improve mciwave and mmdrv. Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… ============================================================================== --- branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Tue Oct 5 12:43:23 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) add_definitions(-D_DLL -D__USE_CRTIMP) @@ -11,14 +9,11 @@ add_library(mciwave SHARED mciwave.c) -set_target_properties(mciwave PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mciwave 0) target_link_libraries(mciwave ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def - wine - -lwinmm - mingw_common - -luser32 - -lmsvcrt) + wine) -add_dependencies(mciwave mciwave_def psdk) +add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll) +add_dependencies(mciwave mciwave_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Tue Oct 5 12:43:23 2010 @@ -1,8 +1,7 @@ - +set_unicode() add_definitions(-DNDEBUG) -add_definitions(-DUNICODE -D_UNICODE) spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) @@ -15,12 +14,9 @@ wave.c wave_io.c) -set_target_properties(mmdrv PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mmdrv 0) -target_link_libraries(mmdrv - ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def - -lwinmm - -luser32 - -lkernel32) +target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) -add_dependencies(mmdrv mmdrv_def psdk) +add_importlibs(mmdrv winmm user32 kernel32 ntdll) +add_dependencies(mmdrv mmdrv_def psdk buildno_header)

1 0

[fireball] 48994: [HEAP] - Move on to using a real HEAP_LOCK structure for a heap lock. - Implement kernel-mode counterparts of this lock too. Right now these don't introduce much of a difference, ...
by fireball＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: fireball Date: Tue Oct 5 12:42:55 2010 New Revision: 48994 URL: http://svn.reactos.org/svn/reactos?rev=48994&view=rev Log: [HEAP] - Move on to using a real HEAP_LOCK structure for a heap lock. - Implement kernel-mode counterparts of this lock too. Right now these don't introduce much of a difference, but they are going to be properly used by the new heap manager code. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/include/ndk/rtltypes.h trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Tue Oct 5 12:42:55 2010 @@ -113,33 +113,33 @@ NTSTATUS NTAPI RtlDeleteHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlDeleteCriticalSection(CriticalSection); + PHEAP_LOCK Lock) +{ + return RtlDeleteCriticalSection(&Lock->CriticalSection); } NTSTATUS NTAPI RtlEnterHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlEnterCriticalSection(CriticalSection); + PHEAP_LOCK Lock) +{ + return RtlEnterCriticalSection(&Lock->CriticalSection); } NTSTATUS NTAPI RtlInitializeHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlInitializeCriticalSection(CriticalSection); + PHEAP_LOCK Lock) +{ + return RtlInitializeCriticalSection(&Lock->CriticalSection); } NTSTATUS NTAPI RtlLeaveHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - return RtlLeaveCriticalSection(CriticalSection ); + PHEAP_LOCK Lock) +{ + return RtlLeaveCriticalSection(&Lock->CriticalSection); } PVOID Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Tue Oct 5 12:42:55 2010 @@ -1038,6 +1038,21 @@ } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; #endif + +// +// RTL Private Heap Structures +// +typedef struct _HEAP_LOCK +{ + union + { + RTL_CRITICAL_SECTION CriticalSection; +#ifndef NTOS_MODE_USER + ERESOURCE Resource; +#endif + UCHAR Padding[0x68]; /* Max ERESOURCE size for x64 build. Needed because RTL is built only once */ + }; +} HEAP_LOCK, *PHEAP_LOCK; // // RTL Range List Structures Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Tue Oct 5 12:42:55 2010 @@ -157,36 +157,35 @@ NTSTATUS NTAPI RtlDeleteHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); + PHEAP_LOCK Lock) +{ + ExDeleteResource(&Lock->Resource); return STATUS_SUCCESS; } NTSTATUS NTAPI RtlEnterHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); + PHEAP_LOCK Lock) +{ + return ExAcquireResourceExclusive(&Lock->Resource, TRUE); +} + +NTSTATUS +NTAPI +RtlInitializeHeapLock( + PHEAP_LOCK Lock) +{ + ExInitializeResource(&Lock->Resource); return STATUS_SUCCESS; } NTSTATUS NTAPI -RtlInitializeHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI RtlLeaveHeapLock( - PRTL_CRITICAL_SECTION CriticalSection) -{ - ASSERT(FALSE); + PHEAP_LOCK Lock) +{ + ExReleaseResource(&Lock->Resource); return STATUS_SUCCESS; }

1 0

[sir_richard] 48993: [NTOS]: Add the tiny little bit of code required to correctly handle user-mode faults on ARM3 mapped sections in certain limited scenarios.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 08:14:02 2010 New Revision: 48993 URL: http://svn.reactos.org/svn/reactos?rev=48993&view=rev Log: [NTOS]: Add the tiny little bit of code required to correctly handle user-mode faults on ARM3 mapped sections in certain limited scenarios. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Oct 5 08:14:02 2010 @@ -27,6 +27,7 @@ OUT PMMVAD *ProtoVad) { PMMVAD Vad; + PMMPTE PointerPte; /* No prototype/section support for now */ *ProtoVad = NULL; @@ -50,15 +51,33 @@ *ProtectCode = MM_NOACCESS; return NULL; } - - /* This must be a TEB/PEB VAD */ - ASSERT(Vad->u.VadFlags.PrivateMemory == TRUE); - ASSERT(Vad->u.VadFlags.MemCommit == TRUE); + + /* This must be a VM VAD */ ASSERT(Vad->u.VadFlags.VadType == VadNone); - /* Return the protection on it */ - *ProtectCode = Vad->u.VadFlags.Protection; - return NULL; + /* Check if it's a section, or just an allocation */ + if (Vad->u.VadFlags.PrivateMemory == TRUE) + { + /* This must be a TEB/PEB VAD */ + ASSERT(Vad->u.VadFlags.MemCommit == TRUE); + *ProtectCode = Vad->u.VadFlags.Protection; + return NULL; + } + else + { + /* Return the proto VAD */ + ASSERT(Vad->u2.VadFlags2.ExtendableFile == 0); + *ProtoVad = Vad; + + /* Get the prototype PTE for this page */ + PointerPte = (((ULONG_PTR)VirtualAddress >> PAGE_SHIFT) - Vad->StartingVpn) + Vad->FirstPrototypePte; + ASSERT(PointerPte <= Vad->LastContiguousPte); + ASSERT(PointerPte != NULL); + + /* Return the Prototype PTE and the protection for the page mapping */ + *ProtectCode = Vad->u.VadFlags.Protection; + return PointerPte; + } } NTSTATUS @@ -482,8 +501,8 @@ } else { + /* Resolve the fault -- this will release the PFN lock */ ASSERT(PointerPte->u.Hard.Valid == 0); - /* Resolve the fault -- this will release the PFN lock */ Status = MiResolveProtoPteFault(StoreInstruction, Address, PointerPte, @@ -505,15 +524,14 @@ } else { - /* We currently only handle the shared user data PTE path */ + /* We currently only handle very limited paths */ ASSERT(PointerPte->u.Soft.Prototype == 1); ASSERT(PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED); - ASSERT(Vad == NULL); /* Lock the PFN database */ LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* For the shared data page, this should be true */ + /* For our current usage, this should be true */ ASSERT(SuperProtoPte->u.Hard.Valid == 1); ASSERT(TempPte.u.Hard.Valid == 0); @@ -972,8 +990,9 @@ } else { - /* The only "prototype PTE" we support is the shared user data path */ - ASSERT(ProtectionCode == MM_READONLY); + /* No guard page support yet */ + ASSERT((ProtectionCode & MM_DECOMMIT) == 0); + ASSERT(ProtectionCode != 0x100); /* Write the prototype PTE */ TempPte = PrototypePte; @@ -991,7 +1010,7 @@ Vad); ASSERT(Status == STATUS_PAGE_FAULT_TRANSITION); ASSERT(PointerPte->u.Hard.Valid == 1); - ASSERT(PointerPte->u.Hard.PageFrameNumber == MmSharedUserDataPte->u.Hard.PageFrameNumber); + ASSERT(PointerPte->u.Hard.PageFrameNumber != 0); } /* Release the working set */

1 0

[sir_richard] 48992: [NTOS]: Delete deprecated handling of MEMORY_AREA_IO_MAPPING. Delete all MEMORY_AREA definitions except the ones for SEGMENT_VIEW and VIRTUAL_MEMORY. All other memory is now ow...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 05:07:13 2010 New Revision: 48992 URL: http://svn.reactos.org/svn/reactos?rev=48992&view=rev Log: [NTOS]: Delete deprecated handling of MEMORY_AREA_IO_MAPPING. Delete all MEMORY_AREA definitions except the ones for SEGMENT_VIEW and VIRTUAL_MEMORY. All other memory is now owned by ARM3! [NTOS]: Delete WriteCopyView flag from MEMORY_AREA (unused, and was taking up 4 bytes due to alignment), and add a Vad pointer (takes up 4 bytes -- no actual size change). [NTOS]: For VM and Section MEMORY_AREAs mapped in user-mode, build a "fake" VAD and insert it into the VAD Root of the Process. This means there is now a consistent view between ARM3 and RosMm in terms of user-mode address space layout, which will come in handy later. [NTOS]: Destroy the MEMORY_AREA's VAD when the MEMORY_AREA itself is deleted. Watch out for the scenario explained in a previous check-in, where the VAD was caught by the MmCleanProcessAddressSpace vad-cleanup-loop. [NTOS]: Implement MiInsertVad to restore the old functionality of MiInsertNode when the current parent and insertion result is not yet known. It obtains the information and calls MiInsertNode. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Oct 5 05:07:13 2010 @@ -76,20 +76,8 @@ #define MI_STATIC_MEMORY_AREAS (13) #endif -#define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) -#define MEMORY_AREA_CONTINUOUS_MEMORY (2) -#define MEMORY_AREA_NO_CACHE (3) -#define MEMORY_AREA_IO_MAPPING (4) -#define MEMORY_AREA_SYSTEM (5) -#define MEMORY_AREA_MDL_MAPPING (7) #define MEMORY_AREA_VIRTUAL_MEMORY (8) -#define MEMORY_AREA_CACHE_SEGMENT (9) -#define MEMORY_AREA_SHARED_DATA (10) -#define MEMORY_AREA_KERNEL_STACK (11) -#define MEMORY_AREA_PAGED_POOL (12) -#define MEMORY_AREA_NO_ACCESS (13) -#define MEMORY_AREA_PEB_OR_TEB (14) #define MEMORY_AREA_OWNED_BY_ARM3 (15) #define MEMORY_AREA_STATIC (0x80000000) @@ -278,6 +266,7 @@ ULONG Flags; BOOLEAN DeleteInProgress; ULONG PageOpCount; + PVOID Vad; union { struct @@ -285,7 +274,6 @@ ROS_SECTION_OBJECT* Section; ULONG ViewOffset; PMM_SECTION_SEGMENT Segment; - BOOLEAN WriteCopyView; LIST_ENTRY RegionListHead; } SectionData; struct Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Tue Oct 5 05:07:13 2010 @@ -93,14 +93,34 @@ VOID NTAPI -MiInsertNode( - IN PMM_AVL_TABLE Table, - IN PMMADDRESS_NODE NewNode, - PMMADDRESS_NODE Parent, - TABLE_SEARCH_RESULT Result) +MiInsertNode(IN PMM_AVL_TABLE Table, + IN PMMADDRESS_NODE NewNode, + IN PMMADDRESS_NODE Parent, + IN TABLE_SEARCH_RESULT Result) { /* Insert it into the tree */ RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); +} + +VOID +NTAPI +MiInsertVad(IN PMMVAD Vad, + IN PEPROCESS Process) +{ + TABLE_SEARCH_RESULT Result; + PMMADDRESS_NODE Parent = NULL; + + /* Validate the VAD and set it as the current hint */ + ASSERT(Vad->EndingVpn >= Vad->StartingVpn); + Process->VadRoot.NodeHint = Vad; + + /* Find the parent VAD and where this child should be inserted */ + Result = RtlpFindAvlTableNodeOrParent(&Process->VadRoot, (PVOID)Vad->StartingVpn, &Parent); + ASSERT(Result != TableFoundNode); + ASSERT((Parent != NULL) || (Result == TableEmptyTree)); + + /* Do the actual insert operation */ + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); } VOID @@ -163,13 +183,12 @@ TABLE_SEARCH_RESULT NTAPI -MiFindEmptyAddressRangeDownTree( - IN SIZE_T Length, - IN ULONG_PTR BoundaryAddress, - IN ULONG_PTR Alignment, - IN PMM_AVL_TABLE Table, - OUT PULONG_PTR Base, - OUT PMMADDRESS_NODE *Parent) +MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, + IN ULONG_PTR BoundaryAddress, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PULONG_PTR Base, + OUT PMMADDRESS_NODE *Parent) { PMMADDRESS_NODE Node, LowestNode, Child; ULONG LowVpn, HighVpn; @@ -180,7 +199,7 @@ ASSERT(BoundaryAddress <= ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); /* Compute page length, make sure the boundary address is valid */ - Length = PAGE_ROUND_UP(Length); + Length = ROUND_TO_PAGES(Length); PageCount = Length >> PAGE_SHIFT; if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Oct 5 05:07:13 2010 @@ -407,6 +407,11 @@ } } +VOID +NTAPI +MiInsertVad(IN PMMVAD Vad, +IN PEPROCESS Process); + static VOID MmInsertMemoryArea( PMMSUPPORT AddressSpace, @@ -417,6 +422,26 @@ ULONG Depth = 0; MmVerifyMemoryAreas(AddressSpace); + + /* Build a lame VAD if this is a user-space allocation */ + if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) + { + ASSERT(marea->Type == MEMORY_AREA_VIRTUAL_MEMORY || marea->Type == MEMORY_AREA_SECTION_VIEW); + PMMVAD Vad; + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); + ASSERT(Vad); + RtlZeroMemory(Vad, sizeof(MMVAD)); + Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> PAGE_SHIFT; + Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) >> PAGE_SHIFT; + Vad->u.VadFlags.Spare = 1; + Vad->u.VadFlags.PrivateMemory = 1; + MiInsertVad(Vad, MmGetAddressSpaceOwner(AddressSpace)); + marea->Vad = Vad; + } + else + { + marea->Vad = NULL; + } if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) { @@ -702,6 +727,10 @@ } } +VOID +NTAPI +MiRemoveNode(IN PMMADDRESS_NODE Node, +IN PMM_AVL_TABLE Table); /** * @name MmFreeMemoryArea @@ -749,12 +778,6 @@ Address < (ULONG_PTR)EndAddress; Address += PAGE_SIZE) { - if (MemoryArea->Type == MEMORY_AREA_IO_MAPPING) - { - MmRawDeleteVirtualMapping((PVOID)Address); - } - else - { BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; PFN_NUMBER Page = 0; @@ -772,13 +795,28 @@ FreePage(FreePageContext, MemoryArea, (PVOID)Address, Page, SwapEntry, (BOOLEAN)Dirty); } - } } if (Process != NULL && Process != CurrentProcess) { KeDetachProcess(); + } + + if (MemoryArea->Vad) + { + ASSERT(MemoryArea->EndingAddress < MmSystemRangeStart); + ASSERT(MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY || MemoryArea->Type == MEMORY_AREA_SECTION_VIEW); + + /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */ + ASSERT(((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare != 0); + if (((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare == 1) + { + MiRemoveNode(MemoryArea->Vad, &Process->VadRoot); + } + + ExFreePool(MemoryArea->Vad); + MemoryArea->Vad = NULL; } }

1 0

[sir_richard] 48991: [NTOS]: Add a _64K macro definition so we can stop typing out 65536 all the time.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 05:01:15 2010 New Revision: 48991 URL: http://svn.reactos.org/svn/reactos?rev=48991&view=rev Log: [NTOS]: Add a _64K macro definition so we can stop typing out 65536 all the time. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue Oct 5 05:01:15 2010 @@ -55,6 +55,9 @@ #define _1KB (1024u) #define _1MB (1024 * _1KB) #define _1GB (1024 * _1MB) + +/* Everyone loves 64K */ +#define _64K (64 * _1KB) /* Area mapped by a PDE */ #define PDE_MAPPED_VA (PTE_COUNT * PAGE_SIZE) @@ -248,7 +251,7 @@ // // System views are binned into 64K chunks // -#define MI_SYSTEM_VIEW_BUCKET_SIZE 65536 +#define MI_SYSTEM_VIEW_BUCKET_SIZE _64K // // FIXFIX: These should go in ex.h after the pool merge @@ -1140,6 +1143,23 @@ OUT PMMADDRESS_NODE *Parent ); +NTSTATUS +NTAPI +MiFindEmptyAddressRangeInTree( + IN SIZE_T Length, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PMMADDRESS_NODE *PreviousVad, + OUT PULONG_PTR Base +); + +VOID +NTAPI +MiInsertVad( + IN PMMVAD Vad, + IN PEPROCESS Process +); + VOID NTAPI MiInsertNode(

1 0

[sir_richard] 48990: [NTOS]: Use the Spare flag in the VAD as a ReactOS/MemoryArea specific flag to signify that this VAD is associated with a MEMORY_AREA and should be unlinked at process exit, bu...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 05:00:19 2010 New Revision: 48990 URL: http://svn.reactos.org/svn/reactos?rev=48990&view=rev Log: [NTOS]: Use the Spare flag in the VAD as a ReactOS/MemoryArea specific flag to signify that this VAD is associated with a MEMORY_AREA and should be unlinked at process exit, but not freed. This is because MemoryAreas themselves are cleaned up later, and in the future their associated VADs (not yet in Trunk) will also be parsed. In the process death scenario, those VADs will be freed, but not unlinked (since it would already have been unlinked). Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Tue Oct 5 05:00:19 2010 @@ -125,7 +125,7 @@ /* Build the rest of the VAD now */ Vad->StartingVpn = (*Base) >> PAGE_SHIFT; - Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; + Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; Vad->u3.Secured.StartVpn = *Base; Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1); Vad->u1.Parent = NULL; @@ -1195,6 +1195,14 @@ /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); + /* Skip ARM3 fake VADs, they'll be freed by MmDeleteProcessAddresSpace */ + if (Vad->u.VadFlags.Spare == 1) + { + /* Set a flag so MmDeleteMemoryArea knows to free, but not to remove */ + Vad->u.VadFlags.Spare = 2; + continue; + } + /* Free the VAD memory */ ExFreePool(Vad); }

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