taskschd: Simplify and standardize the heap_xxx() declarations.

Francois Gouget fgouget at free.fr
Wed Feb 22 04:27:25 CST 2017


Signed-off-by: Francois Gouget <fgouget at free.fr>
---
 dlls/taskschd/taskschd_private.h | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h
index fd5a363336c..ee7e59e763b 100644
--- a/dlls/taskschd/taskschd_private.h
+++ b/dlls/taskschd/taskschd_private.h
@@ -31,27 +31,24 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec
 
 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 *heap_alloc_zero(SIZE_T size)
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(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 *heap_alloc(SIZE_T size)
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(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 *heap_realloc(void *ptr, SIZE_T size)
+static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, 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)
-- 
2.11.0




More information about the wine-patches mailing list