Commit 2fe91725 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

taskschd: Simplify and standardize the heap_xxx() declarations.

parent 87f21b12
...@@ -31,27 +31,24 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec ...@@ -31,27 +31,24 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec
WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) DECLSPEC_HIDDEN; WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) DECLSPEC_HIDDEN;
static void *heap_alloc_zero(SIZE_T size) __WINE_ALLOC_SIZE(1); static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
static inline void *heap_alloc_zero(SIZE_T size)
{ {
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); return HeapAlloc(GetProcessHeap(), 0, size);
} }
static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
static inline void *heap_alloc(SIZE_T size)
{ {
return HeapAlloc(GetProcessHeap(), 0, size); return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
} }
static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size)
static inline void *heap_realloc(void *ptr, SIZE_T size)
{ {
return HeapReAlloc(GetProcessHeap(), 0, ptr, size); return HeapReAlloc(GetProcessHeap(), 0, mem, size);
} }
static inline BOOL heap_free(void *ptr) static inline BOOL heap_free(void *mem)
{ {
return HeapFree(GetProcessHeap(), 0, ptr); return HeapFree(GetProcessHeap(), 0, mem);
} }
static inline WCHAR *heap_strdupW(const WCHAR *src) static inline WCHAR *heap_strdupW(const WCHAR *src)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment