Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/browseui/aclmulti.c | 1 + dlls/browseui/aclsource.c | 1 + dlls/browseui/browseui.h | 21 --------------------- dlls/browseui/browseui_main.c | 1 + dlls/browseui/compcatcachedaemon.c | 1 + dlls/browseui/progressdlg.c | 1 + 6 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 3a6525fc7a..412a18d3ab 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h"
+#include "wine/heap.h" #include "wine/unicode.h"
#include "browseui.h" diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 71e9d39a71..0ade9cce55 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h"
+#include "wine/heap.h" #include "wine/unicode.h"
#include "browseui.h" diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 27691a1cce..73780f1ce2 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,25 +31,4 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut)
extern const GUID CLSID_CompCatCacheDaemon;
-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) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_BROWSEUI_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 1b3cecc996..2e31b37fc8 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -34,6 +34,7 @@ #include "shlguid.h" #include "rpcproxy.h"
+#include "wine/heap.h" #include "browseui.h"
#include "initguid.h" diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index a5c97e9507..1f62441727 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h"
+#include "wine/heap.h" #include "wine/unicode.h"
#include "browseui.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 24183bdc04..09c1996a59 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h"
+#include "wine/heap.h" #include "wine/unicode.h"
#include "browseui.h"