richedit: Support ascii RTF in WM_SETTEXT even for unicode messages.

WM_SETTEXT seems to check for {\rtf or {\urtf to determine if it is an ascii RTF string, even if it is a unicode message. So I removed the check to see if it is a unicode message, and added a check for {\urtf.

richedit: Support ascii RTF in WM_SETTEXT even for unicode messages.
88c2b90a · Dylan Smith · Alexandre Julliard · e5c614e6 · 88c2b90a
Commit 88c2b90a authored Jul 10, 2009 by Dylan Smith Committed by Alexandre Julliard Jul 13, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

editor.c dlls/riched20/editor.c +3 -2

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -3194,7 +3194,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
    /* If we detect ascii rtf at the start of the string,
     * we know it isn't unicode. */
    bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) ||
-                         !strncmp((char *)lParam, "{\\urtf}", 6)));
+                         !strncmp((char *)lParam, "{\\urtf", 6)));
    bUnicode = !bRtf && pStruct->codepage == 1200;

    TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n",
@@ -3463,7 +3463,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
    if (lParam)
    {
      TRACE("WM_SETTEXT lParam==%lx\n",lParam);
-      if (!unicode && !strncmp((char *)lParam, "{\\rtf", 5))
+      if (!strncmp((char *)lParam, "{\\rtf", 5) ||
+          !strncmp((char *)lParam, "{\\urtf", 6))
      {
        /* Undocumented: WM_SETTEXT supports RTF text */
        ME_StreamInRTFString(editor, 0, (char *)lParam);