system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-18 10:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of shared heap fixme messages.

Browse source 
Slightly corrected my heap commit patch (Xilinx).
This commit is contained in:
Andreas Mohr 2000-10-13 20:21:09 +00:00 committed by Alexandre Julliard
parent dfa4130804
commit 411faaee96
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
memory/heap.c
View file

@ -642,7 +642,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, DWORD size,
* So just one heap struct, one first free arena which will eventually
* get inuse, and HEAP_MIN_BLOCK_SIZE for the second free arena that
* might get assigned all remaining free space in HEAP_ShrinkBlock() */
size += sizeof(SUBHEAP) + sizeof(ARENA_FREE) + HEAP_MIN_BLOCK_SIZE;
size += sizeof(SUBHEAP) + sizeof(ARENA_INUSE) + HEAP_MIN_BLOCK_SIZE;
if (!(subheap = HEAP_CreateSubHeap( heap, heap->flags, size,
max( HEAP_DEF_SIZE, size ) )))
return NULL;
@ -1008,8 +1008,8 @@ HANDLE WINAPI HeapCreate(
SUBHEAP *subheap;
if ( flags & HEAP_SHARED ) {
FIXME ( "Shared Heap requested, returning system heap.\n" );
return SystemHeap;
WARN( "Shared Heap requested, returning system heap.\n" );
return SystemHeap;
}
/* Allocate the heap block */
@ -1054,8 +1054,8 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ )
SUBHEAP *subheap;
if ( heap == SystemHeap ) {
FIXME ( "attempt to destroy system heap, returning TRUE!\n" );
return TRUE;
WARN( "attempt to destroy system heap, returning TRUE!\n" );
return TRUE;
}
TRACE("%08x\n", heap );
@ -1133,6 +1133,9 @@ LPVOID WINAPI HeapAlloc(
/* Build the in-use arena */
pInUse = (ARENA_INUSE *)pArena;
/* in-use arena is smaller than free arena,
* so we have to add the difference to the size */
pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE)
+ sizeof(ARENA_FREE) - sizeof(ARENA_INUSE);
pInUse->callerEIP = GET_EIP();