Fixed UTF-8 RTF parsing.

bd10348e · Phil Krylov · Alexandre Julliard · 7bb3b2d3 · bd10348e
Commit bd10348e authored Aug 08, 2005 by Phil Krylov Committed by Alexandre Julliard Aug 08, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

reader.c dlls/riched20/reader.c +5 -2

No files found.
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -2556,6 +2556,9 @@ CharAttr(RTF_Info *info)
 static void
 CharSet(RTF_Info *info)
 {
+	if (info->ansiCodePage == CP_UTF8)
+		return;
+ 
        switch (info->rtfMinor)
        {
        case rtfAnsiCharSet:
@@ -2594,10 +2597,10 @@ DocAttr(RTF_Info *info)
        switch (info->rtfMinor)
        {
        case rtfAnsiCodePage:
-                info->ansiCodePage = info->rtfParam;
+                info->codePage = info->ansiCodePage = info->rtfParam;
                break;
        case rtfUTF8RTF:
-                info->ansiCodePage = CP_UTF8;
+                info->codePage = info->ansiCodePage = CP_UTF8;
                break;
        }
 }