Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 10:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some 64 bit heap fixes by encoded, merged from amd64 branch

Browse source 
svn path=/trunk/; revision=43466
This commit is contained in:
Timo Kreuzer 2009-10-14 20:46:58 +00:00
parent bb2982398a
commit 9fcbb3422d
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/lib/rtl/heap.c
View file

@ -83,10 +83,15 @@ typedef struct tagARENA_FREE
#define ARENA_FLAG_FREE 0x00000001 /* flags OR'ed with arena size */ #define ARENA_FLAG_FREE 0x00000001 /* flags OR'ed with arena size */
#define ARENA_FLAG_PREV_FREE 0x00000002 #define ARENA_FLAG_PREV_FREE 0x00000002
#define ARENA_SIZE_MASK (~3)
#define ARENA_INUSE_MAGIC 0x455355 /* Value for arena 'magic' field */ #define ARENA_INUSE_MAGIC 0x455355 /* Value for arena 'magic' field */
#define ARENA_FREE_MAGIC 0x45455246 /* Value for arena 'magic' field */ #define ARENA_FREE_MAGIC 0x45455246 /* Value for arena 'magic' field */
#ifndef _WIN64
#define ARENA_SIZE_MASK (~3L)
#else
#define ARENA_SIZE_MASK (~7L)
#endif
#define ARENA_INUSE_FILLER 0x55 #define ARENA_INUSE_FILLER 0x55
#define ARENA_FREE_FILLER 0xaa #define ARENA_FREE_FILLER 0xaa
@ -113,7 +118,7 @@ static const DWORD HEAP_freeListSizes[HEAP_NB_FREE_LISTS] =
0x10, 0x20, 0x80, 0x200, MAXULONG 0x10, 0x20, 0x80, 0x200, MAXULONG
}; };
typedef struct typedef union
{ {
ARENA_FREE arena; ARENA_FREE arena;
void *aligment[4]; void *aligment[4];
@ -146,7 +151,7 @@ typedef struct tagHEAP
SUBHEAP subheap; /* First sub-heap */ SUBHEAP subheap; /* First sub-heap */
struct list entry; /* Entry in process heap list */ struct list entry; /* Entry in process heap list */
RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */
FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */
DWORD flags; /* Heap flags */ DWORD flags; /* Heap flags */
DWORD magic; /* Magic number */ DWORD magic; /* Magic number */
PRTL_HEAP_COMMIT_ROUTINE commitRoutine; PRTL_HEAP_COMMIT_ROUTINE commitRoutine;
@ -1249,7 +1254,7 @@ RtlDestroyHeap(HANDLE heap) /* [in] Handle of heap */
PVOID NTAPI PVOID NTAPI
RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */ RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */
ULONG flags, /* [in] Heap allocation control flags */ ULONG flags, /* [in] Heap allocation control flags */
ULONG size) /* [in] Number of bytes to allocate */ SIZE_T size) /* [in] Number of bytes to allocate */
{ {
ARENA_FREE *pArena; ARENA_FREE *pArena;
ARENA_INUSE *pInUse; ARENA_INUSE *pInUse;
@ -1599,14 +1604,14 @@ RtlUnlockHeap(HANDLE Heap)
* *
* @implemented * @implemented
*/ */
ULONG NTAPI SIZE_T NTAPI
RtlSizeHeap( RtlSizeHeap(
HANDLE heap, HANDLE heap,
ULONG flags, ULONG flags,
PVOID ptr PVOID ptr
) )
{ {
SIZE_T ret; SIZE_T ret;
HEAP *heapPtr = HEAP_GetPtr( heap ); HEAP *heapPtr = HEAP_GetPtr( heap );
if (!heapPtr) if (!heapPtr)
@ -1891,7 +1896,7 @@ NTAPI
RtlExtendHeap(IN HANDLE Heap, RtlExtendHeap(IN HANDLE Heap,
IN ULONG Flags, IN ULONG Flags,
IN PVOID P, IN PVOID P,
IN ULONG Size) IN SIZE_T Size)
{ {
/* TODO */ /* TODO */
UNIMPLEMENTED; UNIMPLEMENTED;