Michael Stefaniuc : dwrite/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: 062948f57e1878110bd9fad288217025b18743fb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=062948f57e1878110bd9fad288217025b18743fb

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

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

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dwrite/tests/font.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 24e8e73..c226dba 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -30,6 +30,7 @@
 #include "initguid.h"
 #include "d2d1.h"
 
+#include "wine/heap.h"
 #include "wine/test.h"
 
 #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p')
@@ -121,16 +122,6 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li
     ok_(__FILE__,line)(rc == ref || broken(rc == brokenref), "expected refcount %d, got %d\n", ref, rc);
 }
 
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
 static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0};
 static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0};
 static const WCHAR arialW[] = {'A','r','i','a','l',0};




More information about the wine-cvs mailing list