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

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Fri Feb  2 01:03:56 2018 +0100

ole32: Use the global HeapAlloc() wrappers.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/ole32/compobj_private.h | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 0f10a7c..9e65c3e 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -30,6 +30,7 @@
 #include <stdarg.h>

#include "wine/list.h"
+#include "wine/heap.h"

#include "windef.h"
 #include "winbase.h"
@@ -259,7 +260,7 @@ void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN;
 static inline struct oletls *COM_CurrentInfo(void)
 {
     if (!NtCurrentTeb()->ReservedForOle)
-        NtCurrentTeb()->ReservedForOle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct oletls));
+        NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls));

return NtCurrentTeb()->ReservedForOle;
 }
@@ -323,16 +324,6 @@ extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN;

extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN;

-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), 0, len);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
 static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src)
 {
     *dst = *src;