richedit: Check for bits instead of equality in EM_SETCHARFORMAT.

There are unsupported flags documented on MSDN which would cause problems for the equality checks used in EM_SETCHARFORMAT. Also, to handle a combined set of flags they must be checked for in the right order.

richedit: Check for bits instead of equality in EM_SETCHARFORMAT.
ad056fe7 · Dylan Smith · Alexandre Julliard · 16d78904 · ad056fe7
Commit ad056fe7 authored Jul 29, 2010 by Dylan Smith Committed by Alexandre Julliard Jul 30, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 11 deletions

editor.c dlls/riched20/editor.c +12 -11

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -3359,26 +3359,27 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
    BOOL bRepaint = TRUE;
    p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam);
    if (p == NULL) return 0;
-    if (!wParam)
+    if (wParam & SCF_ALL) {
-      ME_SetDefaultCharFormat(editor, p);
+      if (editor->mode & TM_PLAINTEXT) {
-    else if (wParam == (SCF_WORD | SCF_SELECTION)) {
-      FIXME("EM_SETCHARFORMAT: word selection not supported\n");
-      return 0;
-    } else if (wParam == SCF_ALL) {
-      if (editor->mode & TM_PLAINTEXT)
        ME_SetDefaultCharFormat(editor, p);
-      else {
+      } else {
        ME_Cursor start;
        ME_SetCursorToStart(editor, &start);
        ME_SetCharFormat(editor, &start, NULL, p);
        editor->nModifyStep = 1;
      }
-    } else if (editor->mode & TM_PLAINTEXT) {
+    } else if (wParam & SCF_SELECTION) {
-      return 0;
+      if (editor->mode & TM_PLAINTEXT)
-    } else {
+        return 0;
+      if (wParam & SCF_WORD) {
+        FIXME("EM_SETCHARFORMAT: word selection not supported\n");
+        return 0;
+      }
      bRepaint = ME_IsSelection(editor);
      ME_SetSelectionCharFormat(editor, p);
      if (bRepaint) editor->nModifyStep = 1;
+    } else { /* SCF_DEFAULT */
+      ME_SetDefaultCharFormat(editor, p);
    }
    ME_CommitUndo(editor);
    if (bRepaint)