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

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

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-02-06 01:07:13 +01:00 committed by Alexandre Julliard
parent 3c1356888a
commit 6ec880993b
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/urlmon/tests/misc.c
View File

@ -31,6 +31,7 @@
#include "urlmon.h" #include "urlmon.h"
#include "initguid.h" #include "initguid.h"
#include "wine/heap.h"
DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); 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); return lstrcmpW(strw, buf);
} }
static void heap_free(void *mem)
{
HeapFree(GetProcessHeap(), 0, mem);
}
static WCHAR *a2w(const char *str) static WCHAR *a2w(const char *str)
{ {
WCHAR *ret; WCHAR *ret;

6
dlls/urlmon/tests/sec_mgr.c
View File

@ -35,6 +35,7 @@
#include "urlmon.h" #include "urlmon.h"
#include "initguid.h" #include "initguid.h"
#include <wine/heap.h>
#define URLZONE_CUSTOM URLZONE_USER_MIN+1 #define URLZONE_CUSTOM URLZONE_USER_MIN+1
#define URLZONE_CUSTOM2 URLZONE_CUSTOM+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)); return memcmp(str1, str2, len1*sizeof(WCHAR));
} }
static inline void heap_free(void *mem)
{
HeapFree(GetProcessHeap(), 0, mem);
}
static inline LPWSTR a2w(LPCSTR str) static inline LPWSTR a2w(LPCSTR str)
{ {
LPWSTR ret = NULL; LPWSTR ret = NULL;

11
dlls/urlmon/tests/uri.c
View File

@ -33,6 +33,7 @@
#include "wininet.h" #include "wininet.h"
#include "strsafe.h" #include "strsafe.h"
#include "initguid.h" #include "initguid.h"
#include <wine/heap.h>
DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); 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; 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) { static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) {
LPWSTR strAW = a2w(strA); LPWSTR strAW = a2w(strA);
DWORD ret = lstrcmpW(strAW, strB); DWORD ret = lstrcmpW(strAW, strB);