ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dlls: Do not use __WINE_ALLOC_SIZE between void and *.

This commit is contained in:
Detlef Riekenberg 2008-09-19 05:35:49 +02:00 committed by Alexandre Julliard
parent 6d0ffa50a0
commit 9593c9e6f5
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/hhctrl.ocx/hhctrl.h
View File

@ -141,22 +141,22 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR);
/* memory allocation functions */ /* 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); 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); 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); 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); return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len);
} }

7
dlls/localspl/localspl_private.h
View File

@ -51,11 +51,16 @@ extern HINSTANCE LOCALSPL_hInstance;
/* ## Memory allocation functions ## */ /* ## 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 ); 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 ) static inline BOOL heap_free( void *mem )
{ {
return HeapFree( GetProcessHeap(), 0, mem ); return HeapFree( GetProcessHeap(), 0, mem );

6
dlls/mshtml/mshtml_private.h
View File

@ -654,17 +654,17 @@ extern LONG module_ref;
/* memory allocation functions */ /* 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); 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); 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); return HeapReAlloc(GetProcessHeap(), 0, mem, len);
} }

4
dlls/riched20/editor.h
View File

@ -25,7 +25,7 @@ struct _RTF_Info;
extern HANDLE me_heap; 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 ); return HeapAlloc( me_heap, 0, len );
} }
@ -35,7 +35,7 @@ static inline BOOL heap_free( void *ptr )
return HeapFree( me_heap, 0, 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 ); return HeapReAlloc( me_heap, 0, ptr, len );
} }