riched20: Remove New() allocation macro.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
5d782424d8
commit
1d5c9defb1
|
@ -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)
|
||||||
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)
|
||||||
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)
|
||||||
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
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in New Issue