[NTOSKRNL]
[reactos.git] / reactos / ntoskrnl / mm / section.c
index 596be8a..1a71d66 100644 (file)
@@ -45,9 +45,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>
-#ifdef NEWCC
+#include "../cache/newcc.h"
 #include "../cache/section/newmm.h"
-#endif
 #define NDEBUG
 #include <debug.h>
 #include <reactos/exeformat.h>
 #pragma alloc_text(INIT, MmInitSectionImplementation)
 #endif
 
+#include "ARM3/miarm.h"
+
+#undef MmSetPageEntrySectionSegment
+#define MmSetPageEntrySectionSegment(S,O,E) do { \
+       DPRINT("SetPageEntrySectionSegment(old,%x,%x,%x)\n", S,(O)->LowPart,E); \
+    _MmSetPageEntrySectionSegment(S,O,E,__FILE__,__LINE__); \
+       } while (0)
+
+extern MMSESSION MmSession;
+
 NTSTATUS
 NTAPI
 MiMapViewInSystemSpace(IN PVOID Section,
@@ -114,9 +123,11 @@ typedef struct
 {
    PROS_SECTION_OBJECT Section;
    PMM_SECTION_SEGMENT Segment;
-   ULONG Offset;
+   LARGE_INTEGER Offset;
    BOOLEAN WasDirty;
    BOOLEAN Private;
+   PEPROCESS CallingProcess;
+   ULONG_PTR SectionEntry;
 }
 MM_SECTION_PAGEOUT_CONTEXT;
 
@@ -150,21 +161,13 @@ static ULONG SectionCharacteristicsToProtect[16] =
     PAGE_EXECUTE_READWRITE, /* 15 = WRITABLE, READABLE, EXECUTABLE, SHARED */
 };
 
+ACCESS_MASK NTAPI MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection);
 static GENERIC_MAPPING MmpSectionMapping = {
          STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY,
          STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE,
          STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE,
          SECTION_ALL_ACCESS};
 
-#define PAGE_FROM_SSE(E)         ((E) & 0xFFFFF000)
-#define PFN_FROM_SSE(E)          ((E) >> PAGE_SHIFT)
-#define SHARE_COUNT_FROM_SSE(E)  (((E) & 0x00000FFE) >> 1)
-#define IS_SWAP_FROM_SSE(E)      ((E) & 0x00000001)
-#define MAX_SHARE_COUNT          0x7FF
-#define MAKE_SSE(P, C)           ((ULONG)(P) | ((C) << 1))
-#define SWAPENTRY_FROM_SSE(E)    ((E) >> 1)
-#define MAKE_SWAP_SSE(S)         (((ULONG)(S) << 1) | 0x1)
-
 static const INFORMATION_CLASS_INFO ExSectionInfoClass[] =
 {
   ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */
@@ -180,12 +183,12 @@ static const INFORMATION_CLASS_INFO ExSectionInfoClass[] =
       File Format Specification", revision 6.0 (February 1999)
 */
 NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader,
-                                 IN SIZE_T FileHeaderSize,
-                                 IN PVOID File,
-                                 OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject,
-                                 OUT PULONG Flags,
-                                 IN PEXEFMT_CB_READ_FILE ReadFileCb,
-                                 IN PEXEFMT_CB_ALLOCATE_SEGMENTS AllocateSegmentsCb)
+                                  IN SIZE_T FileHeaderSize,
+                                  IN PVOID File,
+                                  OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject,
+                                  OUT PULONG Flags,
+                                  IN PEXEFMT_CB_READ_FILE ReadFileCb,
+                                  IN PEXEFMT_CB_ALLOCATE_SEGMENTS AllocateSegmentsCb)
 {
     NTSTATUS nStatus;
     ULONG cbFileHeaderOffsetSize = 0;
@@ -228,32 +231,32 @@ NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader,
 
     /* image too small to be an MZ executable */
     if(FileHeaderSize < sizeof(IMAGE_DOS_HEADER))
-       DIE(("Too small to be an MZ executable, size is %lu\n", FileHeaderSize));
+        DIE(("Too small to be an MZ executable, size is %lu\n", FileHeaderSize));
 
     /* no MZ signature */
     if(pidhDosHeader->e_magic != IMAGE_DOS_SIGNATURE)
-       DIE(("No MZ signature found, e_magic is %hX\n", pidhDosHeader->e_magic));
+        DIE(("No MZ signature found, e_magic is %hX\n", pidhDosHeader->e_magic));
 
     /* not a Windows executable */
     if(pidhDosHeader->e_lfanew <= 0)
-       DIE(("Not a Windows executable, e_lfanew is %d\n", pidhDosHeader->e_lfanew));
+        DIE(("Not a Windows executable, e_lfanew is %d\n", pidhDosHeader->e_lfanew));
 
     /* NT HEADER */
     nStatus = STATUS_INVALID_IMAGE_FORMAT;
 
     if(!Intsafe_AddULong32(&cbFileHeaderOffsetSize, pidhDosHeader->e_lfanew, RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader)))
-       DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew));
+        DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew));
 
     if(FileHeaderSize < cbFileHeaderOffsetSize)
-       pinhNtHeader = NULL;
+        pinhNtHeader = NULL;
     else
     {
-       /*
-        * we already know that Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize),
-        * and FileHeaderSize >= cbFileHeaderOffsetSize, so this holds true too
-        */
-       ASSERT(Intsafe_CanOffsetPointer(FileHeader, pidhDosHeader->e_lfanew));
-       pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew);
+        /*
+         * we already know that Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize),
+         * and FileHeaderSize >= cbFileHeaderOffsetSize, so this holds true too
+         */
+        ASSERT(Intsafe_CanOffsetPointer(FileHeader, pidhDosHeader->e_lfanew));
+        pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew);
     }
 
     /*
@@ -263,74 +266,74 @@ NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader,
     if(FileHeaderSize < cbFileHeaderOffsetSize ||
        (UINT_PTR)pinhNtHeader % TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) != 0)
     {
-       ULONG cbNtHeaderSize;
-       ULONG cbReadSize;
-       PVOID pData;
+        ULONG cbNtHeaderSize;
+        ULONG cbReadSize;
+        PVOID pData;
 
 l_ReadHeaderFromFile:
-       cbNtHeaderSize = 0;
-       lnOffset.QuadPart = pidhDosHeader->e_lfanew;
+        cbNtHeaderSize = 0;
+        lnOffset.QuadPart = pidhDosHeader->e_lfanew;
 
-       /* read the header from the file */
-       nStatus = ReadFileCb(File, &lnOffset, sizeof(IMAGE_NT_HEADERS64), &pData, &pBuffer, &cbReadSize);
+        /* read the header from the file */
+        nStatus = ReadFileCb(File, &lnOffset, sizeof(IMAGE_NT_HEADERS64), &pData, &pBuffer, &cbReadSize);
 
-       if(!NT_SUCCESS(nStatus))
-           DIE(("ReadFile failed, status %08X\n", nStatus));
+        if(!NT_SUCCESS(nStatus))
+            DIE(("ReadFile failed, status %08X\n", nStatus));
 
-       ASSERT(pData);
-       ASSERT(pBuffer);
-       ASSERT(cbReadSize > 0);
+        ASSERT(pData);
+        ASSERT(pBuffer);
+        ASSERT(cbReadSize > 0);
 
-       nStatus = STATUS_INVALID_IMAGE_FORMAT;
+        nStatus = STATUS_INVALID_IMAGE_FORMAT;
 
-       /* the buffer doesn't contain the file header */
-       if(cbReadSize < RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader))
-           DIE(("The file doesn't contain the PE file header\n"));
+        /* the buffer doesn't contain the file header */
+        if(cbReadSize < RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader))
+            DIE(("The file doesn't contain the PE file header\n"));
 
-       pinhNtHeader = pData;
+        pinhNtHeader = pData;
 
-       /* object still not aligned: copy it to the beginning of the buffer */
-       if((UINT_PTR)pinhNtHeader % TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) != 0)
-       {
-           ASSERT((UINT_PTR)pBuffer % TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == 0);
-           RtlMoveMemory(pBuffer, pData, cbReadSize);
-           pinhNtHeader = pBuffer;
-       }
+        /* object still not aligned: copy it to the beginning of the buffer */
+        if((UINT_PTR)pinhNtHeader % TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) != 0)
+        {
+            ASSERT((UINT_PTR)pBuffer % TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == 0);
+            RtlMoveMemory(pBuffer, pData, cbReadSize);
+            pinhNtHeader = pBuffer;
+        }
 
-       /* invalid NT header */
-       nStatus = STATUS_INVALID_IMAGE_PROTECT;
+        /* invalid NT header */
+        nStatus = STATUS_INVALID_IMAGE_PROTECT;
 
-       if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE)
-           DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature));
+        if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE)
+            DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature));
 
-       nStatus = STATUS_INVALID_IMAGE_FORMAT;
+        nStatus = STATUS_INVALID_IMAGE_FORMAT;
 
-       if(!Intsafe_AddULong32(&cbNtHeaderSize, pinhNtHeader->FileHeader.SizeOfOptionalHeader, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader)))
-           DIE(("The full NT header is too large\n"));
+        if(!Intsafe_AddULong32(&cbNtHeaderSize, pinhNtHeader->FileHeader.SizeOfOptionalHeader, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader)))
+            DIE(("The full NT header is too large\n"));
 
-       /* the buffer doesn't contain the whole NT header */
-       if(cbReadSize < cbNtHeaderSize)
-           DIE(("The file doesn't contain the full NT header\n"));
+        /* the buffer doesn't contain the whole NT header */
+        if(cbReadSize < cbNtHeaderSize)
+            DIE(("The file doesn't contain the full NT header\n"));
     }
     else
     {
-       ULONG cbOptHeaderOffsetSize = 0;
+        ULONG cbOptHeaderOffsetSize = 0;
 
-       nStatus = STATUS_INVALID_IMAGE_FORMAT;
+        nStatus = STATUS_INVALID_IMAGE_FORMAT;
 
-       /* don't trust an invalid NT header */
-       if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE)
-           DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature));
+        /* don't trust an invalid NT header */
+        if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE)
+            DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature));
 
-       if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, pidhDosHeader->e_lfanew, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader)))
-           DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew));
+        if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, pidhDosHeader->e_lfanew, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader)))
+            DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew));
 
-       if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, cbOptHeaderOffsetSize, pinhNtHeader->FileHeader.SizeOfOptionalHeader))
-           DIE(("The NT header is too large, SizeOfOptionalHeader is %X\n", pinhNtHeader->FileHeader.SizeOfOptionalHeader));
+        if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, cbOptHeaderOffsetSize, pinhNtHeader->FileHeader.SizeOfOptionalHeader))
+            DIE(("The NT header is too large, SizeOfOptionalHeader is %X\n", pinhNtHeader->FileHeader.SizeOfOptionalHeader));
 
-       /* the buffer doesn't contain the whole NT header: read it from the file */
-       if(cbOptHeaderOffsetSize > FileHeaderSize)
-           goto l_ReadHeaderFromFile;
+        /* the buffer doesn't contain the whole NT header: read it from the file */
+        if(cbOptHeaderOffsetSize > FileHeaderSize)
+            goto l_ReadHeaderFromFile;
     }
 
     /* read information from the NT header */
@@ -340,42 +343,42 @@ l_ReadHeaderFromFile:
     nStatus = STATUS_INVALID_IMAGE_FORMAT;
 
     if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic))
-       DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize));
+        DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize));
 
     /* ASSUME: RtlZeroMemory(ImageSectionObject, sizeof(*ImageSectionObject)); */
 
     switch(piohOptHeader->Magic)
     {
-       case IMAGE_NT_OPTIONAL_HDR32_MAGIC:
-       case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
-           break;
+        case IMAGE_NT_OPTIONAL_HDR32_MAGIC:
+        case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
+            break;
 
-       default:
-           DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic));
+        default:
+            DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic));
     }
 
     if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) &&
         RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment))
     {
-       /* See [1], section 3.4.2 */
-       if(piohOptHeader->SectionAlignment < PAGE_SIZE)
-       {
-           if(piohOptHeader->FileAlignment != piohOptHeader->SectionAlignment)
-               DIE(("Sections aren't page-aligned and the file alignment isn't the same\n"));
-       }
-       else if(piohOptHeader->SectionAlignment < piohOptHeader->FileAlignment)
-           DIE(("The section alignment is smaller than the file alignment\n"));
-
-       nSectionAlignment = piohOptHeader->SectionAlignment;
-       nFileAlignment = piohOptHeader->FileAlignment;
-
-       if(!IsPowerOf2(nSectionAlignment) || !IsPowerOf2(nFileAlignment))
-           DIE(("The section alignment (%u) and file alignment (%u) aren't both powers of 2\n", nSectionAlignment, nFileAlignment));
+        /* See [1], section 3.4.2 */
+        if(piohOptHeader->SectionAlignment < PAGE_SIZE)
+        {
+            if(piohOptHeader->FileAlignment != piohOptHeader->SectionAlignment)
+                DIE(("Sections aren't page-aligned and the file alignment isn't the same\n"));
+        }
+        else if(piohOptHeader->SectionAlignment < piohOptHeader->FileAlignment)
+            DIE(("The section alignment is smaller than the file alignment\n"));
+
+        nSectionAlignment = piohOptHeader->SectionAlignment;
+        nFileAlignment = piohOptHeader->FileAlignment;
+
+        if(!IsPowerOf2(nSectionAlignment) || !IsPowerOf2(nFileAlignment))
+            DIE(("The section alignment (%u) and file alignment (%u) aren't both powers of 2\n", nSectionAlignment, nFileAlignment));
     }
     else
     {
-       nSectionAlignment = PAGE_SIZE;
-       nFileAlignment = PAGE_SIZE;
+        nSectionAlignment = PAGE_SIZE;
+        nFileAlignment = PAGE_SIZE;
     }
 
     ASSERT(IsPowerOf2(nSectionAlignment));
@@ -383,93 +386,93 @@ l_ReadHeaderFromFile:
 
     switch(piohOptHeader->Magic)
     {
-       /* PE32 */
-       case IMAGE_NT_OPTIONAL_HDR32_MAGIC:
-       {
-           if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase))
-               ImageSectionObject->ImageBase = piohOptHeader->ImageBase;
+        /* PE32 */
+        case IMAGE_NT_OPTIONAL_HDR32_MAGIC:
+        {
+            if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase))
+                ImageSectionObject->ImageBase = piohOptHeader->ImageBase;
 
-           if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfImage))
-               ImageSectionObject->ImageSize = piohOptHeader->SizeOfImage;
+            if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfImage))
+                ImageSectionObject->ImageSize = piohOptHeader->SizeOfImage;
 
-           if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackReserve))
-               ImageSectionObject->StackReserve = piohOptHeader->SizeOfStackReserve;
+            if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackReserve))
+                ImageSectionObject->StackReserve = piohOptHeader->SizeOfStackReserve;
 
-           if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackCommit))
-               ImageSectionObject->StackCommit = piohOptHeader->SizeOfStackCommit;
+            if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackCommit))
+                ImageSectionObject->StackCommit = piohOptHeader->SizeOfStackCommit;
 
-           break;
-       }
+            break;
+        }
 
-       /* PE32+ */
-       case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
-       {
-           const IMAGE_OPTIONAL_HEADER64 * pioh64OptHeader;
+        /* PE64 */
+        case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
+        {
+            const IMAGE_OPTIONAL_HEADER64 * pioh64OptHeader;
 
-           pioh64OptHeader = (const IMAGE_OPTIONAL_HEADER64 *)piohOptHeader;
+            pioh64OptHeader = (const IMAGE_OPTIONAL_HEADER64 *)piohOptHeader;
 
-           if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, ImageBase))
-           {
-               if(pioh64OptHeader->ImageBase > MAXULONG_PTR)
-                   DIE(("ImageBase exceeds the address space\n"));
+            if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, ImageBase))
+            {
+                if(pioh64OptHeader->ImageBase > MAXULONG_PTR)
+                    DIE(("ImageBase exceeds the address space\n"));
 
-               ImageSectionObject->ImageBase = (ULONG_PTR)pioh64OptHeader->ImageBase;
-           }
+                ImageSectionObject->ImageBase = (ULONG_PTR)pioh64OptHeader->ImageBase;
+            }
 
-           if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfImage))
-           {
-               if(pioh64OptHeader->SizeOfImage > MAXULONG_PTR)
-                   DIE(("SizeOfImage exceeds the address space\n"));
+            if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfImage))
+            {
+                if(pioh64OptHeader->SizeOfImage > MAXULONG_PTR)
+                    DIE(("SizeOfImage exceeds the address space\n"));
 
-               ImageSectionObject->ImageSize = pioh64OptHeader->SizeOfImage;
-           }
+                ImageSectionObject->ImageSize = pioh64OptHeader->SizeOfImage;
+            }
 
-           if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackReserve))
-           {
-               if(pioh64OptHeader->SizeOfStackReserve > MAXULONG_PTR)
-                   DIE(("SizeOfStackReserve exceeds the address space\n"));
+            if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackReserve))
+            {
+                if(pioh64OptHeader->SizeOfStackReserve > MAXULONG_PTR)
+                    DIE(("SizeOfStackReserve exceeds the address space\n"));
 
-               ImageSectionObject->StackReserve = (ULONG_PTR)pioh64OptHeader->SizeOfStackReserve;
-           }
+                ImageSectionObject->StackReserve = (ULONG_PTR)pioh64OptHeader->SizeOfStackReserve;
+            }
 
-           if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackCommit))
-           {
-               if(pioh64OptHeader->SizeOfStackCommit > MAXULONG_PTR)
-                   DIE(("SizeOfStackCommit exceeds the address space\n"));
+            if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackCommit))
+            {
+                if(pioh64OptHeader->SizeOfStackCommit > MAXULONG_PTR)
+                    DIE(("SizeOfStackCommit exceeds the address space\n"));
 
-               ImageSectionObject->StackCommit = (ULONG_PTR)pioh64OptHeader->SizeOfStackCommit;
-           }
+                ImageSectionObject->StackCommit = (ULONG_PTR)pioh64OptHeader->SizeOfStackCommit;
+            }
 
-           break;
-       }
+            break;
+        }
     }
 
     /* [1], section 3.4.2 */
     if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000)
-       DIE(("ImageBase is not aligned on a 64KB boundary"));
+        DIE(("ImageBase is not aligned on a 64KB boundary"));
 
     if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem))
     {
-       ImageSectionObject->Subsystem = piohOptHeader->Subsystem;
-
-       if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MinorSubsystemVersion) &&
-          RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MajorSubsystemVersion))
-       {
-           ImageSectionObject->MinorSubsystemVersion = piohOptHeader->MinorSubsystemVersion;
-           ImageSectionObject->MajorSubsystemVersion = piohOptHeader->MajorSubsystemVersion;
-       }
+        ImageSectionObject->Subsystem = piohOptHeader->Subsystem;
+
+        if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MinorSubsystemVersion) &&
+           RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MajorSubsystemVersion))
+        {
+            ImageSectionObject->MinorSubsystemVersion = piohOptHeader->MinorSubsystemVersion;
+            ImageSectionObject->MajorSubsystemVersion = piohOptHeader->MajorSubsystemVersion;
+        }
     }
 
     if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint))
     {
-       ImageSectionObject->EntryPoint = piohOptHeader->ImageBase +
+        ImageSectionObject->EntryPoint = ImageSectionObject->ImageBase +
                                          piohOptHeader->AddressOfEntryPoint;
     }
 
     if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode))
-       ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0;
+        ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0;
     else
-       ImageSectionObject->Executable = TRUE;
+        ImageSectionObject->Executable = TRUE;
 
     ImageSectionObject->ImageCharacteristics = pinhNtHeader->FileHeader.Characteristics;
     ImageSectionObject->Machine = pinhNtHeader->FileHeader.Machine;
@@ -479,7 +482,7 @@ l_ReadHeaderFromFile:
 
     /* see [1], section 3.3 */
     if(pinhNtHeader->FileHeader.NumberOfSections > 96)
-       DIE(("Too many sections, NumberOfSections is %u\n", pinhNtHeader->FileHeader.NumberOfSections));
+        DIE(("Too many sections, NumberOfSections is %u\n", pinhNtHeader->FileHeader.NumberOfSections));
 
     /*
      * the additional segment is for the file's headers. They need to be present for
@@ -490,51 +493,51 @@ l_ReadHeaderFromFile:
 
     /* file offset for the section headers */
     if(!Intsafe_AddULong32(&cbSectionHeadersOffset, pidhDosHeader->e_lfanew, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader)))
-       DIE(("Offset overflow\n"));
+        DIE(("Offset overflow\n"));
 
     if(!Intsafe_AddULong32(&cbSectionHeadersOffset, cbSectionHeadersOffset, pinhNtHeader->FileHeader.SizeOfOptionalHeader))
-       DIE(("Offset overflow\n"));
+        DIE(("Offset overflow\n"));
 
     /* size of the section headers */
     ASSERT(Intsafe_CanMulULong32(pinhNtHeader->FileHeader.NumberOfSections, sizeof(IMAGE_SECTION_HEADER)));
     cbSectionHeadersSize = pinhNtHeader->FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER);
 
     if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize))
-       DIE(("Section headers too large\n"));
+        DIE(("Section headers too large\n"));
 
     /* size of the executable's headers */
     if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))
     {
-//     if(!IsAligned(piohOptHeader->SizeOfHeaders, nFileAlignment))
-//         DIE(("SizeOfHeaders is not aligned\n"));
+//        if(!IsAligned(piohOptHeader->SizeOfHeaders, nFileAlignment))
+//            DIE(("SizeOfHeaders is not aligned\n"));
 
-       if(cbSectionHeadersSize > piohOptHeader->SizeOfHeaders)
-           DIE(("The section headers overflow SizeOfHeaders\n"));
+        if(cbSectionHeadersSize > piohOptHeader->SizeOfHeaders)
+            DIE(("The section headers overflow SizeOfHeaders\n"));
 
-       cbHeadersSize = piohOptHeader->SizeOfHeaders;
+        cbHeadersSize = piohOptHeader->SizeOfHeaders;
     }
     else if(!AlignUp(&cbHeadersSize, cbSectionHeadersOffsetSize, nFileAlignment))
-       DIE(("Overflow aligning the size of headers\n"));
+        DIE(("Overflow aligning the size of headers\n"));
 
     if(pBuffer)
     {
-       ExFreePool(pBuffer);
-       pBuffer = NULL;
+        ExFreePool(pBuffer);
+        pBuffer = NULL;
     }
     /* WARNING: pinhNtHeader IS NO LONGER USABLE */
     /* WARNING: piohOptHeader IS NO LONGER USABLE */
     /* WARNING: pioh64OptHeader IS NO LONGER USABLE */
 
     if(FileHeaderSize < cbSectionHeadersOffsetSize)
-       pishSectionHeaders = NULL;
+        pishSectionHeaders = NULL;
     else
     {
-       /*
-        * we already know that Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize),
-        * and FileHeaderSize >= cbSectionHeadersOffsetSize, so this holds true too
-        */
-       ASSERT(Intsafe_CanOffsetPointer(FileHeader, cbSectionHeadersOffset));
-       pishSectionHeaders = (PVOID)((UINT_PTR)FileHeader + cbSectionHeadersOffset);
+        /*
+         * we already know that Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize),
+         * and FileHeaderSize >= cbSectionHeadersOffsetSize, so this holds true too
+         */
+        ASSERT(Intsafe_CanOffsetPointer(FileHeader, cbSectionHeadersOffset));
+        pishSectionHeaders = (PVOID)((UINT_PTR)FileHeader + cbSectionHeadersOffset);
     }
 
     /*
@@ -544,36 +547,36 @@ l_ReadHeaderFromFile:
     if(FileHeaderSize < cbSectionHeadersOffsetSize ||
        (UINT_PTR)pishSectionHeaders % TYPE_ALIGNMENT(IMAGE_SECTION_HEADER) != 0)
     {
-       PVOID pData;
-       ULONG cbReadSize;
+        PVOID pData;
+        ULONG cbReadSize;
 
-       lnOffset.QuadPart = cbSectionHeadersOffset;
+        lnOffset.QuadPart = cbSectionHeadersOffset;
 
-       /* read the header from the file */
-       nStatus = ReadFileCb(File, &lnOffset, cbSectionHeadersSize, &pData, &pBuffer, &cbReadSize);
+        /* read the header from the file */
+        nStatus = ReadFileCb(File, &lnOffset, cbSectionHeadersSize, &pData, &pBuffer, &cbReadSize);
 
-       if(!NT_SUCCESS(nStatus))
-           DIE(("ReadFile failed with status %08X\n", nStatus));
+        if(!NT_SUCCESS(nStatus))
+            DIE(("ReadFile failed with status %08X\n", nStatus));
 
-       ASSERT(pData);
-       ASSERT(pBuffer);
-       ASSERT(cbReadSize > 0);
+        ASSERT(pData);
+        ASSERT(pBuffer);
+        ASSERT(cbReadSize > 0);
 
-       nStatus = STATUS_INVALID_IMAGE_FORMAT;
+        nStatus = STATUS_INVALID_IMAGE_FORMAT;
 
-       /* the buffer doesn't contain all the section headers */
-       if(cbReadSize < cbSectionHeadersSize)
-           DIE(("The file doesn't contain all of the section headers\n"));
+        /* the buffer doesn't contain all the section headers */
+        if(cbReadSize < cbSectionHeadersSize)
+            DIE(("The file doesn't contain all of the section headers\n"));
 
-       pishSectionHeaders = pData;
+        pishSectionHeaders = pData;
 
-       /* object still not aligned: copy it to the beginning of the buffer */
-       if((UINT_PTR)pishSectionHeaders % TYPE_ALIGNMENT(IMAGE_SECTION_HEADER) != 0)
-       {
-           ASSERT((UINT_PTR)pBuffer % TYPE_ALIGNMENT(IMAGE_SECTION_HEADER) == 0);
-           RtlMoveMemory(pBuffer, pData, cbReadSize);
-           pishSectionHeaders = pBuffer;
-       }
+        /* object still not aligned: copy it to the beginning of the buffer */
+        if((UINT_PTR)pishSectionHeaders % TYPE_ALIGNMENT(IMAGE_SECTION_HEADER) != 0)
+        {
+            ASSERT((UINT_PTR)pBuffer % TYPE_ALIGNMENT(IMAGE_SECTION_HEADER) == 0);
+            RtlMoveMemory(pBuffer, pData, cbReadSize);
+            pishSectionHeaders = pBuffer;
+        }
     }
 
     /* SEGMENTS */
@@ -585,7 +588,7 @@ l_ReadHeaderFromFile:
         DIE(("AllocateSegments failed\n"));
 
     /* initialize the headers segment */
-       pssSegments = ImageSectionObject->Segments;
+    pssSegments = ImageSectionObject->Segments;
 
 //  ASSERT(IsAligned(cbHeadersSize, nFileAlignment));
 
@@ -596,12 +599,12 @@ l_ReadHeaderFromFile:
     if (nPrevVirtualEndOfSegment < cbHeadersSize)
         DIE(("Cannot align the size of the section headers\n"));
 
-    pssSegments[0].FileOffset = 0;
+    pssSegments[0].Image.FileOffset = 0;
     pssSegments[0].Protection = PAGE_READONLY;
-    pssSegments[0].Length = nPrevVirtualEndOfSegment;
-    pssSegments[0].RawLength = nFileSizeOfHeaders;
-    pssSegments[0].VirtualAddress = 0;
-    pssSegments[0].Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA;
+    pssSegments[0].Length.QuadPart = nPrevVirtualEndOfSegment;
+    pssSegments[0].RawLength.QuadPart = nFileSizeOfHeaders;
+    pssSegments[0].Image.VirtualAddress = 0;
+    pssSegments[0].Image.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA;
     pssSegments[0].WriteCopy = TRUE;
 
     /* skip the headers segment */
@@ -612,133 +615,96 @@ l_ReadHeaderFromFile:
     /* convert the executable sections into segments. See also [1], section 4 */
     for(i = 0; i < ImageSectionObject->NrSegments - 1; ++ i)
     {
-       ULONG nCharacteristics;
+        ULONG nCharacteristics;
 
-       /* validate the alignment */
-       if(!IsAligned(pishSectionHeaders[i].VirtualAddress, nSectionAlignment))
-           DIE(("VirtualAddress[%u] is not aligned\n", i));
+        /* validate the alignment */
+        if(!IsAligned(pishSectionHeaders[i].VirtualAddress, nSectionAlignment))
+            DIE(("Image.VirtualAddress[%u] is not aligned\n", i));
 
-       /* sections must be contiguous, ordered by base address and non-overlapping */
-       if(pishSectionHeaders[i].VirtualAddress != nPrevVirtualEndOfSegment)
-           DIE(("Memory gap between section %u and the previous\n", i));
+        /* sections must be contiguous, ordered by base address and non-overlapping */
+        if(pishSectionHeaders[i].VirtualAddress != nPrevVirtualEndOfSegment)
+            DIE(("Memory gap between section %u and the previous\n", i));
 
-       /* ignore explicit BSS sections */
-       if(pishSectionHeaders[i].SizeOfRawData != 0)
-       {
-           /* validate the alignment */
+        /* ignore explicit BSS sections */
+        if(pishSectionHeaders[i].SizeOfRawData != 0)
+        {
+            /* validate the alignment */
 #if 0
-           /* Yes, this should be a multiple of FileAlignment, but there's
-            * stuff out there that isn't. We can cope with that
-            */
-           if(!IsAligned(pishSectionHeaders[i].SizeOfRawData, nFileAlignment))
-               DIE(("SizeOfRawData[%u] is not aligned\n", i));
+            /* Yes, this should be a multiple of FileAlignment, but there's
+             * stuff out there that isn't. We can cope with that
+             */
+            if(!IsAligned(pishSectionHeaders[i].SizeOfRawData, nFileAlignment))
+                DIE(("SizeOfRawData[%u] is not aligned\n", i));
 #endif
 
-//         if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment))
-//             DIE(("PointerToRawData[%u] is not aligned\n", i));
+//            if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment))
+//                DIE(("PointerToRawData[%u] is not aligned\n", i));
 
-           /* conversion */
-           pssSegments[i].FileOffset = pishSectionHeaders[i].PointerToRawData;
-           pssSegments[i].RawLength = pishSectionHeaders[i].SizeOfRawData;
-       }
-       else
-       {
-           ASSERT(pssSegments[i].FileOffset == 0);
-           ASSERT(pssSegments[i].RawLength == 0);
-       }
+            /* conversion */
+            pssSegments[i].Image.FileOffset = pishSectionHeaders[i].PointerToRawData;
+            pssSegments[i].RawLength.QuadPart = pishSectionHeaders[i].SizeOfRawData;
+        }
+        else
+        {
+            ASSERT(pssSegments[i].Image.FileOffset == 0);
+            ASSERT(pssSegments[i].RawLength.QuadPart == 0);
+        }
 
-       ASSERT(Intsafe_CanAddLong64(pssSegments[i].FileOffset, pssSegments[i].RawLength));
+        ASSERT(Intsafe_CanAddLong64(pssSegments[i].Image.FileOffset, pssSegments[i].RawLength.QuadPart));
 
-       nCharacteristics = pishSectionHeaders[i].Characteristics;
+        nCharacteristics = pishSectionHeaders[i].Characteristics;
 
-       /* no explicit protection */
-       if((nCharacteristics & (IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE)) == 0)
-       {
-           if(nCharacteristics & IMAGE_SCN_CNT_CODE)
-               nCharacteristics |= IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ;
+        /* no explicit protection */
+        if((nCharacteristics & (IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE)) == 0)
+        {
+            if(nCharacteristics & IMAGE_SCN_CNT_CODE)
+                nCharacteristics |= IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ;
 
-           if(nCharacteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
-               nCharacteristics |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE;
+            if(nCharacteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
+                nCharacteristics |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE;
 
-           if(nCharacteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)
-               nCharacteristics |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE;
-       }
+            if(nCharacteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)
+                nCharacteristics |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE;
+        }
 
-       /* see table above */
-       pssSegments[i].Protection = SectionCharacteristicsToProtect[nCharacteristics >> 28];
-       pssSegments[i].WriteCopy = !(nCharacteristics & IMAGE_SCN_MEM_SHARED);
+        /* see table above */
+        pssSegments[i].Protection = SectionCharacteristicsToProtect[nCharacteristics >> 28];
+        pssSegments[i].WriteCopy = !(nCharacteristics & IMAGE_SCN_MEM_SHARED);
 
-       if(pishSectionHeaders[i].Misc.VirtualSize == 0 || pishSectionHeaders[i].Misc.VirtualSize < pishSectionHeaders[i].SizeOfRawData)
-           pssSegments[i].Length = pishSectionHeaders[i].SizeOfRawData;
-       else
-           pssSegments[i].Length = pishSectionHeaders[i].Misc.VirtualSize;
+        if(pishSectionHeaders[i].Misc.VirtualSize == 0 || pishSectionHeaders[i].Misc.VirtualSize < pishSectionHeaders[i].SizeOfRawData)
+            pssSegments[i].Length.QuadPart = pishSectionHeaders[i].SizeOfRawData;
+        else
+            pssSegments[i].Length.QuadPart = pishSectionHeaders[i].Misc.VirtualSize;
 
-    pssSegments[i].Length = ALIGN_UP_BY(pssSegments[i].Length, nSectionAlignment);
-    if (pssSegments[i].Length < pssSegments[i].Length)
-           DIE(("Cannot align the virtual size of section %u\n", i));
+        pssSegments[i].Length.LowPart = ALIGN_UP_BY(pssSegments[i].Length.LowPart, nSectionAlignment);
+        if (pssSegments[i].Length.QuadPart < pssSegments[i].Length.QuadPart)
+            DIE(("Cannot align the virtual size of section %u\n", i));
 
-       if(pssSegments[i].Length == 0)
-           DIE(("Virtual size of section %u is null\n", i));
+        if(pssSegments[i].Length.QuadPart == 0)
+            DIE(("Virtual size of section %u is null\n", i));
 
-       pssSegments[i].VirtualAddress = pishSectionHeaders[i].VirtualAddress;
-       pssSegments[i].Characteristics = pishSectionHeaders[i].Characteristics;
+        pssSegments[i].Image.VirtualAddress = pishSectionHeaders[i].VirtualAddress;
+        pssSegments[i].Image.Characteristics = pishSectionHeaders[i].Characteristics;
 
-       /* ensure the memory image is no larger than 4GB */
-       nPrevVirtualEndOfSegment = pssSegments[i].VirtualAddress + pssSegments[i].Length;
-       if (nPrevVirtualEndOfSegment < pssSegments[i].VirtualAddress)
-           DIE(("The image is too large\n"));
+        /* ensure the memory image is no larger than 4GB */
+        nPrevVirtualEndOfSegment = (ULONG_PTR)(pssSegments[i].Image.VirtualAddress + pssSegments[i].Length.QuadPart);
+        if (nPrevVirtualEndOfSegment < pssSegments[i].Image.VirtualAddress)
+            DIE(("The image is too large\n"));
     }
 
     if(nSectionAlignment >= PAGE_SIZE)
-       *Flags |= EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED;
+        *Flags |= EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED;
 
     /* Success */
     nStatus = STATUS_ROS_EXEFMT_LOADED_FORMAT | EXEFMT_LOADED_PE32;
 
 l_Return:
     if(pBuffer)
-       ExFreePool(pBuffer);
+        ExFreePool(pBuffer);
 
     return nStatus;
 }
 
-/* Note: Mmsp prefix denotes "Memory Manager Section Private". */
-
-/*
- * FUNCTION:  Waits in kernel mode up to ten seconds for an MM_PAGEOP event.
- * ARGUMENTS: PMM_PAGEOP which event we should wait for.
- * RETURNS:   Status of the wait.
- */
-static NTSTATUS
-MmspWaitForPageOpCompletionEvent(PMM_PAGEOP PageOp)
-{
-   LARGE_INTEGER Timeout;
-#ifdef __GNUC__ /* TODO: Use other macro to check for suffix to use? */
-
-   Timeout.QuadPart = -100000000LL; // 10 sec
-#else
-
-   Timeout.QuadPart = -100000000; // 10 sec
-#endif
-
-   return KeWaitForSingleObject(&PageOp->CompletionEvent, 0, KernelMode, FALSE, &Timeout);
-}
-
-
-/*
- * FUNCTION:  Sets the page op completion event and releases the page op.
- * ARGUMENTS: PMM_PAGEOP.
- * RETURNS:   In shorter time than it takes you to even read this
- *            description, so don't even think about geting a mug of coffee.
- */
-static void
-MmspCompleteAndReleasePageOp(PMM_PAGEOP PageOp)
-{
-   KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE);
-   MmReleasePageOp(PageOp);
-}
-
-
 /*
  * FUNCTION:  Waits in kernel mode indefinitely for a file object lock.
  * ARGUMENTS: PFILE_OBJECT to wait for.
@@ -751,23 +717,6 @@ MmspWaitForFileLock(PFILE_OBJECT File)
    //return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL);
 }
 
-
-VOID
-MmFreePageTablesSectionSegment(PMM_SECTION_SEGMENT Segment)
-{
-   ULONG i;
-   if (Segment->Length > NR_SECTION_PAGE_TABLES * PAGE_SIZE)
-   {
-      for (i = 0; i < NR_SECTION_PAGE_TABLES; i++)
-      {
-         if (Segment->PageDirectory.PageTables[i] != NULL)
-         {
-            ExFreePool(Segment->PageDirectory.PageTables[i]);
-         }
-      }
-   }
-}
-
 VOID
 NTAPI
 MmFreeSectionSegments(PFILE_OBJECT FileObject)
@@ -790,7 +739,7 @@ MmFreeSectionSegments(PFILE_OBJECT FileObject)
                     SectionSegments[i].ReferenceCount);
             KeBugCheck(MEMORY_MANAGEMENT);
          }
-         MmFreePageTablesSectionSegment(&SectionSegments[i]);
+         MmFreePageTablesSectionSegment(&SectionSegments[i], NULL);
       }
       ExFreePool(ImageSectionObject->Segments);
       ExFreePool(ImageSectionObject);
@@ -808,100 +757,18 @@ MmFreeSectionSegments(PFILE_OBJECT FileObject)
          DPRINT1("Data segment still referenced\n");
           KeBugCheck(MEMORY_MANAGEMENT);
       }
-      MmFreePageTablesSectionSegment(Segment);
+      MmFreePageTablesSectionSegment(Segment, NULL);
       ExFreePool(Segment);
       FileObject->SectionObjectPointer->DataSectionObject = NULL;
    }
 }
 
-VOID
-NTAPI
-MmLockSectionSegment(PMM_SECTION_SEGMENT Segment)
-{
-   ExAcquireFastMutex(&Segment->Lock);
-}
-
-VOID
-NTAPI
-MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment)
-{
-   ExReleaseFastMutex(&Segment->Lock);
-}
-
-VOID
-NTAPI
-MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
-                             ULONG_PTR Offset,
-                             ULONG_PTR Entry)
-{
-   PSECTION_PAGE_TABLE Table;
-   ULONG_PTR DirectoryOffset;
-   ULONG_PTR TableOffset;
-
-   if (Segment->Length <= NR_SECTION_PAGE_TABLES * PAGE_SIZE)
-   {
-      Table = (PSECTION_PAGE_TABLE)&Segment->PageDirectory;
-   }
-   else
-   {
-      DirectoryOffset = PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(Offset);
-      Table = Segment->PageDirectory.PageTables[DirectoryOffset];
-      if (Table == NULL)
-      {
-         Table =
-            Segment->PageDirectory.PageTables[DirectoryOffset] =
-               ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE),
-                                     TAG_SECTION_PAGE_TABLE);
-         if (Table == NULL)
-         {
-            KeBugCheck(MEMORY_MANAGEMENT);
-         }
-         memset(Table, 0, sizeof(SECTION_PAGE_TABLE));
-         DPRINT("Table %x\n", Table);
-      }
-   }
-   TableOffset = PAGE_TO_SECTION_PAGE_TABLE_OFFSET(Offset);
-   Table->Entry[TableOffset] = (ULONG)Entry;
-}
-
-
-ULONG
-NTAPI
-MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
-                             ULONG_PTR Offset)
-{
-   PSECTION_PAGE_TABLE Table;
-   ULONG Entry;
-   ULONG_PTR DirectoryOffset;
-   ULONG_PTR TableOffset;
-
-   DPRINT("MmGetPageEntrySection(Segment %x, Offset %x)\n", Segment, Offset);
-
-   if (Segment->Length <= NR_SECTION_PAGE_TABLES * PAGE_SIZE)
-   {
-      Table = (PSECTION_PAGE_TABLE)&Segment->PageDirectory;
-   }
-   else
-   {
-      DirectoryOffset = PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(Offset);
-      Table = Segment->PageDirectory.PageTables[DirectoryOffset];
-      DPRINT("Table %x\n", Table);
-      if (Table == NULL)
-      {
-         return(0);
-      }
-   }
-   TableOffset = PAGE_TO_SECTION_PAGE_TABLE_OFFSET(Offset);
-   Entry = Table->Entry[TableOffset];
-   return(Entry);
-}
-
 VOID
 NTAPI
 MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
-                               ULONG_PTR Offset)
+                               PLARGE_INTEGER Offset)
 {
-   ULONG Entry;
+   ULONG_PTR Entry;
 
    Entry = MmGetPageEntrySectionSegment(Segment, Offset);
    if (Entry == 0)
@@ -926,14 +793,14 @@ BOOLEAN
 NTAPI
 MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
                                  PMM_SECTION_SEGMENT Segment,
-                                 ULONG Offset,
+                                 PLARGE_INTEGER Offset,
                                  BOOLEAN Dirty,
-                                 BOOLEAN PageOut)
+                                 BOOLEAN PageOut,
+                                 ULONG_PTR *InEntry)
 {
-   ULONG Entry;
+   ULONG_PTR Entry = InEntry ? *InEntry : MmGetPageEntrySectionSegment(Segment, Offset);
    BOOLEAN IsDirectMapped = FALSE;
 
-   Entry = MmGetPageEntrySectionSegment(Segment, Offset);
    if (Entry == 0)
    {
       DPRINT1("Entry == 0 for MmUnsharePageEntrySectionSegment\n");
@@ -941,7 +808,7 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
    }
    if (SHARE_COUNT_FROM_SSE(Entry) == 0)
    {
-      DPRINT1("Zero share count for unshare\n");
+       DPRINT1("Zero share count for unshare (Seg %p Offset %x Page %x)\n", Segment, Offset->LowPart, PFN_FROM_SSE(Entry));
        KeBugCheck(MEMORY_MANAGEMENT);
    }
    if (IS_SWAP_FROM_SSE(Entry))
@@ -956,39 +823,43 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
    if (SHARE_COUNT_FROM_SSE(Entry) == 0)
    {
       PFILE_OBJECT FileObject;
+#ifndef NEWCC
       PBCB Bcb;
+#endif
       SWAPENTRY SavedSwapEntry;
       PFN_NUMBER Page;
       BOOLEAN IsImageSection;
-      ULONG FileOffset;
+      LARGE_INTEGER FileOffset;
 
-      FileOffset = Offset + Segment->FileOffset;
+      FileOffset.QuadPart = Offset->QuadPart + Segment->Image.FileOffset;
 
       IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE;
 
       Page = PFN_FROM_SSE(Entry);
       FileObject = Section->FileObject;
       if (FileObject != NULL &&
-            !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+            !(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
       {
 
-         if ((FileOffset % PAGE_SIZE) == 0 &&
-               (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection))
+#ifndef NEWCC
+         if ((FileOffset.QuadPart % PAGE_SIZE) == 0 &&
+               (Offset->QuadPart + PAGE_SIZE <= Segment->RawLength.QuadPart || !IsImageSection))
          {
             NTSTATUS Status;
             Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
             IsDirectMapped = TRUE;
 #ifndef NEWCC
-            Status = CcRosUnmapCacheSegment(Bcb, FileOffset, Dirty);
+            Status = CcRosUnmapCacheSegment(Bcb, FileOffset.LowPart, Dirty);
 #else
-                       Status = STATUS_SUCCESS;
+            Status = STATUS_SUCCESS;
 #endif
             if (!NT_SUCCESS(Status))
             {
                DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status);
-                KeBugCheck(MEMORY_MANAGEMENT);
+               KeBugCheck(MEMORY_MANAGEMENT);
             }
          }
+#endif
       }
 
       SavedSwapEntry = MmGetSavedSwapEntryPage(Page);
@@ -996,7 +867,7 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
       {
          if (!PageOut &&
                ((Segment->Flags & MM_PAGEFILE_SEGMENT) ||
-                (Segment->Characteristics & IMAGE_SCN_MEM_SHARED)))
+                (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)))
          {
             /*
              * FIXME:
@@ -1006,10 +877,14 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
              *   page without a rmap entry.
              */
             MmSetPageEntrySectionSegment(Segment, Offset, Entry);
+            if (InEntry) *InEntry = Entry;
+            MiSetPageEvent(NULL, NULL);
          }
          else
          {
             MmSetPageEntrySectionSegment(Segment, Offset, 0);
+            if (InEntry) *InEntry = 0;
+            MiSetPageEvent(NULL, NULL);
             if (!IsDirectMapped)
             {
                MmReleasePageMemoryConsumer(MC_USER, Page);
@@ -1019,7 +894,7 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
       else
       {
          if ((Segment->Flags & MM_PAGEFILE_SEGMENT) ||
-               (Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+               (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
          {
             if (!PageOut)
             {
@@ -1039,7 +914,9 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
                   }
                }
                MmSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry));
+               if (InEntry) *InEntry = MAKE_SWAP_SSE(SavedSwapEntry);
                MmSetSavedSwapEntryPage(Page, 0);
+               MiSetPageEvent(NULL, NULL);
             }
             MmReleasePageMemoryConsumer(MC_USER, Page);
          }
@@ -1052,7 +929,10 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section,
    }
    else
    {
-      MmSetPageEntrySectionSegment(Segment, Offset, Entry);
+      if (InEntry)
+          *InEntry = Entry;
+      else
+          MmSetPageEntrySectionSegment(Segment, Offset, Entry);
    }
    return(SHARE_COUNT_FROM_SSE(Entry) > 0);
 }
@@ -1061,12 +941,12 @@ BOOLEAN MiIsPageFromCache(PMEMORY_AREA MemoryArea,
                        ULONG SegOffset)
 {
 #ifndef NEWCC
-   if (!(MemoryArea->Data.SectionData.Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+   if (!(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
    {
       PBCB Bcb;
       PCACHE_SEGMENT CacheSeg;
       Bcb = MemoryArea->Data.SectionData.Section->FileObject->SectionObjectPointer->SharedCacheMap;
-      CacheSeg = CcRosLookupCacheSegment(Bcb, SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset);
+      CacheSeg = CcRosLookupCacheSegment(Bcb, (ULONG)(SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset));
       if (CacheSeg)
       {
          CcRosReleaseCacheSegment(Bcb, CacheSeg, CacheSeg->Valid, FALSE, TRUE);
@@ -1079,20 +959,24 @@ BOOLEAN MiIsPageFromCache(PMEMORY_AREA MemoryArea,
 
 NTSTATUS
 NTAPI
-MiCopyFromUserPage(PFN_NUMBER DestPage, PVOID SourceAddress)
+MiCopyFromUserPage(PFN_NUMBER DestPage, PFN_NUMBER SrcPage)
 {
     PEPROCESS Process;
-    KIRQL Irql;
-    PVOID TempAddress;
+    KIRQL Irql, Irql2;
+    PVOID DestAddress, SrcAddress;
 
     Process = PsGetCurrentProcess();
-    TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql);
-    if (TempAddress == NULL)
+    DestAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql);
+    SrcAddress = MiMapPageInHyperSpace(Process, SrcPage, &Irql2);
+    if (DestAddress == NULL || SrcAddress == NULL)
     {
         return(STATUS_NO_MEMORY);
     }
-    memcpy(TempAddress, SourceAddress, PAGE_SIZE);
-    MiUnmapPageInHyperSpace(Process, TempAddress, Irql);
+    ASSERT((ULONG_PTR)DestAddress % PAGE_SIZE == 0);
+    ASSERT((ULONG_PTR)SrcAddress % PAGE_SIZE == 0);
+    RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE);
+    MiUnmapPageInHyperSpace(Process, SrcAddress, Irql2);
+    MiUnmapPageInHyperSpace(Process, DestAddress, Irql);
     return(STATUS_SUCCESS);
 }
 
@@ -1111,7 +995,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
  */
 {
    ULONG BaseOffset;
-   ULONG_PTR FileOffset;
+   ULONGLONG FileOffset;
    PVOID BaseAddress;
    BOOLEAN UptoDate;
    PCACHE_SEGMENT CacheSeg;
@@ -1124,8 +1008,8 @@ MiReadPage(PMEMORY_AREA MemoryArea,
 
    FileObject = MemoryArea->Data.SectionData.Section->FileObject;
    Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
-   RawLength = MemoryArea->Data.SectionData.Segment->RawLength;
-   FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset;
+   RawLength = (ULONG_PTR)(MemoryArea->Data.SectionData.Segment->RawLength.QuadPart);
+   FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset;
    IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE;
 
    ASSERT(Bcb);
@@ -1137,9 +1021,9 @@ MiReadPage(PMEMORY_AREA MemoryArea,
     * memory area was mapped at an offset in the file which is page aligned
     * then get the related cache segment.
     */
-   if ((FileOffset % PAGE_SIZE) == 0 &&
-       (SegOffset + PAGE_SIZE <= RawLength || !IsImageSection) &&
-       !(MemoryArea->Data.SectionData.Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+   if (((FileOffset % PAGE_SIZE) == 0) &&
+       ((SegOffset + PAGE_SIZE <= RawLength) || !IsImageSection) &&
+       !(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
    {
 
       /*
@@ -1222,7 +1106,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
 
       Process = PsGetCurrentProcess();
       PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql);
-      CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset;
+      CacheSegOffset = (ULONG_PTR)(BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset);
       Length = RawLength - SegOffset;
       if (Length <= CacheSegOffset && Length <= PAGE_SIZE)
       {
@@ -1279,7 +1163,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
 NTSTATUS
 NTAPI
 MiReadPage(PMEMORY_AREA MemoryArea,
-           ULONG SegOffset,
+           ULONG_PTR SegOffset,
            PPFN_NUMBER Page)
 /*
  * FUNCTION: Read a page for a section backed memory area.
@@ -1289,17 +1173,20 @@ MiReadPage(PMEMORY_AREA MemoryArea,
  *       Page - Variable that receives a page contains the read data.
  */
 {
-   MM_REQUIRED_RESOURCES Resources = { };
+   MM_REQUIRED_RESOURCES Resources;
+   NTSTATUS Status;
+
+   RtlZeroMemory(&Resources, sizeof(MM_REQUIRED_RESOURCES));
 
    Resources.Context = MemoryArea->Data.SectionData.Section->FileObject;
    Resources.FileOffset.QuadPart = SegOffset +
-          MemoryArea->Data.SectionData.Segment->FileOffset;
+       MemoryArea->Data.SectionData.Segment->Image.FileOffset;
    Resources.Consumer = MC_USER;
    Resources.Amount = PAGE_SIZE;
 
-   DPRINT1("%S, offset %x, len %d, page %x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]);
+   DPRINT("%S, offset 0x%x, len 0x%x, page 0x%x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]);
 
-   NTSTATUS Status = MiReadFilePage(NULL, NULL, &Resources);
+   Status = MiReadFilePage(MmGetKernelAddressSpace(), MemoryArea, &Resources);
    *Page = Resources.Page[0];
    return Status;
 }
@@ -1309,9 +1196,10 @@ NTSTATUS
 NTAPI
 MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
                              MEMORY_AREA* MemoryArea,
-                             PVOID Address)
+                             PVOID Address,
+                             BOOLEAN Locked)
 {
-   ULONG Offset;
+   LARGE_INTEGER Offset;
    PFN_NUMBER Page;
    NTSTATUS Status;
    PROS_SECTION_OBJECT Section;
@@ -1319,9 +1207,9 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
    ULONG_PTR Entry;
    ULONG_PTR Entry1;
    ULONG Attributes;
-   PMM_PAGEOP PageOp;
    PMM_REGION Region;
    BOOLEAN HasSwapEntry;
+   PVOID PAddress;
    PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace);
 
    /*
@@ -1333,7 +1221,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
    {
       return(STATUS_SUCCESS);
    }
-   
+
    /*
     * Check for the virtual memory area being deleted.
     */
@@ -1342,20 +1230,21 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       return(STATUS_UNSUCCESSFUL);
    }
 
-   Address = MM_ROUND_DOWN(Address, PAGE_SIZE);
-   Offset = (ULONG)((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
-            + MemoryArea->Data.SectionData.ViewOffset);
+   PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE);
+   Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress
+            + MemoryArea->Data.SectionData.ViewOffset.QuadPart;
 
    Segment = MemoryArea->Data.SectionData.Segment;
    Section = MemoryArea->Data.SectionData.Section;
    Region = MmFindRegion(MemoryArea->StartingAddress,
                          &MemoryArea->Data.SectionData.RegionListHead,
                          Address, NULL);
+   ASSERT(Region != NULL);
    /*
     * Lock the segment
     */
    MmLockSectionSegment(Segment);
-
+   Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
    /*
     * Check if this page needs to be mapped COW
     */
@@ -1370,112 +1259,42 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       Attributes = Region->Protect;
    }
 
-   /*
-    * Get or create a page operation descriptor
-    */
-   PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset, MM_PAGEOP_PAGEIN, FALSE);
-   if (PageOp == NULL)
-   {
-      DPRINT1("MmGetPageOp failed\n");
-       KeBugCheck(MEMORY_MANAGEMENT);
-   }
-
    /*
     * Check if someone else is already handling this fault, if so wait
     * for them
     */
-   if (PageOp->Thread != PsGetCurrentThread())
+   if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY)
    {
       MmUnlockSectionSegment(Segment);
       MmUnlockAddressSpace(AddressSpace);
-      Status = MmspWaitForPageOpCompletionEvent(PageOp);
-      /*
-       * Check for various strange conditions
-       */
-      if (Status != STATUS_SUCCESS)
-      {
-         DPRINT1("Failed to wait for page op, status = %x\n", Status);
-          KeBugCheck(MEMORY_MANAGEMENT);
-      }
-      if (PageOp->Status == STATUS_PENDING)
-      {
-         DPRINT1("Woke for page op before completion\n");
-          KeBugCheck(MEMORY_MANAGEMENT);
-      }
+      MiWaitForPageEvent(NULL, NULL);
       MmLockAddressSpace(AddressSpace);
-      /*
-       * If this wasn't a pagein then restart the operation
-       */
-      if (PageOp->OpType != MM_PAGEOP_PAGEIN)
-      {
-         MmspCompleteAndReleasePageOp(PageOp);
-         DPRINT("Address 0x%.8X\n", Address);
-         return(STATUS_MM_RESTART_OPERATION);
-      }
-
-      /*
-      * If the thread handling this fault has failed then we don't retry
-      */
-      if (!NT_SUCCESS(PageOp->Status))
-      {
-         Status = PageOp->Status;
-         MmspCompleteAndReleasePageOp(PageOp);
-         DPRINT("Address 0x%.8X\n", Address);
-         return(Status);
-      }
-      MmLockSectionSegment(Segment);
-      /*
-       * If the completed fault was for another address space then set the
-       * page in this one.
-       */
-      if (!MmIsPagePresent(Process, Address))
-      {
-         Entry = MmGetPageEntrySectionSegment(Segment, Offset);
-         HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)Address);
-
-         if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry)
-         {
-            /*
-             * The page was a private page in another or in our address space
-             */
-            MmUnlockSectionSegment(Segment);
-            MmspCompleteAndReleasePageOp(PageOp);
-            return(STATUS_MM_RESTART_OPERATION);
-         }
-
-         Page = PFN_FROM_SSE(Entry);
-
-         MmSharePageEntrySectionSegment(Segment, Offset);
-
-         /* FIXME: Should we call MmCreateVirtualMappingUnsafe if
-          * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true?
-          */
-         Status = MmCreateVirtualMapping(Process,
-                                         Address,
-                                         Attributes,
-                                         &Page,
-                                         1);
-         if (!NT_SUCCESS(Status))
-         {
-            DPRINT1("Unable to create virtual mapping\n");
-            KeBugCheck(MEMORY_MANAGEMENT);
-         }
-         MmInsertRmap(Page, Process, Address);
-      }
-      MmUnlockSectionSegment(Segment);
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
       DPRINT("Address 0x%.8X\n", Address);
-      return(STATUS_SUCCESS);
+      return(STATUS_MM_RESTART_OPERATION);
    }
 
    HasSwapEntry = MmIsPageSwapEntry(Process, Address);
+
    if (HasSwapEntry)
    {
+      SWAPENTRY SwapEntry;
+      /*
+       * Is it a wait entry?
+       */
+      MmGetPageFileMapping(Process, Address, &SwapEntry);
+
+      if (SwapEntry == MM_WAIT_ENTRY)
+      {
+         MmUnlockSectionSegment(Segment);
+         MmUnlockAddressSpace(AddressSpace);
+         MiWaitForPageEvent(NULL, NULL);
+         MmLockAddressSpace(AddressSpace);
+         return STATUS_MM_RESTART_OPERATION;
+      }
+
       /*
        * Must be private page we have swapped out.
        */
-      SWAPENTRY SwapEntry;
 
       /*
        * Sanity check
@@ -1507,7 +1326,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       }
       MmLockAddressSpace(AddressSpace);
       Status = MmCreateVirtualMapping(Process,
-                                      Address,
+                                      PAddress,
                                       Region->Protect,
                                       &Page,
                                       1);
@@ -1530,8 +1349,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       /*
        * Finish the operation
        */
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(Process, Address);
       DPRINT("Address 0x%.8X\n", Address);
       return(STATUS_SUCCESS);
    }
@@ -1545,9 +1363,9 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       /*
        * Just map the desired physical page
        */
-      Page = Offset >> PAGE_SHIFT;
+      Page = (PFN_NUMBER)(Offset.QuadPart >> PAGE_SHIFT);
       Status = MmCreateVirtualMappingUnsafe(Process,
-                                            Address,
+                                            PAddress,
                                             Region->Protect,
                                             &Page,
                                             1);
@@ -1561,8 +1379,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       /*
        * Cleanup and release locks
        */
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(Process, Address);
       DPRINT("Address 0x%.8X\n", Address);
       return(STATUS_SUCCESS);
    }
@@ -1570,7 +1387,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
    /*
     * Map anonymous memory for BSS sections
     */
-   if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)
+   if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)
    {
       MmUnlockSectionSegment(Segment);
       MI_SET_USAGE(MI_USAGE_SECTION);
@@ -1588,7 +1405,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
           KeBugCheck(MEMORY_MANAGEMENT);
       }
       Status = MmCreateVirtualMapping(Process,
-                                      Address,
+                                      PAddress,
                                       Region->Protect,
                                       &Page,
                                       1);
@@ -1603,8 +1420,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       /*
        * Cleanup and release locks
        */
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(Process, Address);
       DPRINT("Address 0x%.8X\n", Address);
       return(STATUS_SUCCESS);
    }
@@ -1612,7 +1428,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
    /*
     * Get the entry corresponding to the offset within the section
     */
-   Entry = MmGetPageEntrySectionSegment(Segment, Offset);
+   Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
 
    if (Entry == 0)
    {
@@ -1624,11 +1440,13 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       /*
        * Release all our locks and read in the page from disk
        */
+      MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SWAP_SSE(MM_WAIT_ENTRY));
       MmUnlockSectionSegment(Segment);
       MmUnlockAddressSpace(AddressSpace);
 
       if ((Segment->Flags & MM_PAGEFILE_SEGMENT) ||
-          (Offset >= PAGE_ROUND_UP(Segment->RawLength) && Section->AllocationAttributes & SEC_IMAGE))
+          ((Offset.QuadPart >= (LONGLONG)PAGE_ROUND_UP(Segment->RawLength.QuadPart) &&
+          (Section->AllocationAttributes & SEC_IMAGE))))
       {
          MI_SET_USAGE(MI_USAGE_SECTION);
          if (Process) MI_SET_PROCESS2(Process->ImageFileName);
@@ -1642,7 +1460,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       }
       else
       {
-         Status = MiReadPage(MemoryArea, Offset, &Page);
+         Status = MiReadPage(MemoryArea, (ULONG_PTR)Offset.QuadPart, &Page);
          if (!NT_SUCCESS(Status))
          {
             DPRINT1("MiReadPage failed (Status %x)\n", Status);
@@ -1657,38 +1475,23 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
           * Cleanup and release locks
           */
          MmLockAddressSpace(AddressSpace);
-         PageOp->Status = Status;
-         MmspCompleteAndReleasePageOp(PageOp);
+         MiSetPageEvent(Process, Address);
          DPRINT("Address 0x%.8X\n", Address);
          return(Status);
       }
-      /*
-       * Relock the address space and segment
-       */
-      MmLockAddressSpace(AddressSpace);
-      MmLockSectionSegment(Segment);
-
-      /*
-       * Check the entry. No one should change the status of a page
-       * that has a pending page-in.
-       */
-      Entry1 = MmGetPageEntrySectionSegment(Segment, Offset);
-      if (Entry != Entry1)
-      {
-         DPRINT1("Someone changed ppte entry while we slept\n");
-                KeBugCheck(MEMORY_MANAGEMENT);
-      }
 
       /*
        * Mark the offset within the section as having valid, in-memory
        * data
        */
+      MmLockAddressSpace(AddressSpace);
+      MmLockSectionSegment(Segment);
       Entry = MAKE_SSE(Page << PAGE_SHIFT, 1);
-      MmSetPageEntrySectionSegment(Segment, Offset, Entry);
+      MmSetPageEntrySectionSegment(Segment, &Offset, Entry);
       MmUnlockSectionSegment(Segment);
 
       Status = MmCreateVirtualMapping(Process,
-                                      Address,
+                                      PAddress,
                                       Attributes,
                                       &Page,
                                       1);
@@ -1699,8 +1502,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
       }
       MmInsertRmap(Page, Process, Address);
 
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(Process, Address);
       DPRINT("Address 0x%.8X\n", Address);
       return(STATUS_SUCCESS);
    }
@@ -1741,10 +1543,10 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
        * Check the entry. No one should change the status of a page
        * that has a pending page-in.
        */
-      Entry1 = MmGetPageEntrySectionSegment(Segment, Offset);
+      Entry1 = MmGetPageEntrySectionSegment(Segment, &Offset);
       if (Entry != Entry1)
       {
-         DPRINT1("Someone changed ppte entry while we slept\n");
+          DPRINT1("Someone changed ppte entry while we slept (%x vs %x)\n", Entry, Entry1);
           KeBugCheck(MEMORY_MANAGEMENT);
       }
 
@@ -1753,7 +1555,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
        * data
        */
       Entry = MAKE_SSE(Page << PAGE_SHIFT, 1);
-      MmSetPageEntrySectionSegment(Segment, Offset, Entry);
+      MmSetPageEntrySectionSegment(Segment, &Offset, Entry);
       MmUnlockSectionSegment(Segment);
 
       /*
@@ -1761,7 +1563,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
        */
       MmSetSavedSwapEntryPage(Page, SwapEntry);
       Status = MmCreateVirtualMapping(Process,
-                                      Address,
+                                      PAddress,
                                       Region->Protect,
                                       &Page,
                                       1);
@@ -1771,8 +1573,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
           KeBugCheck(MEMORY_MANAGEMENT);
       }
       MmInsertRmap(Page, Process, Address);
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(Process, Address);
       DPRINT("Address 0x%.8X\n", Address);
       return(STATUS_SUCCESS);
    }
@@ -1785,11 +1586,11 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
 
       Page = PFN_FROM_SSE(Entry);
 
-      MmSharePageEntrySectionSegment(Segment, Offset);
+      MmSharePageEntrySectionSegment(Segment, &Offset);
       MmUnlockSectionSegment(Segment);
 
       Status = MmCreateVirtualMapping(Process,
-                                      Address,
+                                      PAddress,
                                       Attributes,
                                       &Page,
                                       1);
@@ -1799,8 +1600,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
           KeBugCheck(MEMORY_MANAGEMENT);
       }
       MmInsertRmap(Page, Process, Address);
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(Process, Address);
       DPRINT("Address 0x%.8X\n", Address);
       return(STATUS_SUCCESS);
    }
@@ -1817,11 +1617,12 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
    PFN_NUMBER OldPage;
    PFN_NUMBER NewPage;
    NTSTATUS Status;
-   ULONG Offset;
-   PMM_PAGEOP PageOp;
+   PVOID PAddress;
+   LARGE_INTEGER Offset;
    PMM_REGION Region;
-   ULONG Entry;
+   ULONG_PTR Entry;
    PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace);
+   SWAPENTRY SwapEntry;
 
    DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address);
 
@@ -1837,22 +1638,23 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
    /*
     * Find the offset of the page
     */
-   Address = MM_ROUND_DOWN(Address, PAGE_SIZE);
-   Offset = (ULONG)((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
-            + MemoryArea->Data.SectionData.ViewOffset);
+   PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE);
+   Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress
+            + MemoryArea->Data.SectionData.ViewOffset.QuadPart;
 
    Segment = MemoryArea->Data.SectionData.Segment;
    Section = MemoryArea->Data.SectionData.Section;
    Region = MmFindRegion(MemoryArea->StartingAddress,
                          &MemoryArea->Data.SectionData.RegionListHead,
                          Address, NULL);
+   ASSERT(Region != NULL);
    /*
     * Lock the segment
     */
    MmLockSectionSegment(Segment);
 
    OldPage = MmGetPfnForProcess(Process, Address);
-   Entry = MmGetPageEntrySectionSegment(Segment, Offset);
+   Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
 
    MmUnlockSectionSegment(Segment);
 
@@ -1875,49 +1677,39 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
       return(STATUS_SUCCESS);
    }
 
+   if(OldPage == 0)
+      DPRINT("OldPage == 0!\n");
+
    /*
     * Get or create a pageop
     */
-   PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset,
-                        MM_PAGEOP_ACCESSFAULT, FALSE);
-   if (PageOp == NULL)
-   {
-      DPRINT1("MmGetPageOp failed\n");
-       KeBugCheck(MEMORY_MANAGEMENT);
-   }
+   MmLockSectionSegment(Segment);
+   Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
 
    /*
     * Wait for any other operations to complete
     */
-   if (PageOp->Thread != PsGetCurrentThread())
+   if (Entry == SWAPENTRY_FROM_SSE(MM_WAIT_ENTRY))
    {
-      MmUnlockAddressSpace(AddressSpace);
-      Status = MmspWaitForPageOpCompletionEvent(PageOp);
-      /*
-      * Check for various strange conditions
-      */
-      if (Status == STATUS_TIMEOUT)
-      {
-         DPRINT1("Failed to wait for page op, status = %x\n", Status);
-          KeBugCheck(MEMORY_MANAGEMENT);
-      }
-      if (PageOp->Status == STATUS_PENDING)
-      {
-         DPRINT1("Woke for page op before completion\n");
-          KeBugCheck(MEMORY_MANAGEMENT);
-      }
-      /*
-      * Restart the operation
-      */
-      MmLockAddressSpace(AddressSpace);
-      MmspCompleteAndReleasePageOp(PageOp);
-      DPRINT("Address 0x%.8X\n", Address);
-      return(STATUS_MM_RESTART_OPERATION);
+       MmUnlockSectionSegment(Segment);
+       MmUnlockAddressSpace(AddressSpace);
+       MiWaitForPageEvent(NULL, NULL);
+       /*
+        * Restart the operation
+        */
+       MmLockAddressSpace(AddressSpace);
+       DPRINT("Address 0x%.8X\n", Address);
+       return(STATUS_MM_RESTART_OPERATION);
    }
 
+   MmDeleteRmap(OldPage, Process, PAddress);
+   MmDeleteVirtualMapping(Process, PAddress, FALSE, NULL, NULL);
+   MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY);
+
    /*
     * Release locks now we have the pageop
     */
+   MmUnlockSectionSegment(Segment);
    MmUnlockAddressSpace(AddressSpace);
 
    /*
@@ -1935,19 +1727,16 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
    /*
     * Copy the old page
     */
-   MiCopyFromUserPage(NewPage, Address);
+   MiCopyFromUserPage(NewPage, OldPage);
 
    MmLockAddressSpace(AddressSpace);
-   /*
-    * Delete the old entry.
-    */
-   MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL);
 
    /*
     * Set the PTE to point to the new page
     */
+   MmDeletePageFileMapping(Process, PAddress, &SwapEntry);
    Status = MmCreateVirtualMapping(Process,
-                                   Address,
+                                   PAddress,
                                    Region->Protect,
                                    &NewPage,
                                    1);
@@ -1966,14 +1755,13 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
    /*
     * Unshare the old page.
     */
-   MmDeleteRmap(OldPage, Process, Address);
-   MmInsertRmap(NewPage, Process, Address);
+   DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage);
+   MmInsertRmap(NewPage, Process, PAddress);
    MmLockSectionSegment(Segment);
-   MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE);
+   MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE, NULL);
    MmUnlockSectionSegment(Segment);
 
-   PageOp->Status = STATUS_SUCCESS;
-   MmspCompleteAndReleasePageOp(PageOp);
+   MiSetPageEvent(Process, Address);
    DPRINT("Address 0x%.8X\n", Address);
    return(STATUS_SUCCESS);
 }
@@ -1983,7 +1771,7 @@ MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address)
 {
    MM_SECTION_PAGEOUT_CONTEXT* PageOutContext;
    BOOLEAN WasDirty;
-   PFN_NUMBER Page;
+   PFN_NUMBER Page = 0;
 
    PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context;
    if (Process)
@@ -2005,9 +1793,10 @@ MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address)
       MmLockSectionSegment(PageOutContext->Segment);
       MmUnsharePageEntrySectionSegment((PROS_SECTION_OBJECT)PageOutContext->Section,
                                        PageOutContext->Segment,
-                                       PageOutContext->Offset,
+                                       &PageOutContext->Offset,
                                        PageOutContext->WasDirty,
-                                       TRUE);
+                                       TRUE,
+                                       &PageOutContext->SectionEntry);
       MmUnlockSectionSegment(PageOutContext->Segment);
    }
    if (Process)
@@ -2019,22 +1808,18 @@ MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address)
    {
       MmReleasePageMemoryConsumer(MC_USER, Page);
    }
-
-   DPRINT("PhysicalAddress %x, Address %x\n", Page << PAGE_SHIFT, Address);
 }
 
 NTSTATUS
 NTAPI
 MmPageOutSectionView(PMMSUPPORT AddressSpace,
                      MEMORY_AREA* MemoryArea,
-                     PVOID Address,
-                     PMM_PAGEOP PageOp)
+                     PVOID Address, ULONG_PTR Entry)
 {
    PFN_NUMBER Page;
    MM_SECTION_PAGEOUT_CONTEXT Context;
    SWAPENTRY SwapEntry;
-   ULONG Entry;
-   ULONG FileOffset;
+   ULONGLONG FileOffset;
    NTSTATUS Status;
    PFILE_OBJECT FileObject;
 #ifndef NEWCC
@@ -2052,18 +1837,23 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
     */
    Context.Segment = MemoryArea->Data.SectionData.Segment;
    Context.Section = MemoryArea->Data.SectionData.Section;
+   Context.SectionEntry = Entry;
+   Context.CallingProcess = Process;
 
-   Context.Offset = (ULONG)((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
-                    + MemoryArea->Data.SectionData.ViewOffset);
-   FileOffset = Context.Offset + Context.Segment->FileOffset;
+   Context.Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
+                    + MemoryArea->Data.SectionData.ViewOffset.QuadPart;
+   FileOffset = Context.Offset.QuadPart + Context.Segment->Image.FileOffset;
 
    IsImageSection = Context.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE;
 
    FileObject = Context.Section->FileObject;
    DirectMapped = FALSE;
+
+   MmLockSectionSegment(Context.Segment);
+
 #ifndef NEWCC
    if (FileObject != NULL &&
-       !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+       !(Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
    {
       Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
 
@@ -2073,7 +1863,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
        * then note this is a direct mapped page.
        */
       if ((FileOffset % PAGE_SIZE) == 0 &&
-            (Context.Offset + PAGE_SIZE <= Context.Segment->RawLength || !IsImageSection))
+            (Context.Offset.QuadPart + PAGE_SIZE <= Context.Segment->RawLength.QuadPart || !IsImageSection))
       {
          DirectMapped = TRUE;
       }
@@ -2096,7 +1886,6 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    /*
     * Get the section segment entry and the physical address.
     */
-   Entry = MmGetPageEntrySectionSegment(Context.Segment, Context.Offset);
    if (!MmIsPagePresent(Process, Address))
    {
       DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n",
@@ -2111,18 +1900,19 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
     */
    if (MmGetReferenceCountPage(Page) != 1)
    {
-       DPRINT1("Cannot page out locked section page: 0x%p (RefCount: %d)\n",
+       DPRINT("Cannot page out locked section page: 0x%p (RefCount: %d)\n",
                Page, MmGetReferenceCountPage(Page));
-       PageOp->Status = STATUS_UNSUCCESSFUL;
-       MmspCompleteAndReleasePageOp(PageOp);
+       MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry);
+       MmUnlockSectionSegment(Context.Segment);
        return STATUS_UNSUCCESSFUL;
    }
 
    /*
     * Prepare the context structure for the rmap delete call.
     */
+   MmUnlockSectionSegment(Context.Segment);
    Context.WasDirty = FALSE;
-   if (Context.Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA ||
+   if (Context.Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA ||
          IS_SWAP_FROM_SSE(Entry) ||
          PFN_FROM_SSE(Entry) != Page)
    {
@@ -2138,7 +1928,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
     */
    if (DirectMapped && !Context.Private)
    {
-      if(!MiIsPageFromCache(MemoryArea, Context.Offset))
+      if(!MiIsPageFromCache(MemoryArea, Context.Offset.LowPart))
       {
          DPRINT1("Direct mapped non private page is not associated with the cache.\n");
           KeBugCheck(MEMORY_MANAGEMENT);
@@ -2153,16 +1943,22 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
 
    MmDeleteAllRmaps(Page, (PVOID)&Context, MmPageOutDeleteMapping);
 
+   /* Since we passed in a surrogate, we'll get back the page entry
+    * state in our context.  This is intended to make intermediate
+    * decrements of share count not release the wait entry.
+    */
+   Entry = Context.SectionEntry;
+
    /*
     * If this wasn't a private page then we should have reduced the entry to
     * zero by deleting all the rmaps.
     */
-   if (!Context.Private && MmGetPageEntrySectionSegment(Context.Segment, Context.Offset) != 0)
+   if (!Context.Private && Entry != 0)
    {
       if (!(Context.Segment->Flags & MM_PAGEFILE_SEGMENT) &&
-            !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+            !(Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
       {
-          KeBugCheck(MEMORY_MANAGEMENT);
+          KeBugCheckEx(MEMORY_MANAGEMENT, Entry, (ULONG_PTR)Process, (ULONG_PTR)Address, 0);
       }
    }
 
@@ -2180,36 +1976,38 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
       {
          DPRINT1("Found a %s private page (address %x) in a pagefile segment.\n",
                  Context.WasDirty ? "dirty" : "clean", Address);
-          KeBugCheck(MEMORY_MANAGEMENT);
+         KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address, 0);
       }
       if (!Context.WasDirty && SwapEntry != 0)
       {
          MmSetSavedSwapEntryPage(Page, 0);
-         MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry));
+         MmLockSectionSegment(Context.Segment);
+         MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry));
+         MmUnlockSectionSegment(Context.Segment);
          MmReleasePageMemoryConsumer(MC_USER, Page);
-         PageOp->Status = STATUS_SUCCESS;
-         MmspCompleteAndReleasePageOp(PageOp);
+         MiSetPageEvent(NULL, NULL);
          return(STATUS_SUCCESS);
       }
    }
-   else if (Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)
+   else if (Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)
    {
       if (Context.Private)
       {
          DPRINT1("Found a %s private page (address %x) in a shared section segment.\n",
                  Context.WasDirty ? "dirty" : "clean", Address);
-          KeBugCheck(MEMORY_MANAGEMENT);
+         KeBugCheckEx(MEMORY_MANAGEMENT, Page, (ULONG_PTR)Process, (ULONG_PTR)Address, 0);
       }
       if (!Context.WasDirty || SwapEntry != 0)
       {
          MmSetSavedSwapEntryPage(Page, 0);
          if (SwapEntry != 0)
          {
-            MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry));
+            MmLockSectionSegment(Context.Segment);
+            MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry));
+            MmUnlockSectionSegment(Context.Segment);
          }
          MmReleasePageMemoryConsumer(MC_USER, Page);
-         PageOp->Status = STATUS_SUCCESS;
-         MmspCompleteAndReleasePageOp(PageOp);
+         MiSetPageEvent(NULL, NULL);
          return(STATUS_SUCCESS);
       }
    }
@@ -2219,20 +2017,21 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
       {
          DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n",
                  Address);
-         KeBugCheck(MEMORY_MANAGEMENT);
+         KeBugCheckEx(MEMORY_MANAGEMENT, STATUS_UNSUCCESSFUL, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address);
       }
 #ifndef NEWCC
-      Status = CcRosUnmapCacheSegment(Bcb, FileOffset, FALSE);
+      Status = CcRosUnmapCacheSegment(Bcb, (ULONG)FileOffset, FALSE);
 #else
-         Status = STATUS_SUCCESS;
+      Status = STATUS_SUCCESS;
 #endif
+#ifndef NEWCC
       if (!NT_SUCCESS(Status))
       {
          DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status);
-         KeBugCheck(MEMORY_MANAGEMENT);
+         KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Bcb, (ULONG_PTR)FileOffset, (ULONG_PTR)Address);
       }
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+#endif
+      MiSetPageEvent(NULL, NULL);
       return(STATUS_SUCCESS);
    }
    else if (!Context.WasDirty && !DirectMapped && !Context.Private)
@@ -2241,15 +2040,15 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
       {
          DPRINT1("Found a swap entry for a non dirty, non private and not direct mapped page (address %x)\n",
                  Address);
-         KeBugCheck(MEMORY_MANAGEMENT);
+         KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address);
       }
       MmReleasePageMemoryConsumer(MC_USER, Page);
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(NULL, NULL);
       return(STATUS_SUCCESS);
    }
    else if (!Context.WasDirty && Context.Private && SwapEntry != 0)
    {
+      DPRINT("Not dirty and private and not swapped (%p:%p)\n", Process, Address);
       MmSetSavedSwapEntryPage(Page, 0);
       MmLockAddressSpace(AddressSpace);
       Status = MmCreatePageFileMapping(Process,
@@ -2258,11 +2057,11 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
       MmUnlockAddressSpace(AddressSpace);
       if (!NT_SUCCESS(Status))
       {
-         KeBugCheck(MEMORY_MANAGEMENT);
+         DPRINT1("Status %x Swapping out %p:%p\n", Status, Process, Address);
+         KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Process, (ULONG_PTR)Address, SwapEntry);
       }
       MmReleasePageMemoryConsumer(MC_USER, Page);
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(NULL, NULL);
       return(STATUS_SUCCESS);
    }
 
@@ -2293,6 +2092,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
          }
          else
          {
+            ULONG_PTR OldEntry;
             /*
              * For non-private pages if the page wasn't direct mapped then
              * set it back into the section segment entry so we don't loose
@@ -2307,12 +2107,16 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
             MmInsertRmap(Page,
                          Process,
                          Address);
+            // If we got here, the previous entry should have been a wait
             Entry = MAKE_SSE(Page << PAGE_SHIFT, 1);
-            MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry);
+            MmLockSectionSegment(Context.Segment);
+            OldEntry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset);
+            ASSERT(OldEntry == 0 || OldEntry == MAKE_SWAP_SSE(MM_WAIT_ENTRY));
+            MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry);
+            MmUnlockSectionSegment(Context.Segment);
          }
          MmUnlockAddressSpace(AddressSpace);
-         PageOp->Status = STATUS_UNSUCCESSFUL;
-         MmspCompleteAndReleasePageOp(PageOp);
+         MiSetPageEvent(NULL, NULL);
          return(STATUS_PAGEFILE_QUOTA);
       }
    }
@@ -2354,11 +2158,10 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
                       Process,
                       Address);
          Entry = MAKE_SSE(Page << PAGE_SHIFT, 1);
-         MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry);
+         MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry);
       }
       MmUnlockAddressSpace(AddressSpace);
-      PageOp->Status = STATUS_UNSUCCESSFUL;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(NULL, NULL);
       return(STATUS_UNSUCCESSFUL);
    }
 
@@ -2368,9 +2171,11 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT);
    MmSetSavedSwapEntryPage(Page, 0);
    if (Context.Segment->Flags & MM_PAGEFILE_SEGMENT ||
-         Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)
+         Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)
    {
-      MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry));
+      MmLockSectionSegment(Context.Segment);
+      MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry));
+      MmUnlockSectionSegment(Context.Segment);
    }
    else
    {
@@ -2380,23 +2185,29 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
    if (Context.Private)
    {
       MmLockAddressSpace(AddressSpace);
+      MmLockSectionSegment(Context.Segment);
       Status = MmCreatePageFileMapping(Process,
                                        Address,
                                        SwapEntry);
+      MmUnlockSectionSegment(Context.Segment);
       MmUnlockAddressSpace(AddressSpace);
       if (!NT_SUCCESS(Status))
       {
-         KeBugCheck(MEMORY_MANAGEMENT);
+         DPRINT1("Status %x Creating page file mapping for %p:%p\n", Status, Process, Address);
+         KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Process, (ULONG_PTR)Address, SwapEntry);
       }
    }
    else
    {
+      MmLockAddressSpace(AddressSpace);
+      MmLockSectionSegment(Context.Segment);
       Entry = MAKE_SWAP_SSE(SwapEntry);
-      MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry);
+      MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry);
+      MmUnlockSectionSegment(Context.Segment);
+      MmUnlockAddressSpace(AddressSpace);
    }
 
-   PageOp->Status = STATUS_SUCCESS;
-   MmspCompleteAndReleasePageOp(PageOp);
+   MiSetPageEvent(NULL, NULL);
    return(STATUS_SUCCESS);
 }
 
@@ -2405,14 +2216,14 @@ NTAPI
 MmWritePageSectionView(PMMSUPPORT AddressSpace,
                        PMEMORY_AREA MemoryArea,
                        PVOID Address,
-                       PMM_PAGEOP PageOp)
+                       ULONG PageEntry)
 {
-   ULONG_PTR Offset;
+   LARGE_INTEGER Offset;
    PROS_SECTION_OBJECT Section;
    PMM_SECTION_SEGMENT Segment;
    PFN_NUMBER Page;
    SWAPENTRY SwapEntry;
-   ULONG Entry;
+   ULONG_PTR Entry;
    BOOLEAN Private;
    NTSTATUS Status;
    PFILE_OBJECT FileObject;
@@ -2423,8 +2234,8 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
 
    Address = (PVOID)PAGE_ROUND_DOWN(Address);
 
-   Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
-            + MemoryArea->Data.SectionData.ViewOffset;
+   Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
+            + MemoryArea->Data.SectionData.ViewOffset.QuadPart;
 
    /*
     * Get the segment and section.
@@ -2436,7 +2247,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
    FileObject = Section->FileObject;
    DirectMapped = FALSE;
    if (FileObject != NULL &&
-         !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED))
+         !(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))
    {
       Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
 
@@ -2445,8 +2256,8 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
        * memory area was mapped at an offset in the file which is page aligned
        * then note this is a direct mapped page.
        */
-      if (((Offset + Segment->FileOffset) % PAGE_SIZE) == 0 &&
-            (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection))
+      if (((Offset.QuadPart + Segment->Image.FileOffset) % PAGE_SIZE) == 0 &&
+            (Offset.QuadPart + PAGE_SIZE <= Segment->RawLength.QuadPart || !IsImageSection))
       {
          DirectMapped = TRUE;
       }
@@ -2467,7 +2278,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
    /*
     * Get the section segment entry and the physical address.
     */
-   Entry = MmGetPageEntrySectionSegment(Segment, Offset);
+   Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
    if (!MmIsPagePresent(Process, Address))
    {
       DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n",
@@ -2480,7 +2291,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
    /*
     * Check for a private (COWed) page.
     */
-   if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA ||
+   if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA ||
          IS_SWAP_FROM_SSE(Entry) ||
          PFN_FROM_SSE(Entry) != Page)
    {
@@ -2502,12 +2313,16 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
     */
    if (DirectMapped && !Private)
    {
+      LARGE_INTEGER SOffset;
       ASSERT(SwapEntry == 0);
+      SOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset;
 #ifndef NEWCC
-      CcRosMarkDirtyCacheSegment(Bcb, (ULONG)Offset + Segment->FileOffset);
+      CcRosMarkDirtyCacheSegment(Bcb, Offset.LowPart);
 #endif
-      PageOp->Status = STATUS_SUCCESS;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MmLockSectionSegment(Segment);
+      MmSetPageEntrySectionSegment(Segment, &Offset, PageEntry);
+      MmUnlockSectionSegment(Segment);
+      MiSetPageEvent(NULL, NULL);
       return(STATUS_SUCCESS);
    }
 
@@ -2520,8 +2335,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
       if (SwapEntry == 0)
       {
          MmSetDirtyAllRmaps(Page);
-         PageOp->Status = STATUS_UNSUCCESSFUL;
-         MmspCompleteAndReleasePageOp(PageOp);
+         MiSetPageEvent(NULL, NULL);
          return(STATUS_PAGEFILE_QUOTA);
       }
       MmSetSavedSwapEntryPage(Page, SwapEntry);
@@ -2536,8 +2350,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
       DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n",
               Status);
       MmSetDirtyAllRmaps(Page);
-      PageOp->Status = STATUS_UNSUCCESSFUL;
-      MmspCompleteAndReleasePageOp(PageOp);
+      MiSetPageEvent(NULL, NULL);
       return(STATUS_UNSUCCESSFUL);
    }
 
@@ -2545,8 +2358,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace,
     * Otherwise we have succeeded.
     */
    DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT);
-   PageOp->Status = STATUS_SUCCESS;
-   MmspCompleteAndReleasePageOp(PageOp);
+   MiSetPageEvent(NULL, NULL);
    return(STATUS_SUCCESS);
 }
 
@@ -2566,8 +2378,9 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace,
    PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace);
 
    MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);
-   ASSERT(MemoryArea);
+   ASSERT(MemoryArea != NULL);
    Segment = MemoryArea->Data.SectionData.Segment;
+   MmLockSectionSegment(Segment);
 
    if ((Segment->WriteCopy) &&
          (NewProtect == PAGE_READWRITE || NewProtect == PAGE_EXECUTE_READWRITE))
@@ -2579,26 +2392,39 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace,
    {
       for (i = 0; i < PAGE_ROUND_UP(RegionSize) / PAGE_SIZE; i++)
       {
+         SWAPENTRY SwapEntry;
          PVOID Address = (char*)BaseAddress + (i * PAGE_SIZE);
          ULONG Protect = NewProtect;
 
+         /* Wait for a wait entry to disappear */
+         do {
+             MmGetPageFileMapping(Process, Address, &SwapEntry);
+             if (SwapEntry != MM_WAIT_ENTRY)
+                 break;
+             MiWaitForPageEvent(Process, Address);
+         } while (TRUE);
+
          /*
           * If we doing COW for this segment then check if the page is
           * already private.
           */
          if (DoCOW && MmIsPagePresent(Process, Address))
          {
-            ULONG_PTR Offset;
-            ULONG Entry;
+            LARGE_INTEGER Offset;
+            ULONG_PTR Entry;
             PFN_NUMBER Page;
 
-            Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
-                     + MemoryArea->Data.SectionData.ViewOffset;
-            Entry = MmGetPageEntrySectionSegment(Segment, Offset);
+            Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress
+                     + MemoryArea->Data.SectionData.ViewOffset.QuadPart;
+            Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
+            /*
+             * An MM_WAIT_ENTRY is ok in this case...  It'll just count as
+             * IS_SWAP_FROM_SSE and we'll do the right thing.
+             */
             Page = MmGetPfnForProcess(Process, Address);
 
             Protect = PAGE_READONLY;
-            if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA ||
+            if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA ||
                   IS_SWAP_FROM_SSE(Entry) ||
                   PFN_FROM_SSE(Entry) != Page)
             {
@@ -2613,6 +2439,8 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace,
          }
       }
    }
+
+   MmUnlockSectionSegment(Segment);
 }
 
 NTSTATUS
@@ -2635,6 +2463,8 @@ MmProtectSectionView(PMMSUPPORT AddressSpace,
    Region = MmFindRegion(MemoryArea->StartingAddress,
                          &MemoryArea->Data.SectionData.RegionListHead,
                          BaseAddress, NULL);
+   ASSERT(Region != NULL);
+
    if ((MemoryArea->Flags & SEC_NO_CHANGE) &&
        Region->Protect != Protect)
    {
@@ -2673,7 +2503,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea,
    if (Section->AllocationAttributes & SEC_IMAGE)
    {
       Segment = MemoryArea->Data.SectionData.Segment;
-      Info->AllocationBase = (PUCHAR)MemoryArea->StartingAddress - Segment->VirtualAddress;
+      Info->AllocationBase = (PUCHAR)MemoryArea->StartingAddress - Segment->Image.VirtualAddress;
       Info->Type = MEM_IMAGE;
    }
    else
@@ -2696,19 +2526,22 @@ NTAPI
 MmpFreePageFileSegment(PMM_SECTION_SEGMENT Segment)
 {
    ULONG Length;
-   ULONG Offset;
-   ULONG Entry;
+   LARGE_INTEGER Offset;
+   ULONG_PTR Entry;
    SWAPENTRY SavedSwapEntry;
    PFN_NUMBER Page;
 
    Page = 0;
 
-   Length = PAGE_ROUND_UP(Segment->Length);
-   for (Offset = 0; Offset < Length; Offset += PAGE_SIZE)
+   MmLockSectionSegment(Segment);
+
+   Length = PAGE_ROUND_UP(Segment->Length.QuadPart);
+   for (Offset.QuadPart = 0; Offset.QuadPart < Length; Offset.QuadPart += PAGE_SIZE)
    {
-      Entry = MmGetPageEntrySectionSegment(Segment, Offset);
+      Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
       if (Entry)
       {
+         MmSetPageEntrySectionSegment(Segment, &Offset, 0);
          if (IS_SWAP_FROM_SSE(Entry))
          {
             MmFreeSwapPage(SWAPENTRY_FROM_SSE(Entry));
@@ -2724,9 +2557,10 @@ MmpFreePageFileSegment(PMM_SECTION_SEGMENT Segment)
             }
             MmReleasePageMemoryConsumer(MC_USER, Page);
          }
-         MmSetPageEntrySectionSegment(Segment, Offset, 0);
       }
    }
+
+   MmUnlockSectionSegment(Segment);
 }
 
 VOID NTAPI
@@ -2734,7 +2568,7 @@ MmpDeleteSection(PVOID ObjectBody)
 {
    PROS_SECTION_OBJECT Section = (PROS_SECTION_OBJECT)ObjectBody;
 
-   DPRINT("MmpDeleteSection(ObjectBody %x)\n", ObjectBody);
+   DPRINT("MmpDeleteSection(ObjectBody %p)\n", ObjectBody);
    if (Section->AllocationAttributes & SEC_IMAGE)
    {
       ULONG i;
@@ -2756,21 +2590,40 @@ MmpDeleteSection(PVOID ObjectBody)
 
       for (i = 0; i < NrSegments; i++)
       {
-         if (SectionSegments[i].Characteristics & IMAGE_SCN_MEM_SHARED)
+         if (SectionSegments[i].Image.Characteristics & IMAGE_SCN_MEM_SHARED)
          {
             MmLockSectionSegment(&SectionSegments[i]);
          }
          RefCount = InterlockedDecrementUL(&SectionSegments[i].ReferenceCount);
-         if (SectionSegments[i].Characteristics & IMAGE_SCN_MEM_SHARED)
+         if (SectionSegments[i].Image.Characteristics & IMAGE_SCN_MEM_SHARED)
          {
+            MmUnlockSectionSegment(&SectionSegments[i]);
             if (RefCount == 0)
             {
                MmpFreePageFileSegment(&SectionSegments[i]);
             }
-            MmUnlockSectionSegment(&SectionSegments[i]);
          }
       }
    }
+#ifdef NEWCC
+   else if (Section->Segment && Section->Segment->Flags & MM_DATAFILE_SEGMENT)
+   {
+         ULONG RefCount = 0;
+         PMM_SECTION_SEGMENT Segment = Section->Segment;
+
+         if (Segment &&
+                 (RefCount = InterlockedDecrementUL(&Segment->ReferenceCount)) == 0)
+         {
+                 DPRINT("Freeing section segment\n");
+                 Section->Segment = NULL;
+                 MmFinalizeSegment(Segment);
+         }
+         else
+         {
+                 DPRINT("RefCount %d\n", RefCount);
+         }
+   }
+#endif
    else
    {
       /*
@@ -2783,7 +2636,7 @@ MmpDeleteSection(PVOID ObjectBody)
       if (Section->Segment->Flags & MM_PAGEFILE_SEGMENT)
       {
          MmpFreePageFileSegment(Section->Segment);
-         MmFreePageTablesSectionSegment(Section->Segment);
+         MmFreePageTablesSectionSegment(Section->Segment, NULL);
          ExFreePool(Section->Segment);
          Section->Segment = NULL;
       }
@@ -2874,6 +2727,10 @@ MmInitSectionImplementation(VOID)
 
    DPRINT("Creating Section Object Type\n");
 
+   /* Initialize the section based root */
+   ASSERT(MmSectionBasedRoot.NumberGenericTableElements == 0);
+   MmSectionBasedRoot.BalancedRoot.u1.Parent = &MmSectionBasedRoot.BalancedRoot;
+
    /* Initialize the Section object type  */
    RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
    RtlInitUnicodeString(&Name, L"Section");
@@ -2936,6 +2793,8 @@ MmCreatePageFileSection(PROS_SECTION_OBJECT *SectionObject,
     * Initialize it
     */
    RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT));
+   Section->Type = 'SC';
+   Section->Size = 'TN';
    Section->SectionPageProtection = SectionPageProtection;
    Section->AllocationAttributes = AllocationAttributes;
    Section->MaximumSize = MaximumSize;
@@ -2946,23 +2805,23 @@ MmCreatePageFileSection(PROS_SECTION_OBJECT *SectionObject,
       ObDereferenceObject(Section);
       return(STATUS_NO_MEMORY);
    }
+   RtlZeroMemory(Segment, sizeof(MM_SECTION_SEGMENT));
    Section->Segment = Segment;
    Segment->ReferenceCount = 1;
    ExInitializeFastMutex(&Segment->Lock);
-   Segment->FileOffset = 0;
+   Segment->Image.FileOffset = 0;
    Segment->Protection = SectionPageProtection;
-   Segment->RawLength = MaximumSize.u.LowPart;
-   Segment->Length = PAGE_ROUND_UP(MaximumSize.u.LowPart);
+   Segment->RawLength.QuadPart = MaximumSize.u.LowPart;
+   Segment->Length.QuadPart = PAGE_ROUND_UP(MaximumSize.u.LowPart);
    Segment->Flags = MM_PAGEFILE_SEGMENT;
    Segment->WriteCopy = FALSE;
-   RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY));
-   Segment->VirtualAddress = 0;
-   Segment->Characteristics = 0;
+   Segment->Image.VirtualAddress = 0;
+   Segment->Image.Characteristics = 0;
    *SectionObject = Section;
+   MiInitializeSectionPageTable(Segment);
    return(STATUS_SUCCESS);
 }
 
-
 NTSTATUS
 NTAPI
 MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject,
@@ -2999,7 +2858,7 @@ MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject,
                            sizeof(ROS_SECTION_OBJECT),
                            0,
                            0,
-                           (PVOID*)(PVOID)&Section);
+                           (PVOID*)&Section);
    if (!NT_SUCCESS(Status))
    {
       return(Status);
@@ -3008,26 +2867,16 @@ MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject,
     * Initialize it
     */
    RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT));
+   Section->Type = 'SC';
+   Section->Size = 'TN';
    Section->SectionPageProtection = SectionPageProtection;
    Section->AllocationAttributes = AllocationAttributes;
 
-   /*
-    * Check file access required
-    */
-   if (SectionPageProtection & PAGE_READWRITE ||
-         SectionPageProtection & PAGE_EXECUTE_READWRITE)
-   {
-      FileAccess = FILE_READ_DATA | FILE_WRITE_DATA;
-   }
-   else
-   {
-      FileAccess = FILE_READ_DATA;
-   }
-
    /*
     * Reference the file handle
     */
-   Status = ObReferenceObjectByHandle(FileHandle,
+    FileAccess = MiArm3GetCorrectFileAccessMask(SectionPageProtection);
+    Status = ObReferenceObjectByHandle(FileHandle,
                                       FileAccess,
                                       IoFileObjectType,
                                       ExGetPreviousMode(),
@@ -3161,22 +3010,23 @@ MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject,
       ExAcquireFastMutex(&Segment->Lock);
       FileObject->SectionObjectPointer->DataSectionObject = (PVOID)Segment;
 
-      Segment->FileOffset = 0;
+      Segment->Image.FileOffset = 0;
       Segment->Protection = SectionPageProtection;
       Segment->Flags = MM_DATAFILE_SEGMENT;
-      Segment->Characteristics = 0;
-      Segment->WriteCopy = FALSE;
+      Segment->Image.Characteristics = 0;
+      Segment->WriteCopy = (SectionPageProtection & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY));
       if (AllocationAttributes & SEC_RESERVE)
       {
-         Segment->Length = Segment->RawLength = 0;
+         Segment->Length.QuadPart = Segment->RawLength.QuadPart = 0;
       }
       else
       {
-         Segment->RawLength = MaximumSize.u.LowPart;
-         Segment->Length = PAGE_ROUND_UP(Segment->RawLength);
+         Segment->RawLength.QuadPart = MaximumSize.QuadPart;
+         Segment->Length.QuadPart = PAGE_ROUND_UP(Segment->RawLength.QuadPart);
       }
-      Segment->VirtualAddress = 0;
-      RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY));
+      Segment->Image.VirtualAddress = 0;
+      Segment->Locked = TRUE;
+      MiInitializeSectionPageTable(Segment);
    }
    else
    {
@@ -3191,11 +3041,11 @@ MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject,
       (void)InterlockedIncrementUL(&Segment->ReferenceCount);
       MmLockSectionSegment(Segment);
 
-      if (MaximumSize.u.LowPart > Segment->RawLength &&
+      if (MaximumSize.QuadPart > Segment->RawLength.QuadPart &&
             !(AllocationAttributes & SEC_RESERVE))
       {
-         Segment->RawLength = MaximumSize.u.LowPart;
-         Segment->Length = PAGE_ROUND_UP(Segment->RawLength);
+         Segment->RawLength.QuadPart = MaximumSize.QuadPart;
+         Segment->Length.QuadPart = PAGE_ROUND_UP(Segment->RawLength.QuadPart);
       }
    }
    MmUnlockSectionSegment(Segment);
@@ -3286,6 +3136,8 @@ ExeFmtpReadFile(IN PVOID File,
    ULONG BufferSize;
    ULONG UsedSize;
    PVOID Buffer;
+   PFILE_OBJECT FileObject = File;
+   IO_STATUS_BLOCK Iosb;
 
    ASSERT_IRQL_LESS(DISPATCH_LEVEL);
 
@@ -3325,38 +3177,9 @@ ExeFmtpReadFile(IN PVOID File,
 
    UsedSize = 0;
 
-#if 0
-   Status = MmspPageRead(File,
-                         Buffer,
-                         BufferSize,
-                         &FileOffset,
-                         &UsedSize);
-#else
-/*
- * FIXME: if we don't use ZwReadFile, caching is not enabled for the file and
- * nothing will work. But using ZwReadFile is wrong, and using its side effects
- * to initialize internal state is even worse. Our cache manager is in need of
- * professional help
- */
-   {
-      IO_STATUS_BLOCK Iosb;
+   Status = MiSimpleRead(FileObject, &FileOffset, Buffer, BufferSize, TRUE, &Iosb);
 
-      Status = ZwReadFile(File,
-                          NULL,
-                          NULL,
-                          NULL,
-                          &Iosb,
-                          Buffer,
-                          BufferSize,
-                          &FileOffset,
-                          NULL);
-
-      if(NT_SUCCESS(Status))
-      {
-         UsedSize = (ULONG)Iosb.Information;
-      }
-   }
-#endif
+   UsedSize = (ULONG)Iosb.Information;
 
    if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment)
    {
@@ -3392,8 +3215,8 @@ MmspAssertSegmentsSorted(IN PMM_IMAGE_SECTION_OBJECT ImageSectionObject)
 
    for( i = 1; i < ImageSectionObject->NrSegments; ++ i )
    {
-      ASSERT(ImageSectionObject->Segments[i].VirtualAddress >=
-             ImageSectionObject->Segments[i - 1].VirtualAddress);
+      ASSERT(ImageSectionObject->Segments[i].Image.VirtualAddress >=
+             ImageSectionObject->Segments[i - 1].Image.VirtualAddress);
    }
 }
 
@@ -3408,13 +3231,13 @@ MmspAssertSegmentsNoOverlap(IN PMM_IMAGE_SECTION_OBJECT ImageSectionObject)
 
    for( i = 0; i < ImageSectionObject->NrSegments; ++ i )
    {
-      ASSERT(ImageSectionObject->Segments[i].Length > 0);
+      ASSERT(ImageSectionObject->Segments[i].Length.QuadPart > 0);
 
       if(i > 0)
       {
-         ASSERT(ImageSectionObject->Segments[i].VirtualAddress >=
-                (ImageSectionObject->Segments[i - 1].VirtualAddress +
-                 ImageSectionObject->Segments[i - 1].Length));
+         ASSERT(ImageSectionObject->Segments[i].Image.VirtualAddress >=
+                (ImageSectionObject->Segments[i - 1].Image.VirtualAddress +
+                 ImageSectionObject->Segments[i - 1].Length.QuadPart));
       }
    }
 }
@@ -3428,8 +3251,8 @@ MmspAssertSegmentsPageAligned(IN PMM_IMAGE_SECTION_OBJECT ImageSectionObject)
 
    for( i = 0; i < ImageSectionObject->NrSegments; ++ i )
    {
-      ASSERT((ImageSectionObject->Segments[i].VirtualAddress % PAGE_SIZE) == 0);
-      ASSERT((ImageSectionObject->Segments[i].Length % PAGE_SIZE) == 0);
+      ASSERT((ImageSectionObject->Segments[i].Image.VirtualAddress % PAGE_SIZE) == 0);
+      ASSERT((ImageSectionObject->Segments[i].Length.QuadPart % PAGE_SIZE) == 0);
    }
 }
 #endif
@@ -3444,7 +3267,7 @@ MmspCompareSegments(const void * x,
    const MM_SECTION_SEGMENT *Segment2 = (const MM_SECTION_SEGMENT *)y;
 
    return
-      (Segment1->VirtualAddress - Segment2->VirtualAddress) >>
+      (Segment1->Image.VirtualAddress - Segment2->Image.VirtualAddress) >>
       ((sizeof(ULONG_PTR) - sizeof(int)) * 8);
 }
 
@@ -3497,7 +3320,7 @@ MmspCheckSegmentBounds
 
    for ( i = 0; i < ImageSectionObject->NrSegments; ++ i )
    {
-      if(ImageSectionObject->Segments[i].Length == 0)
+      if(ImageSectionObject->Segments[i].Length.QuadPart == 0)
       {
          return FALSE;
       }
@@ -3511,9 +3334,9 @@ MmspCheckSegmentBounds
           * (NtMapViewOfSection could then refuse to map them, and they could
           * e.g. only be allowed as parameters to NtCreateProcess, like on UNIX)
           */
-         if ((ImageSectionObject->Segments[i - 1].VirtualAddress +
-              ImageSectionObject->Segments[i - 1].Length) !=
-              ImageSectionObject->Segments[i].VirtualAddress)
+         if ((ImageSectionObject->Segments[i - 1].Image.VirtualAddress +
+              ImageSectionObject->Segments[i - 1].Length.QuadPart) !=
+              ImageSectionObject->Segments[i].Image.VirtualAddress)
          {
             return FALSE;
          }
@@ -3559,19 +3382,19 @@ MmspPageAlignSegments
          ULONG_PTR VirtualAddress;
          ULONG_PTR VirtualOffset;
 
-         VirtualAddress = EffectiveSegment->VirtualAddress;
+         VirtualAddress = EffectiveSegment->Image.VirtualAddress;
 
          /* Round down the virtual address to the nearest page */
-         EffectiveSegment->VirtualAddress = PAGE_ROUND_DOWN(VirtualAddress);
+         EffectiveSegment->Image.VirtualAddress = PAGE_ROUND_DOWN(VirtualAddress);
 
          /* Round up the virtual size to the nearest page */
-         EffectiveSegment->Length = (ULONG)(PAGE_ROUND_UP(VirtualAddress + EffectiveSegment->Length) -
-                                    EffectiveSegment->VirtualAddress);
+         EffectiveSegment->Length.QuadPart = PAGE_ROUND_UP(VirtualAddress + EffectiveSegment->Length.QuadPart) -
+                                    EffectiveSegment->Image.VirtualAddress;
 
          /* Adjust the raw address and size */
-         VirtualOffset = VirtualAddress - EffectiveSegment->VirtualAddress;
+         VirtualOffset = VirtualAddress - EffectiveSegment->Image.VirtualAddress;
 
-         if (EffectiveSegment->FileOffset < (LONG_PTR)VirtualOffset)
+         if (EffectiveSegment->Image.FileOffset < VirtualOffset)
          {
             return FALSE;
          }
@@ -3581,22 +3404,22 @@ MmspPageAlignSegments
           * offset point in curious and odd places, but that's what we were
           * asked for
           */
-         EffectiveSegment->FileOffset -= (ULONG)VirtualOffset;
-         EffectiveSegment->RawLength += (ULONG)VirtualOffset;
+         EffectiveSegment->Image.FileOffset -= VirtualOffset;
+         EffectiveSegment->RawLength.QuadPart += VirtualOffset;
       }
       else
       {
          PMM_SECTION_SEGMENT Segment = &ImageSectionObject->Segments[i];
          ULONG_PTR EndOfEffectiveSegment;
 
-         EndOfEffectiveSegment = EffectiveSegment->VirtualAddress + EffectiveSegment->Length;
+         EndOfEffectiveSegment = (ULONG_PTR)(EffectiveSegment->Image.VirtualAddress + EffectiveSegment->Length.QuadPart);
          ASSERT((EndOfEffectiveSegment % PAGE_SIZE) == 0);
 
          /*
           * The current segment begins exactly where the current effective
           * segment ended, therefore beginning a new effective segment
           */
-         if (EndOfEffectiveSegment == Segment->VirtualAddress)
+         if (EndOfEffectiveSegment == Segment->Image.VirtualAddress)
          {
             LastSegment ++;
             ASSERT(LastSegment <= i);
@@ -3617,14 +3440,14 @@ MmspPageAlignSegments
              * Page-align the virtual size. We know for sure the virtual address
              * already is
              */
-            ASSERT((EffectiveSegment->VirtualAddress % PAGE_SIZE) == 0);
-            EffectiveSegment->Length = PAGE_ROUND_UP(EffectiveSegment->Length);
+            ASSERT((EffectiveSegment->Image.VirtualAddress % PAGE_SIZE) == 0);
+            EffectiveSegment->Length.QuadPart = PAGE_ROUND_UP(EffectiveSegment->Length.QuadPart);
          }
          /*
           * The current segment is still part of the current effective segment:
           * extend the effective segment to reflect this
           */
-         else if (EndOfEffectiveSegment > Segment->VirtualAddress)
+         else if (EndOfEffectiveSegment > Segment->Image.VirtualAddress)
          {
             static const ULONG FlagsToProtection[16] =
             {
@@ -3653,21 +3476,21 @@ MmspPageAlignSegments
              */
 
             /* Unaligned segments must be contiguous within the file */
-            if (Segment->FileOffset != (EffectiveSegment->FileOffset +
-                                        EffectiveSegment->RawLength))
+            if (Segment->Image.FileOffset != (EffectiveSegment->Image.FileOffset +
+                                        EffectiveSegment->RawLength.QuadPart))
             {
                return FALSE;
             }
 
-            EffectiveSegment->RawLength += Segment->RawLength;
+            EffectiveSegment->RawLength.QuadPart += Segment->RawLength.QuadPart;
 
             /*
              * Extend the virtual size
              */
-            ASSERT(PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) >= EndOfEffectiveSegment);
+            ASSERT(PAGE_ROUND_UP(Segment->Image.VirtualAddress + Segment->Length.QuadPart) >= EndOfEffectiveSegment);
 
-            EffectiveSegment->Length = (ULONG)(PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) -
-                                       EffectiveSegment->VirtualAddress);
+            EffectiveSegment->Length.QuadPart = PAGE_ROUND_UP(Segment->Image.VirtualAddress + Segment->Length.QuadPart) -
+                                       EffectiveSegment->Image.VirtualAddress;
 
             /*
              * Merge the protection
@@ -3855,9 +3678,7 @@ ExeFmtpCreateImageSection(HANDLE FileHandle,
    {
       ExInitializeFastMutex(&ImageSectionObject->Segments[i].Lock);
       ImageSectionObject->Segments[i].ReferenceCount = 1;
-
-      RtlZeroMemory(&ImageSectionObject->Segments[i].PageDirectory,
-                    sizeof(ImageSectionObject->Segments[i].PageDirectory));
+      MiInitializeSectionPageTable(&ImageSectionObject->Segments[i]);
    }
 
    ASSERT(NT_SUCCESS(Status));
@@ -3871,43 +3692,16 @@ MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject,
                      PLARGE_INTEGER UMaximumSize,
                      ULONG SectionPageProtection,
                      ULONG AllocationAttributes,
-                     HANDLE FileHandle)
+                     PFILE_OBJECT FileObject)
 {
    PROS_SECTION_OBJECT Section;
    NTSTATUS Status;
-   PFILE_OBJECT FileObject;
    PMM_SECTION_SEGMENT SectionSegments;
    PMM_IMAGE_SECTION_OBJECT ImageSectionObject;
    ULONG i;
-   ULONG FileAccess = 0;
 
-   /*
-    * Check file access required
-    */
-   if (SectionPageProtection & PAGE_READWRITE ||
-         SectionPageProtection & PAGE_EXECUTE_READWRITE)
-   {
-      FileAccess = FILE_READ_DATA | FILE_WRITE_DATA;
-   }
-   else
-   {
-      FileAccess = FILE_READ_DATA;
-   }
-
-   /*
-    * Reference the file handle
-    */
-   Status = ObReferenceObjectByHandle(FileHandle,
-                                      FileAccess,
-                                      IoFileObjectType,
-                                      ExGetPreviousMode(),
-                                      (PVOID*)(PVOID)&FileObject,
-                                      NULL);
-
-   if (!NT_SUCCESS(Status))
-   {
-      return Status;
-   }
+   if (FileObject == NULL)
+      return STATUS_INVALID_FILE_FOR_SECTION;
 
    /*
     * Create the section
@@ -3931,6 +3725,8 @@ MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject,
     * Initialize it
     */
    RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT));
+   Section->Type = 'SC';
+   Section->Size = 'TN';
    Section->SectionPageProtection = SectionPageProtection;
    Section->AllocationAttributes = AllocationAttributes;
 
@@ -3958,7 +3754,7 @@ MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject,
 
       RtlZeroMemory(ImageSectionObject, sizeof(MM_IMAGE_SECTION_OBJECT));
 
-      StatusExeFmt = ExeFmtpCreateImageSection(FileHandle, ImageSectionObject);
+      StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject);
 
       if (!NT_SUCCESS(StatusExeFmt))
       {
@@ -4059,8 +3855,33 @@ MmMapViewOfSegment(PMMSUPPORT AddressSpace,
    NTSTATUS Status;
    PHYSICAL_ADDRESS BoundaryAddressMultiple;
 
+   if (Segment->WriteCopy)
+   {
+       /* We have to do this because the not present fault
+        * and access fault handlers depend on the protection
+        * that should be granted AFTER the COW fault takes
+        * place to be in Region->Protect. The not present fault
+        * handler changes this to the correct protection for COW when
+        * mapping the pages into the process's address space. If a COW
+        * fault takes place, the access fault handler sets the page protection
+        * to these values for the newly copied pages
+        */
+       if (Protect == PAGE_WRITECOPY)
+           Protect = PAGE_READWRITE;
+       else if (Protect == PAGE_EXECUTE_WRITECOPY)
+           Protect = PAGE_EXECUTE_READWRITE;
+   }
+
    BoundaryAddressMultiple.QuadPart = 0;
 
+#ifdef NEWCC
+   if (Segment->Flags & MM_DATAFILE_SEGMENT) {
+      LARGE_INTEGER FileOffset;
+      FileOffset.QuadPart = ViewOffset;
+      ObReferenceObject(Section);
+      return _MiMapViewOfSegment(AddressSpace, Segment, BaseAddress, ViewSize, Protect, &FileOffset, AllocationType, __FILE__, __LINE__);
+   }
+#endif
    Status = MmCreateMemoryArea(AddressSpace,
                                MEMORY_AREA_SECTION_VIEW,
                                BaseAddress,
@@ -4081,7 +3902,7 @@ MmMapViewOfSegment(PMMSUPPORT AddressSpace,
 
    MArea->Data.SectionData.Segment = Segment;
    MArea->Data.SectionData.Section = Section;
-   MArea->Data.SectionData.ViewOffset = ViewOffset;
+   MArea->Data.SectionData.ViewOffset.QuadPart = ViewOffset;
    MmInitializeRegion(&MArea->Data.SectionData.RegionListHead,
                       ViewSize, 0, Protect);
 
@@ -4089,18 +3910,15 @@ MmMapViewOfSegment(PMMSUPPORT AddressSpace,
 }
 
 
-
 static VOID
 MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
                   PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
 {
-   ULONG Entry;
+   ULONG_PTR Entry;
    PFILE_OBJECT FileObject;
    PBCB Bcb;
-   ULONG Offset;
+   LARGE_INTEGER Offset;
    SWAPENTRY SavedSwapEntry;
-   PMM_PAGEOP PageOp;
-   NTSTATUS Status;
    PROS_SECTION_OBJECT Section;
    PMM_SECTION_SEGMENT Segment;
    PMMSUPPORT AddressSpace;
@@ -4111,34 +3929,25 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
 
    Address = (PVOID)PAGE_ROUND_DOWN(Address);
 
-   Offset = (ULONG)(((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) +
-            MemoryArea->Data.SectionData.ViewOffset);
+   Offset.QuadPart = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) +
+            MemoryArea->Data.SectionData.ViewOffset.QuadPart;
 
    Section = MemoryArea->Data.SectionData.Section;
    Segment = MemoryArea->Data.SectionData.Segment;
 
-   PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset);
-
-   while (PageOp)
+   Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
+   while (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY)
    {
       MmUnlockSectionSegment(Segment);
       MmUnlockAddressSpace(AddressSpace);
 
-      Status = MmspWaitForPageOpCompletionEvent(PageOp);
-      if (Status != STATUS_SUCCESS)
-      {
-         DPRINT1("Failed to wait for page op, status = %x\n", Status);
-         KeBugCheck(MEMORY_MANAGEMENT);
-      }
+      MiWaitForPageEvent(NULL, NULL);
 
       MmLockAddressSpace(AddressSpace);
       MmLockSectionSegment(Segment);
-      MmspCompleteAndReleasePageOp(PageOp);
-      PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset);
+      Entry = MmGetPageEntrySectionSegment(Segment, &Offset);
    }
 
-   Entry = MmGetPageEntrySectionSegment(Segment, Offset);
-
    /*
     * For a dirty, datafile, non-private page mark it as dirty in the
     * cache manager.
@@ -4150,7 +3959,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
          FileObject = MemoryArea->Data.SectionData.Section->FileObject;
          Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
 #ifndef NEWCC
-         CcRosMarkDirtyCacheSegment(Bcb, Offset + Segment->FileOffset);
+         CcRosMarkDirtyCacheSegment(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset));
 #endif
          ASSERT(SwapEntry == 0);
       }
@@ -4196,7 +4005,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
       else
       {
          MmDeleteRmap(Page, Process, Address);
-         MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE);
+         MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, Dirty, FALSE, NULL);
       }
    }
 }
@@ -4224,6 +4033,11 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace,
    Section = MemoryArea->Data.SectionData.Section;
    Segment = MemoryArea->Data.SectionData.Segment;
 
+#ifdef NEWCC
+   if (Segment->Flags & MM_DATAFILE_SEGMENT)
+      return MmUnmapViewOfCacheSegment(AddressSpace, BaseAddress);
+#endif
+
    MmLockSectionSegment(Segment);
 
    RegionListHead = &MemoryArea->Data.SectionData.RegionListHead;
@@ -4253,20 +4067,17 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace,
    return(Status);
 }
 
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-MmUnmapViewOfSection(PEPROCESS Process,
-                     PVOID BaseAddress)
+NTSTATUS
+NTAPI
+MiRosUnmapViewOfSection(IN PEPROCESS Process,
+                        IN PVOID BaseAddress,
+                        IN ULONG Flags)
 {
    NTSTATUS Status;
    PMEMORY_AREA MemoryArea;
    PMMSUPPORT AddressSpace;
    PROS_SECTION_OBJECT Section;
-   PMM_PAGEOP PageOp;
-   ULONG_PTR Offset;
-    PVOID ImageBaseAddress = 0;
+   PVOID ImageBaseAddress = 0;
 
    DPRINT("Opening memory area Process %x BaseAddress %x\n",
           Process, BaseAddress);
@@ -4282,45 +4093,13 @@ MmUnmapViewOfSection(PEPROCESS Process,
        MemoryArea->Type != MEMORY_AREA_SECTION_VIEW ||
        MemoryArea->DeleteInProgress)
    {
+      ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3);
       MmUnlockAddressSpace(AddressSpace);
       return STATUS_NOT_MAPPED_VIEW;
    }
 
    MemoryArea->DeleteInProgress = TRUE;
 
-   while (MemoryArea->PageOpCount)
-   {
-      Offset = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress);
-
-      while (Offset)
-      {
-         Offset -= PAGE_SIZE;
-         PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL,
-                                   MemoryArea->Data.SectionData.Segment,
-                                   (ULONG)Offset + MemoryArea->Data.SectionData.ViewOffset);
-         if (PageOp)
-         {
-            MmUnlockAddressSpace(AddressSpace);
-            Status = MmspWaitForPageOpCompletionEvent(PageOp);
-            if (Status != STATUS_SUCCESS)
-            {
-               DPRINT1("Failed to wait for page op, status = %x\n", Status);
-               KeBugCheck(MEMORY_MANAGEMENT);
-            }
-            MmLockAddressSpace(AddressSpace);
-            MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,
-                                                     BaseAddress);
-            if (MemoryArea == NULL ||
-                MemoryArea->Type != MEMORY_AREA_SECTION_VIEW)
-            {
-               MmUnlockAddressSpace(AddressSpace);
-               return STATUS_NOT_MAPPED_VIEW;
-            }
-            break;
-         }
-      }
-   }
-
    Section = MemoryArea->Data.SectionData.Section;
 
    if (Section->AllocationAttributes & SEC_IMAGE)
@@ -4340,11 +4119,14 @@ MmUnmapViewOfSection(PEPROCESS Process,
        * and calculate the image base address */
       for (i = 0; i < NrSegments; i++)
       {
-          if (Segment == &SectionSegments[i])
-          {
-              ImageBaseAddress = (char*)BaseAddress - (ULONG_PTR)SectionSegments[i].VirtualAddress;
-              break;
-          }
+         if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+         {
+            if (Segment == &SectionSegments[i])
+            {
+               ImageBaseAddress = (char*)BaseAddress - (ULONG_PTR)SectionSegments[i].Image.VirtualAddress;
+               break;
+            }
+         }
       }
       if (i >= NrSegments)
       {
@@ -4353,10 +4135,13 @@ MmUnmapViewOfSection(PEPROCESS Process,
 
       for (i = 0; i < NrSegments; i++)
       {
-          PVOID SBaseAddress = (PVOID)
-                               ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].VirtualAddress);
+         if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+         {
+            PVOID SBaseAddress = (PVOID)
+                                 ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress);
 
-          Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress);
+            Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress);
+         }
       }
    }
    else
@@ -4450,8 +4235,8 @@ NtQuerySection(IN HANDLE SectionHandle,
                }
                else
                {
-                  Sbi->BaseAddress = (PVOID)Section->Segment->VirtualAddress;
-                  Sbi->Size.QuadPart = Section->Segment->Length;
+                  Sbi->BaseAddress = (PVOID)Section->Segment->Image.VirtualAddress;
+                  Sbi->Size.QuadPart = Section->Segment->Length.QuadPart;
                }
 
                if (ResultLength != NULL)
@@ -4581,9 +4366,10 @@ MmMapViewOfSection(IN PVOID SectionObject,
    NTSTATUS Status = STATUS_SUCCESS;
    BOOLEAN NotAtBase = FALSE;
 
-   if ((ULONG_PTR)SectionObject & 1)
+   if (MiIsRosSectionObject(SectionObject) == FALSE)
    {
-       return MmMapViewOfArm3Section((PVOID)((ULONG_PTR)SectionObject & ~1),
+       DPRINT("Mapping ARM3 section into %s\n", Process->ImageFileName);
+       return MmMapViewOfArm3Section(SectionObject,
                                      Process,
                                      BaseAddress,
                                      ZeroBits,
@@ -4633,10 +4419,13 @@ MmMapViewOfSection(IN PVOID SectionObject,
       ImageSize = 0;
       for (i = 0; i < NrSegments; i++)
       {
-          ULONG_PTR MaxExtent;
-          MaxExtent = (ULONG_PTR)SectionSegments[i].VirtualAddress +
-                      SectionSegments[i].Length;
-          ImageSize = max(ImageSize, MaxExtent);
+         if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+         {
+            ULONG_PTR MaxExtent;
+            MaxExtent = (ULONG_PTR)(SectionSegments[i].Image.VirtualAddress +
+                        SectionSegments[i].Length.QuadPart);
+            ImageSize = max(ImageSize, MaxExtent);
+         }
       }
 
       ImageSectionObject->ImageSize = (ULONG)ImageSize;
@@ -4670,23 +4459,26 @@ MmMapViewOfSection(IN PVOID SectionObject,
 
       for (i = 0; i < NrSegments; i++)
       {
-          PVOID SBaseAddress = (PVOID)
-                               ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].VirtualAddress);
-          MmLockSectionSegment(&SectionSegments[i]);
-          Status = MmMapViewOfSegment(AddressSpace,
-                                      Section,
-                                      &SectionSegments[i],
-                                      &SBaseAddress,
-                                      SectionSegments[i].Length,
-                                      SectionSegments[i].Protection,
-                                      0,
-                                      0);
-          MmUnlockSectionSegment(&SectionSegments[i]);
-          if (!NT_SUCCESS(Status))
-          {
-              MmUnlockAddressSpace(AddressSpace);
-              return(Status);
-          }
+         if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD))
+         {
+            PVOID SBaseAddress = (PVOID)
+                                 ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress);
+            MmLockSectionSegment(&SectionSegments[i]);
+            Status = MmMapViewOfSegment(AddressSpace,
+                                        Section,
+                                        &SectionSegments[i],
+                                        &SBaseAddress,
+                                        SectionSegments[i].Length.LowPart,
+                                        SectionSegments[i].Protection,
+                                        0,
+                                        0);
+            MmUnlockSectionSegment(&SectionSegments[i]);
+            if (!NT_SUCCESS(Status))
+            {
+               MmUnlockAddressSpace(AddressSpace);
+               return(Status);
+            }
+         }
       }
 
       *BaseAddress = (PVOID)ImageBase;
@@ -4799,6 +4591,29 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
 
       if (Segment->ReferenceCount != 0)
       {
+#ifdef NEWCC
+         CC_FILE_SIZES FileSizes;
+         CcpLock();
+         if (SectionObjectPointer->SharedCacheMap && (Segment->ReferenceCount > CcpCountCacheSections((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap)))
+         {
+            CcpUnlock();
+            /* Check size of file */
+            if (SectionObjectPointer->SharedCacheMap)
+            {
+               if (!CcGetFileSizes(Segment->FileObject, &FileSizes))
+               {
+                  return FALSE;
+               }
+
+               if (NewFileSize->QuadPart <= FileSizes.FileSize.QuadPart)
+               {
+                  return FALSE;
+               }
+            }
+         }
+         else
+            CcpUnlock();
+#else
           /* Check size of file */
           if (SectionObjectPointer->SharedCacheMap)
           {
@@ -4808,6 +4623,7 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
                 return FALSE;
              }
           }
+#endif
       }
       else
       {
@@ -4833,6 +4649,11 @@ BOOLEAN NTAPI
 MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
                      IN MMFLUSH_TYPE   FlushType)
 {
+   BOOLEAN Result = TRUE;
+#ifdef NEWCC
+   PMM_SECTION_SEGMENT Segment;
+#endif
+
    switch(FlushType)
    {
       case MmFlushForDelete:
@@ -4846,7 +4667,25 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
 #endif
          return TRUE;
       case MmFlushForWrite:
-         break;
+      {
+         DPRINT("MmFlushImageSection(%d)\n", FlushType);
+#ifdef NEWCC
+         Segment = (PMM_SECTION_SEGMENT)SectionObjectPointer->DataSectionObject;
+#endif
+
+         if (SectionObjectPointer->ImageSectionObject) {
+            DPRINT1("SectionObject has ImageSection\n");
+            return FALSE;
+         }
+
+#ifdef NEWCC
+         CcpLock();
+         Result = !SectionObjectPointer->SharedCacheMap || (Segment->ReferenceCount == CcpCountCacheSections((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap));
+         CcpUnlock();
+         DPRINT("Result %d\n", Result);
+#endif
+         return Result;
+      }
    }
    return FALSE;
 }
@@ -4864,10 +4703,9 @@ MmMapViewInSystemSpace (IN PVOID SectionObject,
    NTSTATUS Status;
    PAGED_CODE();
 
-    if ((ULONG_PTR)SectionObject & 1)
+    if (MiIsRosSectionObject(SectionObject) == FALSE)
     {
-        extern PVOID MmSession;
-        return MiMapViewInSystemSpace((PVOID)((ULONG_PTR)SectionObject & ~1),
+        return MiMapViewInSystemSpace(SectionObject,
                                       &MmSession,
                                       MappedBase,
                                       ViewSize);
@@ -4908,11 +4746,9 @@ MmMapViewInSystemSpace (IN PVOID SectionObject,
    return Status;
 }
 
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-MmUnmapViewInSystemSpace (IN PVOID MappedBase)
+NTSTATUS
+NTAPI
+MiRosUnmapViewInSystemSpace(IN PVOID MappedBase)
 {
    PMMSUPPORT AddressSpace;
    NTSTATUS Status;
@@ -4920,17 +4756,16 @@ MmUnmapViewInSystemSpace (IN PVOID MappedBase)
    DPRINT("MmUnmapViewInSystemSpace() called\n");
 
    AddressSpace = MmGetKernelAddressSpace();
-   
+
    MmLockAddressSpace(AddressSpace);
 
    Status = MmUnmapViewOfSegment(AddressSpace, MappedBase);
-   
+
    MmUnlockAddressSpace(AddressSpace);
 
    return Status;
 }
 
-
 /**********************************************************************
  * NAME       EXPORTED
  *  MmCreateSection@
@@ -4994,15 +4829,16 @@ MmCreateSection (OUT PVOID  * Section,
                  IN ULONG   SectionPageProtection,
                  IN ULONG   AllocationAttributes,
                  IN HANDLE   FileHandle   OPTIONAL,
-                 IN PFILE_OBJECT  File      OPTIONAL)
+                 IN PFILE_OBJECT  FileObject  OPTIONAL)
 {
-   ULONG Protection;
-   PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section;
+    NTSTATUS Status;
+    ULONG Protection, FileAccess;
+    PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section;
 
     /* Check if an ARM3 section is being created instead */
     if (AllocationAttributes & 1)
     {
-        DPRINT1("arm 3 path\n");
+        DPRINT1("Creating ARM3 section\n");
         return MmCreateArm3Section(Section,
                                    DesiredAccess,
                                    ObjectAttributes,
@@ -5010,54 +4846,258 @@ MmCreateSection (OUT PVOID  * Section,
                                    SectionPageProtection,
                                    AllocationAttributes &~ 1,
                                    FileHandle,
-                                   File);
+                                   FileObject);
     }
 
-   /*
-    * Check the protection
-    */
-   Protection = SectionPageProtection & ~(PAGE_GUARD|PAGE_NOCACHE);
-   if (Protection != PAGE_READONLY &&
-       Protection != PAGE_READWRITE &&
-       Protection != PAGE_WRITECOPY &&
-       Protection != PAGE_EXECUTE &&
-       Protection != PAGE_EXECUTE_READ &&
-       Protection != PAGE_EXECUTE_READWRITE &&
-       Protection != PAGE_EXECUTE_WRITECOPY)
-   {
-     return STATUS_INVALID_PAGE_PROTECTION;
-   }
-
-   if (AllocationAttributes & SEC_IMAGE)
-   {
-      return(MmCreateImageSection(SectionObject,
-                                  DesiredAccess,
-                                  ObjectAttributes,
-                                  MaximumSize,
-                                  SectionPageProtection,
-                                  AllocationAttributes,
-                                  FileHandle));
-   }
-
-   if (FileHandle != NULL)
-   {
-      return(MmCreateDataFileSection(SectionObject,
-                                     DesiredAccess,
-                                     ObjectAttributes,
-                                     MaximumSize,
-                                     SectionPageProtection,
-                                     AllocationAttributes,
-                                     FileHandle));
-   }
-
-   return(MmCreatePageFileSection(SectionObject,
-                                  DesiredAccess,
-                                  ObjectAttributes,
-                                  MaximumSize,
-                                  SectionPageProtection,
-                                  AllocationAttributes));
+    /*
+     * Check the protection
+     */
+    Protection = SectionPageProtection & ~(PAGE_GUARD | PAGE_NOCACHE);
+    if (Protection != PAGE_READONLY &&
+        Protection != PAGE_READWRITE &&
+        Protection != PAGE_WRITECOPY &&
+        Protection != PAGE_EXECUTE &&
+        Protection != PAGE_EXECUTE_READ &&
+        Protection != PAGE_EXECUTE_READWRITE &&
+        Protection != PAGE_EXECUTE_WRITECOPY)
+    {
+        return STATUS_INVALID_PAGE_PROTECTION;
+    }
+
+    if ((DesiredAccess & SECTION_MAP_WRITE) &&
+        (Protection == PAGE_READWRITE ||
+         Protection == PAGE_EXECUTE_READWRITE) &&
+       !(AllocationAttributes & SEC_IMAGE))
+    {
+        DPRINT("Creating a section with WRITE access\n");
+        FileAccess = FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE;
+    }
+    else
+    {
+        DPRINT("Creating a section with READ access\n");
+        FileAccess = FILE_READ_DATA | SYNCHRONIZE;
+    }
+
+    /* FIXME: somehow combine this with the above checks */
+    if (AllocationAttributes & SEC_IMAGE)
+        FileAccess = MiArm3GetCorrectFileAccessMask(SectionPageProtection);
+
+    if (!FileObject && FileHandle)
+    {
+        Status = ObReferenceObjectByHandle(FileHandle,
+                                           FileAccess,
+                                           IoFileObjectType,
+                                           ExGetPreviousMode(),
+                                           (PVOID *)&FileObject,
+                                           NULL);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT("Failed: 0x%08lx\n", Status);
+            return Status;
+        }
+    }
+    else if (FileObject)
+        ObReferenceObject(FileObject);
+
+#ifndef NEWCC // A hack for initializing caching.
+    // This is needed only in the old case.
+    if (FileHandle)
+    {
+        IO_STATUS_BLOCK Iosb;
+        NTSTATUS Status;
+        CHAR Buffer;
+        LARGE_INTEGER ByteOffset;
+        ByteOffset.QuadPart = 0;
+        Status = ZwReadFile(FileHandle,
+                            NULL,
+                            NULL,
+                            NULL,
+                            &Iosb,
+                            &Buffer,
+                            sizeof(Buffer),
+                            &ByteOffset,
+                            NULL);
+        if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE)
+            return Status;
+        // Caching is initialized...
+    }
+#endif
+
+    if (AllocationAttributes & SEC_IMAGE)
+    {
+        Status = MmCreateImageSection(SectionObject,
+                                      DesiredAccess,
+                                      ObjectAttributes,
+                                      MaximumSize,
+                                      SectionPageProtection,
+                                      AllocationAttributes,
+                                      FileObject);
+    }
+#ifndef NEWCC
+    else if (FileHandle != NULL)
+    {
+        Status =  MmCreateDataFileSection(SectionObject,
+                                          DesiredAccess,
+                                          ObjectAttributes,
+                                          MaximumSize,
+                                          SectionPageProtection,
+                                          AllocationAttributes,
+                                          FileHandle);
+        if (FileObject)
+            ObDereferenceObject(FileObject);
+    }
+#else
+    else if (FileHandle != NULL || FileObject != NULL)
+    {
+        Status = MmCreateCacheSection(SectionObject,
+                                      DesiredAccess,
+                                      ObjectAttributes,
+                                      MaximumSize,
+                                      SectionPageProtection,
+                                      AllocationAttributes,
+                                      FileObject);
+    }
+#endif
+    else
+    {
+        Status = MmCreatePageFileSection(SectionObject,
+                                         DesiredAccess,
+                                         ObjectAttributes,
+                                         MaximumSize,
+                                         SectionPageProtection,
+                                         AllocationAttributes);
+    }
+
+    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 */