[PATCH 1/2] riched20: Remove New() allocation macro.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/riched20/reader.c | 8 ++++----
 dlls/riched20/rtf.h    | 7 -------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c
index e73b8b87e9d..b17d6835f25 100644
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -813,7 +813,7 @@ static void ReadFontTbl(RTF_Info *info)
 			if (info->rtfClass == rtfEOF)
 				break;
 		}
-		fp = New (RTFFont);
+		fp = heap_alloc(sizeof(*fp));
 		if (fp == NULL) {
 			ERR ("cannot allocate font entry\n");
 			break;
@@ -986,7 +986,7 @@ static void ReadColorTbl(RTF_Info *info)
                         continue;
                 }
 
-		cp = New (RTFColor);
+		cp = heap_alloc(sizeof(*cp));
 		if (cp == NULL) {
 			ERR ("cannot allocate color entry\n");
 			break;
@@ -1036,7 +1036,7 @@ static void ReadStyleSheet(RTF_Info *info)
 			break;
 		if (RTFCheckCM (info, rtfGroup, rtfEndGroup))
 			break;
-		sp = New (RTFStyle);
+		sp = heap_alloc(sizeof(*sp));
 		if (sp == NULL) {
 			ERR ("cannot allocate stylesheet entry\n");
 			break;
@@ -1104,7 +1104,7 @@ static void ReadStyleSheet(RTF_Info *info)
 					sp->rtfSNextPar = info->rtfParam;
 					continue;
 				}
-				sep = New (RTFStyleElt);
+				sep = heap_alloc(sizeof(*sep));
 				if (sep == NULL)
                                 {
 					ERR ("cannot allocate style element\n");
diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h
index 35a0ee878e9..9f15d5ba8e1 100644
--- a/dlls/riched20/rtf.h
+++ b/dlls/riched20/rtf.h
@@ -1078,13 +1078,6 @@ struct RTFTable
 # define RTFBorderCellBottom     0x32
 # define RTFBorderCellRight      0x33
 
-/*
- * Return pointer to new element of type t, or NULL
- * if no memory available.
- */
-
-# define        New(t)  (heap_alloc (sizeof (t)))
-
 /* Parser stack size */
 
 # define        maxStack      32
-- 
2.33.0