From 37e7a63e8afb7f7eac74a58df486efb4893946f0 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sat, 24 Jun 2006 18:01:53 +0000 Subject: [PATCH] - There are more then only the 3 or 4 heap flags WINE's Windows 95 code supports(there are about 18), so it's a bit stupid to mask them all out, especially since that breaks settable/tag flags. svn path=/trunk/; revision=22578 --- reactos/lib/rtl/heap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c index 20f47e62634..6f94e2a1d95 100644 --- a/reactos/lib/rtl/heap.c +++ b/reactos/lib/rtl/heap.c @@ -1217,7 +1217,7 @@ RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */ RtlRaiseStatus( STATUS_NO_MEMORY ); return NULL; } - flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; + //flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); @@ -1362,8 +1362,8 @@ PVOID NTAPI RtlReAllocateHeap( /* Validate the parameters */ - Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | - HEAP_REALLOC_IN_PLACE_ONLY; + //Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | + // HEAP_REALLOC_IN_PLACE_ONLY; Flags |= heapPtr->flags; Size = (Size + 7) & ~7; if (Size < HEAP_MIN_BLOCK_SIZE) @@ -1891,6 +1891,7 @@ RtlGetUserInfoHeap(IN PVOID HeapHandle, subheap = HEAP_FindSubHeap( heapPtr, pInUse ); /* Hack */ + DPRINT1("V/F: %lx %p\n", subheap->UserValue, subheap->UserFlags); if (UserValue) *UserValue = subheap->UserValue; if (UserFlags) *UserFlags = subheap->UserFlags; return TRUE;