[PATCH 1/4] riched20: Use the global HeapAlloc() wrappers

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/riched20/editor.h  | 15 ---------------
 dlls/riched20/editstr.h |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index aba3026496..7d4a8ef979 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -25,21 +25,6 @@ struct _RTF_Info;

extern HANDLE me_heap DECLSPEC_HIDDEN;

-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
-{
-    return HeapAlloc( me_heap, 0, len );
-}
-
-static inline BOOL heap_free( void *ptr )
-{
-    return HeapFree( me_heap, 0, ptr );
-}
-
-static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len )
-{
-    return HeapReAlloc( me_heap, 0, ptr, len );
-}
-
 #define ALLOC_OBJ(type) heap_alloc(sizeof(type))
 #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type))
 #define FREE_OBJ(ptr) heap_free(ptr)
diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index 2bf680ed64..a37c4de46e 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -48,6 +48,7 @@
 #include "usp10.h"

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

#ifdef __i386__

[Huw Davies]

Signed-off-by: Huw Davies