Phil Krylov : riched20: Accept RTF group tokens inside colortbl
destination .
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Aug 11 04:58:45 CDT 2006
Module: wine
Branch: master
Commit: d360f1db5137bb6a9f2efdfa6f58c7b36c55680b
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d360f1db5137bb6a9f2efdfa6f58c7b36c55680b
Author: Phil Krylov <phil at newstar.rinet.ru>
Date: Thu Aug 10 23:08:17 2006 +0400
riched20: Accept RTF group tokens inside colortbl destination.
---
dlls/riched20/reader.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c
index 856cd8a..e6e4186 100644
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -1057,6 +1057,7 @@ static void ReadColorTbl(RTF_Info *info)
RTFColor *cp;
int cnum = 0;
const char *fn = "ReadColorTbl";
+ int group_level = 1;
TRACE("\n");
@@ -1066,7 +1067,18 @@ static void ReadColorTbl(RTF_Info *info)
if (info->rtfClass == rtfEOF)
break;
if (RTFCheckCM (info, rtfGroup, rtfEndGroup))
- break;
+ {
+ group_level--;
+ if (!group_level)
+ break;
+ continue;
+ }
+ else if (RTFCheckCM(info, rtfGroup, rtfBeginGroup))
+ {
+ group_level++;
+ continue;
+ }
+
cp = New (RTFColor);
if (cp == NULL)
ERR ( "%s: cannot allocate color entry\n", fn);
More information about the wine-cvs
mailing list