Michael Stefaniuc : gdi32/tests: Use the global HeapAlloc() wrappers.

Alexandre Julliard julliard at winehq.org
Wed Jan 31 15:23:27 CST 2018


Module: wine
Branch: master
Commit: 5c3928df94d108b0c472cd8a472278b55d56f351
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5c3928df94d108b0c472cd8a472278b55d56f351

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Tue Jan 30 23:41:00 2018 +0100

gdi32/tests: Use the global HeapAlloc() wrappers.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdi32/tests/font.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 117a14f..70e44f3 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -28,6 +28,7 @@
 #include "winuser.h"
 #include "winnls.h"
 
+#include "wine/heap.h"
 #include "wine/test.h"
 
 static inline BOOL match_off_by_n(int a, int b, unsigned int n)
@@ -109,22 +110,6 @@ static void init(void)
     system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID());
 }
 
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size)
-{
-    if (!mem) return heap_alloc(size);
-    return HeapReAlloc(GetProcessHeap(), 0, mem, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
 static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)
 {
     if (type != TRUETYPE_FONTTYPE) return 1;




More information about the wine-cvs mailing list