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

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani(a)winehq.org>
Date:   Thu Jan 25 20:55:42 2018 +0100

localspl: Use the global HeapAlloc() wrappers.

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/localspl/localmon.c         |  1 +
 dlls/localspl/localspl_private.h | 23 -----------------------
 dlls/localspl/provider.c         |  3 ++-
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c
index 4ee3efb..4be1ad6 100644
--- a/dlls/localspl/localmon.c
+++ b/dlls/localspl/localmon.c
@@ -33,6 +33,7 @@
 #include "localspl_private.h"
 
 #include "wine/debug.h"
+#include "wine/heap.h"
 #include "wine/list.h"
 #include "wine/unicode.h"
 
diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h
index 8c49623..f27005c 100644
--- a/dlls/localspl/localspl_private.h
+++ b/dlls/localspl/localspl_private.h
@@ -51,27 +51,4 @@ void setup_provider(void) DECLSPEC_HIDDEN;
 #define PORT_IS_LPR      8
 
 
-/* ## Memory allocation functions ## */
-
-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 void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len )
-{
-    return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len );
-}
-
-static inline BOOL heap_free( void *mem )
-{
-    return HeapFree( GetProcessHeap(), 0, mem );
-}
-
-
 #endif /* __WINE_LOCALSPL_PRIVATE__ */
diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c
index 4f6bac3..3538947 100644
--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -31,8 +31,9 @@
 #include "ddk/winddiui.h"
 #include "ddk/winsplp.h"
 
-#include "wine/list.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/list.h"
 #include "wine/unicode.h"
 #include "localspl_private.h"