diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index f529a595172..795bea4d13e 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -141,22 +141,22 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); /* memory allocation functions */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc_zero(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 614e10824eb..8e67ed3dd5b 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,11 +51,16 @@ extern HINSTANCE LOCALSPL_hInstance; /* ## Memory allocation functions ## */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) { return HeapAlloc( GetProcessHeap(), 0, len ); } +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4b4675b9854..5a9f5331d9e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -654,17 +654,17 @@ extern LONG module_ref; /* memory allocation functions */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cbebdba7864..2c683786e78 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,7 +25,7 @@ struct _RTF_Info; extern HANDLE me_heap; -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) { return HeapAlloc( me_heap, 0, len ); } @@ -35,7 +35,7 @@ static inline BOOL heap_free( void *ptr ) return HeapFree( me_heap, 0, ptr ); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc( void *ptr, size_t len ) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) { return HeapReAlloc( me_heap, 0, ptr, len ); }