Module: wine Branch: master Commit: 0c91b5ebcdd6d429c3394f97bed406bf48119302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c91b5ebcdd6d429c3394f97b...
Author: Michael Stefaniuc mstefani@winehq.org Date: Tue Feb 6 01:07:18 2018 +0100
webservices: Use the global HeapAlloc() wrappers.
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/webservices/channel.c | 1 + dlls/webservices/error.c | 1 + dlls/webservices/heap.c | 1 + dlls/webservices/listener.c | 1 + dlls/webservices/msg.c | 1 + dlls/webservices/proxy.c | 1 + dlls/webservices/reader.c | 1 + dlls/webservices/string.c | 1 + dlls/webservices/url.c | 1 + dlls/webservices/webservices_private.h | 20 -------------------- dlls/webservices/writer.c | 1 + 11 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0765e0d..685e13d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -25,6 +25,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 747af2a..e4292db 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -24,6 +24,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h"
diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 080cc0d..5e1a273 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -24,6 +24,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h"
diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 41afb27..a178e27 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -23,6 +23,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index f4d167f..19a1076 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -25,6 +25,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index a4041fe..da30cb0 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -24,6 +24,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h"
diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4c121d9..a56bb7e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -25,6 +25,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h"
diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 45a5512..18c55e3 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -24,6 +24,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h"
diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index e5e04e4..465857a 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -24,6 +24,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 3f6d2f4..cce49cc 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -394,27 +394,7 @@ static inline BOOL is_valid_parent( const struct node *node ) return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); }
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 75cf7b4..9cba4e6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -28,6 +28,7 @@ #include "webservices.h"
#include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h"