From 7ef16b374618ace70af078286590f2933fd7cab2 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Fri, 11 Nov 2011 11:55:49 +0000
Subject: [PATCH] [RTL] - A bit more of the DPH code cleanup, no bugs found so
 far.

svn path=/trunk/; revision=54349
---
 reactos/lib/rtl/heappage.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/rtl/heappage.c b/reactos/lib/rtl/heappage.c
index ef864f80103..f8a7efd0652 100644
--- a/reactos/lib/rtl/heappage.c
+++ b/reactos/lib/rtl/heappage.c
@@ -909,14 +909,13 @@ RtlpDphSetProtectionBeforeUse(PDPH_HEAP_ROOT DphRoot, PUCHAR VirtualBlock, ULONG
     ULONG Protection;
     PVOID Base;
 
-    // FIXME: Check this, when we should add up usersize and when we shouldn't!
-    if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN))
+    if (DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)
     {
-        Base = VirtualBlock;
+        Base = VirtualBlock + PAGE_SIZE;
     }
     else
     {
-        Base = VirtualBlock + PAGE_SIZE;
+        Base = VirtualBlock;
     }
 
     // FIXME: It should be different, but for now it's fine
@@ -928,6 +927,8 @@ RtlpDphSetProtectionBeforeUse(PDPH_HEAP_ROOT DphRoot, PUCHAR VirtualBlock, ULONG
 NTSTATUS NTAPI
 RtlpDphSetProtectionAfterUse(PDPH_HEAP_ROOT DphRoot, /*PUCHAR VirtualBlock*/PDPH_HEAP_BLOCK Node)
 {
+    ASSERT((Node->nVirtualAccessSize + PAGE_SIZE) <= Node->nVirtualBlockSize);
+
     // FIXME: Bring stuff here
     if (DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)
     {
@@ -1679,7 +1680,6 @@ RtlpPageHeapAllocate(IN PVOID HeapPtr,
     if (!DphRoot) return NULL;
 
     /* Acquire the heap lock */
-    //RtlpDphEnterCriticalSection(DphRoot, Flags);
     RtlpDphPreProcessing(DphRoot, Flags);
 
     /* Perform internal validation if specified by flags */
@@ -1881,7 +1881,7 @@ RtlpPageHeapFree(HANDLE HeapPtr,
     }
 
     /* Set new protection */
-    RtlpDphSetProtectionAfterUse(DphRoot, Node);
+    //RtlpDphSetProtectionAfterUse(DphRoot, Node);
 
     /* Remove it from the list of busy nodes */
     RtlpDphRemoveFromBusyList(DphRoot, Node);