[NTOSKRNL]

[reactos.git] / reactos / ntoskrnl / mm / section.c

diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 4f0d75f..2dd55ee 100644 (file)
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -1761,17 +1761,12 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
                                    Region->Protect,
                                    &NewPage,
                                    1);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT("MmCreateVirtualMapping failed, not out of memory\n");
-       KeBugCheck(MEMORY_MANAGEMENT);
-      return(Status);
-   }
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("Unable to create virtual mapping\n");
-       KeBugCheck(MEMORY_MANAGEMENT);
-   }
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("MmCreateVirtualMapping failed, unable to create virtual mapping, not out of memory\n");
+        KeBugCheck(MEMORY_MANAGEMENT);
+        return(Status);
+    }
 
    /*
     * Unshare the old page.
@@ -2716,7 +2711,7 @@ MmCreatePhysicalMemorySection(VOID)
                             &Obj,
                             &SectionSize,
                             PAGE_EXECUTE_READWRITE,
-                            0,
+                            SEC_PHYSICALMEMORY,
                             NULL,
                             NULL);
    if (!NT_SUCCESS(Status))
@@ -2766,6 +2761,7 @@ MmInitSectionImplementation(VOID)
    ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection;
    ObjectTypeInitializer.CloseProcedure = MmpCloseSection;
    ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS;
+   ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK;
    ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType);
 
    MmCreatePhysicalMemorySection();
@@ -3785,7 +3781,7 @@ MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject,
          if(ImageSectionObject->Segments != NULL)
             ExFreePool(ImageSectionObject->Segments);
 
-         ExFreePool(ImageSectionObject);
+         ExFreePoolWithTag(ImageSectionObject, TAG_MM_SECTION_SEGMENT);
          ObDereferenceObject(Section);
          ObDereferenceObject(FileObject);
          return(StatusExeFmt);
@@ -4860,7 +4856,7 @@ MmCreateSection (OUT PVOID  * Section,
     PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section;
 
     /* Check if an ARM3 section is being created instead */
-    if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes))
+    if (!(AllocationAttributes & (SEC_IMAGE | SEC_PHYSICALMEMORY)))
     {
         if (!(FileObject) && !(FileHandle))
         {
@@ -4986,6 +4982,11 @@ MmCreateSection (OUT PVOID  * Section,
 #endif
     else
     {
+        if ((AllocationAttributes & SEC_PHYSICALMEMORY) == 0)
+        {
+            DPRINT1("Invalid path: %lx %p %p\n", AllocationAttributes, FileObject, FileHandle);
+        }
+//        ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY);
         Status = MmCreatePageFileSection(SectionObject,
                                          DesiredAccess,
                                          ObjectAttributes,
@@ -4997,133 +4998,4 @@ MmCreateSection (OUT PVOID  * Section,
     return Status;
 }
 
-VOID
-MmModifyAttributes(IN PMMSUPPORT AddressSpace,
-                   IN PVOID BaseAddress,
-                   IN SIZE_T RegionSize,
-                   IN ULONG OldType,
-                   IN ULONG OldProtect,
-                   IN ULONG NewType,
-                   IN ULONG NewProtect)
-{
-    //
-    // This function is deprecated but remains in order to support VirtualAlloc
-    // calls with MEM_COMMIT on top of MapViewOfFile calls with SEC_RESERVE.
-    //
-    // Win32k's shared user heap, for example, uses that mechanism. The two
-    // conditions when this function needs to do something are ASSERTed for,
-    // because they should not arise.
-    //
-    if (NewType == MEM_RESERVE && OldType == MEM_COMMIT)
-    {
-        ASSERT(FALSE);
-    }
-
-    if ((NewType == MEM_COMMIT) && (OldType == MEM_COMMIT))
-    {
-        ASSERT(OldProtect == NewProtect);
-    }
-}
-
-NTSTATUS
-NTAPI
-MiRosAllocateVirtualMemory(IN HANDLE ProcessHandle,
-                           IN PEPROCESS Process,
-                           IN PMEMORY_AREA MemoryArea,
-                           IN PMMSUPPORT AddressSpace,
-                           IN OUT PVOID* UBaseAddress,
-                           IN BOOLEAN Attached,
-                           IN OUT PSIZE_T URegionSize,
-                           IN ULONG AllocationType,
-                           IN ULONG Protect)
-{
-    ULONG_PTR PRegionSize;
-    ULONG Type, RegionSize;
-    NTSTATUS Status;
-    PVOID PBaseAddress, BaseAddress;
-    KAPC_STATE ApcState;
-
-    PBaseAddress = *UBaseAddress;
-    PRegionSize = *URegionSize;
-
-    BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress);
-    RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) -
-    PAGE_ROUND_DOWN(PBaseAddress);
-    Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE;
-
-    ASSERT(PBaseAddress != 0);
-    ASSERT(Type == MEM_COMMIT);
-    ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW);
-    ASSERT(((ULONG_PTR)BaseAddress + RegionSize) <= (ULONG_PTR)MemoryArea->EndingAddress);
-    ASSERT(((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress) >= RegionSize);
-    ASSERT(MemoryArea->Data.SectionData.RegionListHead.Flink);
-
-    Status = MmAlterRegion(AddressSpace,
-                           MemoryArea->StartingAddress,
-                           &MemoryArea->Data.SectionData.RegionListHead,
-                           BaseAddress,
-                           RegionSize,
-                           Type,
-                           Protect,
-                           MmModifyAttributes);
-
-    MmUnlockAddressSpace(AddressSpace);
-    if (Attached) KeUnstackDetachProcess(&ApcState);
-    if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process);
-    if (NT_SUCCESS(Status))
-    {
-        *UBaseAddress = BaseAddress;
-        *URegionSize = RegionSize;
-    }
-
-    return Status;
-}
-
-NTSTATUS
-NTAPI
-MiRosProtectVirtualMemory(IN PEPROCESS Process,
-                          IN OUT PVOID *BaseAddress,
-                          IN OUT PSIZE_T NumberOfBytesToProtect,
-                          IN ULONG NewAccessProtection,
-                          OUT PULONG OldAccessProtection OPTIONAL)
-{
-    PMEMORY_AREA MemoryArea;
-    PMMSUPPORT AddressSpace;
-    ULONG OldAccessProtection_;
-    NTSTATUS Status;
-
-    *NumberOfBytesToProtect = PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - PAGE_ROUND_DOWN(*BaseAddress);
-    *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress);
-
-    AddressSpace = &Process->Vm;
-    MmLockAddressSpace(AddressSpace);
-    MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress);
-    if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
-    {
-        MmUnlockAddressSpace(AddressSpace);
-        return STATUS_UNSUCCESSFUL;
-    }
-
-    if (OldAccessProtection == NULL) OldAccessProtection = &OldAccessProtection_;
-
-    if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)
-    {
-        Status = MmProtectSectionView(AddressSpace,
-                                      MemoryArea,
-                                      *BaseAddress,
-                                      *NumberOfBytesToProtect,
-                                      NewAccessProtection,
-                                      OldAccessProtection);
-    }
-    else
-    {
-        /* FIXME: Should we return failure or success in this case? */
-        Status = STATUS_CONFLICTING_ADDRESSES;
-    }
-
-    MmUnlockAddressSpace(AddressSpace);
-
-    return Status;
-}
-
 /* EOF */