richedit: Handle missing colours in rtf colour table.

When a colour table entry is empty, then the default colour is used. For an incomplete colour table entry 0 is used for the missing colours. Previously the -1 value used internally for missing colours was being converted into white, where it should be using the default colour that is normally black. This bug could be seen by loading the following rich text into wordpad: {\rtf{\colortbl;;}\cf1 text}

richedit: Handle missing colours in rtf colour table.
dde41d5c · Dylan Smith · Alexandre Julliard · 1e5d72a6 · dde41d5c · dde41d5c
Commit dde41d5c authored Jul 17, 2009 by Dylan Smith Committed by Alexandre Julliard Jul 17, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 14 deletions

editor.c dlls/riched20/editor.c +8 -4

reader.c dlls/riched20/reader.c +13 -10

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -422,7 +422,10 @@ void ME_RTFCharAttrHook(RTF_Info *info)
      else if (info->rtfParam != rtfNoParam)
      {
        RTFColor *c = RTFGetColor(info, info->rtfParam);
-        fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed);
+        if (c && c->rtfCBlue >= 0)
+          fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed);
+        else
+          fmt.dwEffects = CFE_AUTOBACKCOLOR;
      }
      break;
    case rtfForeColor:
@@ -433,10 +436,11 @@ void ME_RTFCharAttrHook(RTF_Info *info)
      else if (info->rtfParam != rtfNoParam)
      {
        RTFColor *c = RTFGetColor(info, info->rtfParam);
-        if (c)
+        if (c && c->rtfCBlue >= 0)
          fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed);
-        else
+        else {
-          fmt.crTextColor = 0;
+          fmt.dwEffects = CFE_AUTOCOLOR;
+        }
      }
      break;
    case rtfFontNum:

--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -990,18 +990,21 @@ static void ReadColorTbl(RTF_Info *info)
 			break;
 		}
 		cp->rtfCNum = cnum++;
-		cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1;
 		cp->rtfNextColor = info->colorList;
 		info->colorList = cp;
-		while (RTFCheckCM (info, rtfControl, rtfColorName))
+		if (!RTFCheckCM (info, rtfControl, rtfColorName))
-		{
+			cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1;
-			switch (info->rtfMinor)
+		else {
-			{
+			cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = 0;
-			case rtfRed:	cp->rtfCRed = info->rtfParam; break;
+			do {
-			case rtfGreen:	cp->rtfCGreen = info->rtfParam; break;
+				switch (info->rtfMinor)
-			case rtfBlue:	cp->rtfCBlue = info->rtfParam; break;
+				{
-			}
+				case rtfRed:	cp->rtfCRed = info->rtfParam & 0xFF; break;
-			RTFGetToken (info);
+				case rtfGreen:	cp->rtfCGreen = info->rtfParam & 0xFF; break;
+				case rtfBlue:	cp->rtfCBlue = info->rtfParam & 0xFF; break;
+				}
+				RTFGetToken (info);
+			} while (RTFCheckCM (info, rtfControl, rtfColorName));
 		}
 		if (info->rtfClass == rtfEOF)
 			break;