oledb32: Use the global HeapAlloc() wrappers.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
4b0b149a06
commit
f9ddf9ad6d
@ -31,6 +31,7 @@
|
|||||||
#include "oledb_private.h"
|
#include "oledb_private.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
#include "wine/heap.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
|
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
#include "oledb_private.h"
|
#include "oledb_private.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
#include "wine/heap.h"
|
||||||
#include "wine/list.h"
|
#include "wine/list.h"
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#include "oledb_private.h"
|
#include "oledb_private.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
#include "wine/heap.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
|
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include "oledb_private.h"
|
#include "oledb_private.h"
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
#include "wine/heap.h"
|
||||||
#include "wine/list.h"
|
#include "wine/list.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
@ -26,27 +26,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
|
|||||||
HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid,
|
HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid,
|
||||||
IUnknown **datasource) DECLSPEC_HIDDEN;
|
IUnknown **datasource) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
|
|
||||||
{
|
|
||||||
return HeapAlloc(GetProcessHeap(), 0, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
|
|
||||||
{
|
|
||||||
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size)
|
|
||||||
{
|
|
||||||
return HeapReAlloc(GetProcessHeap(), 0, mem, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size)
|
static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size)
|
||||||
{
|
{
|
||||||
return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size);
|
return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline BOOL heap_free(void *mem)
|
|
||||||
{
|
|
||||||
return HeapFree(GetProcessHeap(), 0, mem);
|
|
||||||
}
|
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
#include "oledb_private.h"
|
#include "oledb_private.h"
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
#include "wine/heap.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
|
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user