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

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


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

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

wscript: Use the global HeapAlloc() wrappers.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/wscript/host.c    |  1 +
 programs/wscript/wscript.h | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/programs/wscript/host.c b/programs/wscript/host.c
index 3c30c3c..fb95c0c 100644
--- a/programs/wscript/host.c
+++ b/programs/wscript/host.c
@@ -28,6 +28,7 @@
 #include "wscript.h"
 
 #include <wine/debug.h>
+#include <wine/heap.h>
 #include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(wscript);
diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h
index 2a64b34..d624a2d 100644
--- a/programs/wscript/wscript.h
+++ b/programs/wscript/wscript.h
@@ -33,18 +33,3 @@ extern WCHAR **argums;
 extern int numOfArgs;
 
 extern VARIANT_BOOL wshInteractive;
-
-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