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

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Tue Feb  6 01:07:15 2018 +0100

usp10: Use the global HeapAlloc() wrappers.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Aric Stewart 
Signed-off-by: Alexandre Julliard

---

dlls/usp10/bidi.c           |  1 +
 dlls/usp10/breaking.c       |  1 +
 dlls/usp10/indic.c          |  1 +
 dlls/usp10/opentype.c       |  1 +
 dlls/usp10/shape.c          |  1 +
 dlls/usp10/usp10.c          |  1 +
 dlls/usp10/usp10_internal.h | 15 ---------------
 7 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c
index 5941ef8..d94dc7b 100644
--- a/dlls/usp10/bidi.c
+++ b/dlls/usp10/bidi.c
@@ -52,6 +52,7 @@
 #include "usp10.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
 #include "wine/list.h"

#include "usp10_internal.h"
diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c
index f5e40ac..9b12d9e 100644
--- a/dlls/usp10/breaking.c
+++ b/dlls/usp10/breaking.c
@@ -32,6 +32,7 @@
 #include "winternl.h"

#include "wine/debug.h"
+#include "wine/heap.h"
 #include "usp10_internal.h"

WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c
index c9b0810..5a228e8 100644
--- a/dlls/usp10/indic.c
+++ b/dlls/usp10/indic.c
@@ -32,6 +32,7 @@
 #include "winternl.h"

#include "wine/debug.h"
+#include "wine/heap.h"
 #include "usp10_internal.h"

WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 1fd9c4d..2d708a8 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -32,6 +32,7 @@
 #include "usp10_internal.h"

#include "wine/debug.h"
+#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index b75be60..ca084e7 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -32,6 +32,7 @@
 #include "usp10_internal.h"

#include "wine/debug.h"
+#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 17f60a1..5f50332 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -39,6 +39,7 @@
 #include "usp10_internal.h"

#include "wine/debug.h"
+#include "wine/heap.h"
 #include "wine/unicode.h"

WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h
index 832d894..eae0255 100644
--- a/dlls/usp10/usp10_internal.h
+++ b/dlls/usp10/usp10_internal.h
@@ -219,21 +219,6 @@ typedef struct {

enum {lex_Halant, lex_Composed_Vowel, lex_Matra_post, lex_Matra_pre, lex_Matra_above, lex_Matra_below, lex_ZWJ, lex_ZWNJ, lex_NBSP, lex_Modifier, lex_Vowel, lex_Consonant, lex_Generic, lex_Ra, lex_Vedic, lex_Anudatta, lex_Nukta};

-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 BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
 static inline BOOL is_consonant( int type )
 {
     return (type == lex_Ra || type == lex_Consonant);