mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
- 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
This commit is contained in:
parent
74216f856e
commit
37e7a63e8a
1 changed files with 4 additions and 3 deletions
|
@ -1217,7 +1217,7 @@ RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */
|
||||||
RtlRaiseStatus( STATUS_NO_MEMORY );
|
RtlRaiseStatus( STATUS_NO_MEMORY );
|
||||||
return NULL;
|
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;
|
flags |= heapPtr->flags;
|
||||||
if (!(flags & HEAP_NO_SERIALIZE))
|
if (!(flags & HEAP_NO_SERIALIZE))
|
||||||
RtlEnterHeapLock( &heapPtr->critSection );
|
RtlEnterHeapLock( &heapPtr->critSection );
|
||||||
|
@ -1362,8 +1362,8 @@ PVOID NTAPI RtlReAllocateHeap(
|
||||||
|
|
||||||
/* Validate the parameters */
|
/* Validate the parameters */
|
||||||
|
|
||||||
Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY |
|
//Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY |
|
||||||
HEAP_REALLOC_IN_PLACE_ONLY;
|
// HEAP_REALLOC_IN_PLACE_ONLY;
|
||||||
Flags |= heapPtr->flags;
|
Flags |= heapPtr->flags;
|
||||||
Size = (Size + 7) & ~7;
|
Size = (Size + 7) & ~7;
|
||||||
if (Size < HEAP_MIN_BLOCK_SIZE)
|
if (Size < HEAP_MIN_BLOCK_SIZE)
|
||||||
|
@ -1891,6 +1891,7 @@ RtlGetUserInfoHeap(IN PVOID HeapHandle,
|
||||||
subheap = HEAP_FindSubHeap( heapPtr, pInUse );
|
subheap = HEAP_FindSubHeap( heapPtr, pInUse );
|
||||||
|
|
||||||
/* Hack */
|
/* Hack */
|
||||||
|
DPRINT1("V/F: %lx %p\n", subheap->UserValue, subheap->UserFlags);
|
||||||
if (UserValue) *UserValue = subheap->UserValue;
|
if (UserValue) *UserValue = subheap->UserValue;
|
||||||
if (UserFlags) *UserFlags = subheap->UserFlags;
|
if (UserFlags) *UserFlags = subheap->UserFlags;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
Loading…
Reference in a new issue