Commit 1d5c9def authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

riched20: Remove New() allocation macro.

parent 5d782424
...@@ -813,7 +813,7 @@ static void ReadFontTbl(RTF_Info *info) ...@@ -813,7 +813,7 @@ static void ReadFontTbl(RTF_Info *info)
if (info->rtfClass == rtfEOF) if (info->rtfClass == rtfEOF)
break; break;
} }
fp = New (RTFFont); fp = heap_alloc(sizeof(*fp));
if (fp == NULL) { if (fp == NULL) {
ERR ("cannot allocate font entry\n"); ERR ("cannot allocate font entry\n");
break; break;
...@@ -986,7 +986,7 @@ static void ReadColorTbl(RTF_Info *info) ...@@ -986,7 +986,7 @@ static void ReadColorTbl(RTF_Info *info)
continue; continue;
} }
cp = New (RTFColor); cp = heap_alloc(sizeof(*cp));
if (cp == NULL) { if (cp == NULL) {
ERR ("cannot allocate color entry\n"); ERR ("cannot allocate color entry\n");
break; break;
...@@ -1036,7 +1036,7 @@ static void ReadStyleSheet(RTF_Info *info) ...@@ -1036,7 +1036,7 @@ static void ReadStyleSheet(RTF_Info *info)
break; break;
if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) if (RTFCheckCM (info, rtfGroup, rtfEndGroup))
break; break;
sp = New (RTFStyle); sp = heap_alloc(sizeof(*sp));
if (sp == NULL) { if (sp == NULL) {
ERR ("cannot allocate stylesheet entry\n"); ERR ("cannot allocate stylesheet entry\n");
break; break;
...@@ -1104,7 +1104,7 @@ static void ReadStyleSheet(RTF_Info *info) ...@@ -1104,7 +1104,7 @@ static void ReadStyleSheet(RTF_Info *info)
sp->rtfSNextPar = info->rtfParam; sp->rtfSNextPar = info->rtfParam;
continue; continue;
} }
sep = New (RTFStyleElt); sep = heap_alloc(sizeof(*sep));
if (sep == NULL) if (sep == NULL)
{ {
ERR ("cannot allocate style element\n"); ERR ("cannot allocate style element\n");
......
...@@ -1078,13 +1078,6 @@ struct RTFTable ...@@ -1078,13 +1078,6 @@ struct RTFTable
# define RTFBorderCellBottom 0x32 # define RTFBorderCellBottom 0x32
# define RTFBorderCellRight 0x33 # 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 */ /* Parser stack size */
# define maxStack 32 # define maxStack 32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment