mirror of
https://github.com/reactos/wine.git
synced 2024-12-13 22:58:37 +00:00
oleaut32: Standardize the heap_xxx() functions.
Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
223ea1312b
commit
78ee7f57fa
@ -1600,30 +1600,6 @@ static void TLB_abort(void)
|
|||||||
DebugBreak();
|
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
|
/* returns the size required for a deep copy of a typedesc into a
|
||||||
* flat buffer */
|
* flat buffer */
|
||||||
static SIZE_T TLB_SizeTypeDesc( const TYPEDESC *tdesc, BOOL alloc_initial_space )
|
static SIZE_T TLB_SizeTypeDesc( const TYPEDESC *tdesc, BOOL alloc_initial_space )
|
||||||
|
@ -596,11 +596,25 @@ WORD typeofarray
|
|||||||
|
|
||||||
#include "poppack.h"
|
#include "poppack.h"
|
||||||
|
|
||||||
/* heap allocation helpers */
|
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size )
|
||||||
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);
|
return HeapAlloc( GetProcessHeap(), 0, size );
|
||||||
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_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;
|
HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user