Francois Gouget : oleaut32: Standardize the heap_xxx() functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 78ee7f57fa45957eed1e7335a5f1822cb0745174
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=78ee7f57fa45957eed1e7335a5...

Author: Francois Gouget 
Date:   Wed Feb  8 18:38:02 2017 +0100

oleaut32: Standardize the heap_xxx() functions.

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

---

dlls/oleaut32/typelib.c | 24 ------------------------
 dlls/oleaut32/typelib.h | 24 +++++++++++++++++++-----
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 3df9631..1c00d71 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -1600,30 +1600,6 @@ static void TLB_abort(void)
     DebugBreak();
 }

-void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(unsigned size)
-{
-    void *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
-    if (!ret) ERR("cannot allocate memory\n");
-    return ret;
-}
-
-void* __WINE_ALLOC_SIZE(1) heap_alloc(unsigned size)
-{
-    void *ret = HeapAlloc(GetProcessHeap(), 0, size);
-    if (!ret) ERR("cannot allocate memory\n");
-    return ret;
-}
-
-void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, unsigned size)
-{
-    return HeapReAlloc(GetProcessHeap(), 0, ptr, size);
-}
-
-void heap_free(void *ptr)
-{
-    HeapFree(GetProcessHeap(), 0, ptr);
-}
-
 /* returns the size required for a deep copy of a typedesc into a
  * flat buffer */
 static SIZE_T TLB_SizeTypeDesc( const TYPEDESC *tdesc, BOOL alloc_initial_space )
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index 31c9ab9..d977dfb 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -596,11 +596,25 @@ WORD typeofarray

#include "poppack.h"

-/* heap allocation helpers */
-extern void* heap_alloc_zero(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1);
-extern void* heap_alloc(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1);
-extern void* heap_realloc(void *ptr, unsigned size) DECLSPEC_HIDDEN;
-extern void  heap_free(void *ptr) DECLSPEC_HIDDEN;
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size )
+{
+    return HeapAlloc( GetProcessHeap(), 0, size );
+}
+
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size )
+{
+    return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size );
+}
+
+static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size )
+{
+    return HeapReAlloc( GetProcessHeap(), 0, mem, size );
+}
+
+static inline BOOL heap_free( LPVOID mem )
+{
+    return HeapFree( GetProcessHeap(), 0, mem );
+}

HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN;