Michael Stefaniuc : oleacc: Use the global HeapAlloc() wrappers.

Alexandre Julliard julliard at winehq.org
Fri Feb 2 12:24:37 CST 2018


Module: wine
Branch: master
Commit: f9e47ff5e03ae568dea436f4c3305e6bc301d271
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f9e47ff5e03ae568dea436f4c3305e6bc301d271

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Fri Feb  2 01:03:57 2018 +0100

oleacc: Use the global HeapAlloc() wrappers.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/oleacc/client.c         |  1 +
 dlls/oleacc/oleacc_private.h | 10 ----------
 dlls/oleacc/window.c         |  1 +
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c
index ddaa89d..5b1f0ee 100644
--- a/dlls/oleacc/client.c
+++ b/dlls/oleacc/client.c
@@ -22,6 +22,7 @@
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
 
diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h
index 06e3ba6..32561ef 100644
--- a/dlls/oleacc/oleacc_private.h
+++ b/dlls/oleacc/oleacc_private.h
@@ -23,13 +23,3 @@ HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN;
 HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN;
 
 int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN;
-
-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c
index 64d7167..32c19fd 100644
--- a/dlls/oleacc/window.c
+++ b/dlls/oleacc/window.c
@@ -22,6 +22,7 @@
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
 




More information about the wine-cvs mailing list