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

Alexandre Julliard julliard at winehq.org
Wed Feb 7 15:24:27 CST 2018


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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Feb  7 00:20:04 2018 +0100

wmp: Use the global HeapAlloc() wrappers.

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

---

 dlls/wmp/oleobj.c      |  1 +
 dlls/wmp/wmp_private.h | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c
index acf38f3..4799712 100644
--- a/dlls/wmp/oleobj.c
+++ b/dlls/wmp/oleobj.c
@@ -20,6 +20,7 @@
 #include "olectl.h"
 
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmp);
 
diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h
index 7b7f51c..04173f3 100644
--- a/dlls/wmp/wmp_private.h
+++ b/dlls/wmp/wmp_private.h
@@ -46,18 +46,3 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**)
 void unregister_wmp_class(void) DECLSPEC_HIDDEN;
 
 extern HINSTANCE wmp_instance DECLSPEC_HIDDEN;
-
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), 0, len);
-}
-
-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);
-}




More information about the wine-cvs mailing list