Re: [PATCH] usp10: Use the global HeapAlloc() wrappers

[Aric Stewart]

Signed-off-by: Aric Stewart

On 2/5/18 6:07 PM, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc
>
> 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 5941ef81ca..d94dc7b6a9 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 f5e40ac27b..9b12d9e63d 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 c9b0810235..5a228e88de 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 1fd9c4d3c6..2d708a8c40 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 b75be601db..ca084e7285 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 17f60a19e1..5f50332712 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 832d89448f..eae02552d8 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);