[PATCH] wmvcore: Use the global HeapAlloc() wrappers

Michael Stefaniuc mstefani at winehq.org
Tue Feb 6 17:20:05 CST 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
Somehow I'm not happy about this patch as wmvcore.h remains pretty
empty and my temptation was to just remove it. That can be a second
patch though if desired.



 dlls/wmvcore/wmvcore.h      | 10 ----------
 dlls/wmvcore/wmvcore_main.c |  1 +
 dlls/wmvcore/writer.c       |  1 +
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dlls/wmvcore/wmvcore.h b/dlls/wmvcore/wmvcore.h
index ca06e0a4a6..e17547052d 100644
--- a/dlls/wmvcore/wmvcore.h
+++ b/dlls/wmvcore/wmvcore.h
@@ -24,13 +24,3 @@
 
 #include "windef.h"
 #include "winbase.h"
-
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
index ae8b486532..1b452884f1 100644
--- a/dlls/wmvcore/wmvcore_main.c
+++ b/dlls/wmvcore/wmvcore_main.c
@@ -21,6 +21,7 @@
 #include "initguid.h"
 #include "wmsdk.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c
index c1c30be895..717984db1a 100644
--- a/dlls/wmvcore/writer.c
+++ b/dlls/wmvcore/writer.c
@@ -20,6 +20,7 @@
 #include "wmsdkidl.h"
 
 #include "wine/debug.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
-- 
2.14.3




More information about the wine-devel mailing list