From ece7ea44f627354858689727fd6f22a53bd38332 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 14 Jan 2013 10:58:16 +0000
Subject: [PATCH] [RTL] Inititalize the heap lock pointers with actual storage
 before calling RtlInitializeHeapLock

svn path=/trunk/; revision=58174
---
 reactos/lib/rtl/heappage.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/rtl/heappage.c b/reactos/lib/rtl/heappage.c
index cd16910f138..44c4cfe36b4 100644
--- a/reactos/lib/rtl/heappage.c
+++ b/reactos/lib/rtl/heappage.c
@@ -110,11 +110,13 @@ WCHAR RtlpDphTargetDlls[512];
 
 LIST_ENTRY RtlpDphPageHeapList;
 BOOLEAN RtlpDphPageHeapListInitialized;
-PHEAP_LOCK RtlpDphPageHeapListLock;
+HEAP_LOCK _RtlpDphPageHeapListLock;
+PHEAP_LOCK RtlpDphPageHeapListLock = &_RtlpDphPageHeapListLock;
 ULONG RtlpDphPageHeapListLength;
 UNICODE_STRING RtlpDphTargetDllsUnicode;
 
-PHEAP_LOCK RtlpDphDelayedFreeQueueLock;
+HEAP_LOCK _RtlpDphDelayedFreeQueueLock;
+PHEAP_LOCK RtlpDphDelayedFreeQueueLock = &_RtlpDphDelayedFreeQueueLock;
 LIST_ENTRY RtlpDphDelayedFreeQueue;
 SLIST_HEADER RtlpDphDelayedTemporaryPushList;
 SIZE_T RtlpDphMemoryUsedByDelayedFreeBlocks;
@@ -1485,6 +1487,7 @@ RtlpPageHeapCreate(ULONG Flags,
     /* Initialize the DPH root */
     DphRoot->Signature = DPH_SIGNATURE;
     DphRoot->HeapFlags = Flags;
+    DphRoot->HeapCritSect = (PHEAP_LOCK)((PCHAR)DphRoot + DPH_POOL_SIZE);
     DphRoot->ExtraFlags = RtlpDphGlobalFlags;
 
     ZwQueryPerformanceCounter(&PerfCounter, NULL);