Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/oledb32/convert.c | 1 + dlls/oledb32/datainit.c | 1 + dlls/oledb32/dslocator.c | 1 + dlls/oledb32/errorinfo.c | 1 + dlls/oledb32/oledb_private.h | 20 -------------------- dlls/oledb32/rowpos.c | 1 + 6 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 22609aed88..5bad105582 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -31,6 +31,7 @@ #include "oledb_private.h"
#include "wine/debug.h" +#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 650c220741..7d78e9fca2 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -29,6 +29,7 @@ #include "oledb_private.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h"
diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f530d2e09a..d397e47aa5 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -33,6 +33,7 @@ #include "oledb_private.h"
#include "wine/debug.h" +#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index e1c3204dd4..f1c9cd17ef 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -32,6 +32,7 @@ #include "oledb_private.h"
#include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h"
#include "wine/debug.h" diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 6f2bf76206..4e285b5460 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.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, 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) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c1cee127e8..46904d3da5 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -28,6 +28,7 @@
#include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(oledb);
-
Huw Davies -
Michael Stefaniuc