Michael Stefaniuc : oleaut32: Use the global HeapAlloc() wrappers.
Module: wine Branch: master Commit: d0ecd514b4de6e0761322b1e688c344f0412d08e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ecd514b4de6e0761322b1e6... Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:55 2018 +0100 oleaut32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 + dlls/oleaut32/typelib.h | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 49366ae..4ee6aa5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -73,6 +73,7 @@ #include "typelib.h" #include "wine/debug.h" #include "variant.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index d977dfb..2003c75 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -596,26 +596,6 @@ WORD typeofarray #include "poppack.h" -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; extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) DECLSPEC_HIDDEN;
participants (1)
-
Alexandre Julliard