[ros-diffs] [ion] 22578: - 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.

[ion at svn.reactos.org]

Author: ion
Date: Sat Jun 24 22:01:53 2006
New Revision: 22578

URL: http://svn.reactos.org/svn/reactos?rev=22578&view=rev
Log:
- 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.

Modified:
    trunk/reactos/lib/rtl/heap.c

Modified: trunk/reactos/lib/rtl/heap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=22578&r1=22577&r2=22578&view=diff
==============================================================================
--- trunk/reactos/lib/rtl/heap.c (original)
+++ trunk/reactos/lib/rtl/heap.c Sat Jun 24 22:01:53 2006
@@ -1217,7 +1217,7 @@
          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 @@
 
    /* 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 @@
     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;