[PATCH v2] riched20: Add more warnings for unhandled control words.

[Zebediah Figura]

v2: use FIXME instead of WARN; use debugstr_a (thanks Huw)
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/riched20/editor.c |  6 ++++++
 dlls/riched20/reader.c | 26 ++++++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index a7b1bc748f..261d24325f 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -533,6 +533,8 @@ void ME_RTFCharAttrHook(RTF_Info *info)
       if (info->rtfParam != rtfNoParam)
         fmt.yHeight = info->rtfParam*10;
       break;
+    default:
+        FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
   }
   if (fmt.dwMask) {
     ME_Style *style2;
@@ -866,6 +868,8 @@ void ME_RTFParAttrHook(RTF_Info *info)
     info->fmt.dwMask |= PFM_RTLPARA;
     info->fmt.wEffects &= ~PFE_RTLPARA;
     break;
+  default:
+    FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
   }
 }
 
@@ -940,6 +944,8 @@ void ME_RTFTblAttrHook(RTF_Info *info)
       if (info->tableDef)
         info->tableDef->leftEdge = info->rtfParam;
       break;
+    default:
+        FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
   }
 }
 
diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c
index 03101090b3..59ee5a5a21 100644
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -841,8 +841,7 @@ static void ReadFontTbl(RTF_Info *info)
 				{
 				default:
 					/* ignore token but announce it */
-					WARN ("unknown token \"%s\"\n",
-						info->rtfTextBuf);
+					FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
                                         break;
 				case rtfFontFamily:
 					fp->rtfFFamily = info->rtfMinor;
@@ -911,7 +910,7 @@ static void ReadFontTbl(RTF_Info *info)
 			else
 			{
 				/* ignore token but announce it */
-				WARN ("unknown token \"%s\"\n", info->rtfTextBuf);
+				FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
 			}
 			RTFGetToken (info);
 			if (info->rtfClass == rtfEOF)
@@ -1011,7 +1010,7 @@ static void ReadColorTbl(RTF_Info *info)
 		if (info->rtfClass == rtfEOF)
 			break;
 		if (!RTFCheckCM (info, rtfText, ';'))
-			ERR ("malformed entry\n");
+			FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
 	}
 	RTFRouteToken (info);	/* feed "}" back to router */
 }
@@ -1064,7 +1063,7 @@ static void ReadStyleSheet(RTF_Info *info)
 			{
 				if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) {
 					RTFGetToken(info);
-					ERR("skipping optional destination\n");
+					FIXME("skipping optional destination\n");
 					RTFSkipGroup(info);
 					info->rtfClass = rtfGroup;
 					info->rtfMajor = rtfEndGroup;
@@ -1156,7 +1155,7 @@ static void ReadStyleSheet(RTF_Info *info)
 			else		/* unrecognized */
 			{
 				/* ignore token but announce it */
-				WARN ("unknown token \"%s\"\n", info->rtfTextBuf);
+				FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
 			}
 		}
 		if (real_style) {
@@ -2385,6 +2384,8 @@ ControlClass (RTF_Info *info)
                 SpecialChar (info);
                 ME_RTFSpecialCharHook(info);
 		break;
+        default:
+                FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
 	}
 }
 
@@ -2437,6 +2438,8 @@ CharSet(RTF_Info *info)
         case rtfPcaCharSet:
                 info->ansiCodePage = 850;
                 break;
+        default:
+                FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
         }
 }
 
@@ -2449,8 +2452,11 @@ CharSet(RTF_Info *info)
 static void
 Destination (RTF_Info *info)
 {
-	if (!RTFGetDestinationCallback(info, info->rtfMinor))
-		RTFSkipGroup (info);    
+    if (!RTFGetDestinationCallback(info, info->rtfMinor))
+    {
+        FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
+        RTFSkipGroup(info);
+    }
 }
 
 
@@ -2475,6 +2481,8 @@ DocAttr(RTF_Info *info)
         case rtfUTF8RTF:
                 info->codePage = info->ansiCodePage = CP_UTF8;
                 break;
+        default:
+                FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
         }
 }
 
@@ -2574,6 +2582,8 @@ static void SpecialChar (RTF_Info *info)
         case rtfNoWidthNonJoiner:
                 RTFPutUnicodeChar (info, 0x200C);
                 break;
+        default:
+                FIXME("unknown token %s\n", debugstr_a(info->rtfTextBuf));
 	}
 }
 
-- 
2.14.1