Module: wine Branch: master Commit: 4099ddb52171529e8c1121e02145f69c0cd08a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4099ddb52171529e8c1121e021...
Author: Francois Gouget fgouget@free.fr Date: Fri Feb 10 16:43:36 2017 +0100
gdi32/tests: Add inline, __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
And standardize their formatting and parameter names.
Signed-off-by: Francois Gouget fgouget@free.fr Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/tests/font.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 96c4623..91ea932 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -107,20 +107,20 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); }
-static void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); }
-static void *heap_realloc( void *p, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - if (!p) return heap_alloc( len ); - return HeapReAlloc( GetProcessHeap(), 0, p, len ); + if (!mem) return heap_alloc(size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); }
-static void heap_free( void *p ) +static inline BOOL heap_free(void *mem) { - HeapFree( GetProcessHeap(), 0, p ); + return HeapFree(GetProcessHeap(), 0, mem); }
static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)