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:
parent
3c1356888a
commit
6ec880993b
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue