Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

alloc multiple of 16 bytes

Browse source 
svn path=/trunk/; revision=18403
This commit is contained in:
Gunnar Dalsnes 2005-10-10 20:18:07 +00:00
parent fbd6bbbf48
commit 1fc06afd71
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/lib/crt/stdlib/malloc.c
View file

@ -25,6 +25,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <malloc.h> #include <malloc.h>
/* fixme: should have this in common header */
#define ROUND_UP(a,b) ((a + (b-1)) & ~(b-1))
extern HANDLE hHeap; extern HANDLE hHeap;
/* /*
@ -32,7 +36,7 @@ extern HANDLE hHeap;
*/ */
void* malloc(size_t _size) void* malloc(size_t _size)
{ {
return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, _size); return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16));
} }
/* /*
@ -48,7 +52,7 @@ void free(void* _ptr)
*/ */
void* calloc(size_t _nmemb, size_t _size) void* calloc(size_t _nmemb, size_t _size)
{ {
return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, _nmemb*_size); return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_UP(_nmemb*_size, 16) );
} }
/* /*
@ -57,8 +61,8 @@ void* calloc(size_t _nmemb, size_t _size)
void* realloc(void* _ptr, size_t _size) void* realloc(void* _ptr, size_t _size)
{ {
if (!_ptr) if (!_ptr)
return HeapAlloc(hHeap, 0, _size); return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16));
return HeapReAlloc(hHeap, 0, _ptr, _size); return HeapReAlloc(hHeap, 0, _ptr, ROUND_UP(_size, 16));
} }
/* /*
@ -66,7 +70,7 @@ void* realloc(void* _ptr, size_t _size)
*/ */
void* _expand(void* _ptr, size_t _size) void* _expand(void* _ptr, size_t _size)
{ {
return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, _size); return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_UP(_size, 16));
} }
/* /*