Francois Gouget : wbemprox: Simplify and standardize the heap_xxx() declarations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 34f77a656a69caaa0e2cfa2eaae426c223311c0a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=34f77a656a69caaa0e2cfa2eaa...

Author: Francois Gouget 
Date:   Tue Feb 28 18:52:45 2017 +0100

wbemprox: Simplify and standardize the heap_xxx() declarations.

Signed-off-by: Francois Gouget 
Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/wbemprox/wbemprox_private.h | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h
index ba25a02..15ea9c6 100644
--- a/dlls/wbemprox/wbemprox_private.h
+++ b/dlls/wbemprox/wbemprox_private.h
@@ -227,27 +227,24 @@ HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassO
 HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN;
 HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN;

-static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
-static inline void *heap_alloc( size_t len )
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
 {
-    return HeapAlloc( GetProcessHeap(), 0, len );
+    return HeapAlloc(GetProcessHeap(), 0, size);
 }

-static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2);
-static inline void *heap_realloc( void *mem, size_t len )
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
 {
-    return HeapReAlloc( GetProcessHeap(), 0, mem, len );
+    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
 }

-static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1);
-static inline void *heap_alloc_zero( size_t len )
+static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size)
 {
-    return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
+    return HeapReAlloc(GetProcessHeap(), 0, mem, size);
 }

-static inline BOOL heap_free( void *mem )
+static inline BOOL heap_free(void *mem)
 {
-    return HeapFree( GetProcessHeap(), 0, mem );
+    return HeapFree(GetProcessHeap(), 0, mem);
 }

static inline WCHAR *heap_strdupW( const WCHAR *src )