oleaut32: Standardize the heap_xxx() functions.
Francois Gouget
fgouget at free.fr
Wed Feb 8 11:38:02 CST 2017
Declare them in a header like for the other dlls. However note that
this implies removing the ERR() calls.
Signed-off-by: Francois Gouget <fgouget at free.fr>
---
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 4fdfbeb5442..ce4abc9287e 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 31c9ab94d18..d977dfb063f 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;
--
2.11.0
More information about the wine-patches
mailing list