Michael Stefaniuc : urlmon/tests: Use the global HeapAlloc() wrappers.
Alexandre Julliard
julliard at winehq.org
Tue Feb 6 15:55:50 CST 2018
Module: wine
Branch: master
Commit: 6ec880993b98800b4cd790cde72ae785e6c60241
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ec880993b98800b4cd790cde72ae785e6c60241
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Tue Feb 6 01:07:13 2018 +0100
urlmon/tests: Use the global HeapAlloc() wrappers.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/urlmon/tests/misc.c | 6 +-----
dlls/urlmon/tests/sec_mgr.c | 6 +-----
dlls/urlmon/tests/uri.c | 11 +----------
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index dc8b179..73c6374 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -31,6 +31,7 @@
#include "urlmon.h"
#include "initguid.h"
+#include "wine/heap.h"
DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
@@ -88,11 +89,6 @@ static int strcmp_wa(const WCHAR *strw, const char *stra)
return lstrcmpW(strw, buf);
}
-static void heap_free(void *mem)
-{
- HeapFree(GetProcessHeap(), 0, mem);
-}
-
static WCHAR *a2w(const char *str)
{
WCHAR *ret;
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 33e295a..411a3b7 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -35,6 +35,7 @@
#include "urlmon.h"
#include "initguid.h"
+#include <wine/heap.h>
#define URLZONE_CUSTOM URLZONE_USER_MIN+1
#define URLZONE_CUSTOM2 URLZONE_CUSTOM+1
@@ -176,11 +177,6 @@ static int strcmp_w(const WCHAR *str1, const WCHAR *str2)
return memcmp(str1, str2, len1*sizeof(WCHAR));
}
-static inline void heap_free(void *mem)
-{
- HeapFree(GetProcessHeap(), 0, mem);
-}
-
static inline LPWSTR a2w(LPCSTR str)
{
LPWSTR ret = NULL;
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index a0e3f61..796e4d3 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -33,6 +33,7 @@
#include "wininet.h"
#include "strsafe.h"
#include "initguid.h"
+#include <wine/heap.h>
DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C);
@@ -7436,16 +7437,6 @@ static inline LPWSTR a2w(LPCSTR str) {
return ret;
}
-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 inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) {
LPWSTR strAW = a2w(strA);
DWORD ret = lstrcmpW(strAW, strB);
More information about the wine-cvs
mailing list