Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-07 11:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bac0f132bfc6b05187701ded5273b9819d8585bb'

Browse source 
svn path=/trunk/; revision=54001
This commit is contained in:
Timo Kreuzer 2011-10-05 08:44:13 +00:00
parent 0b91d9967d
commit 3b1f95cecd
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/boot/freeldr/freeldr/mm/heap_new.c
View file

@ -28,13 +28,6 @@ DBG_DEFAULT_CHANNEL(HEAP);
PVOID FrLdrDefaultHeap; PVOID FrLdrDefaultHeap;
PVOID FrLdrTempHeap; PVOID FrLdrTempHeap;
typedef struct _BLOCK_HEADER
{
USHORT Size;
USHORT PreviousSize;
ULONG Tag;
} BLOCK_HEADER, *PBLOCK_HEADER;
typedef struct _BLOCK_DATA typedef struct _BLOCK_DATA
{ {
ULONG Flink; ULONG Flink;
@ -43,7 +36,9 @@ typedef struct _BLOCK_DATA
typedef struct _HEAP_BLOCK typedef struct _HEAP_BLOCK
{ {
BLOCK_HEADER; USHORT Size;
USHORT PreviousSize;
ULONG Tag;
BLOCK_DATA Data[]; BLOCK_DATA Data[];
} HEAP_BLOCK, *PHEAP_BLOCK; } HEAP_BLOCK, *PHEAP_BLOCK;
@ -369,7 +364,6 @@ HeapFree(
{ {
PHEAP Heap = HeapHandle; PHEAP Heap = HeapHandle;
PHEAP_BLOCK Block, PrevBlock, NextBlock; PHEAP_BLOCK Block, PrevBlock, NextBlock;
USHORT PreviousSize = 0;
ULONGLONG Time = __rdtsc(); ULONGLONG Time = __rdtsc();
TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer);
ASSERT(Tag != 'dnE#'); ASSERT(Tag != 'dnE#');