riched20: Write the char format for the end-of-paragraph marker.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Write the char format for the end-of-paragraph marker.
3d291dd7 · Huw Davies · Alexandre Julliard · b60cd683 · 3d291dd7 · 3d291dd7
Commit 3d291dd7 authored Mar 03, 2017 by Huw Davies Committed by Alexandre Julliard Mar 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

editor.c dlls/riched20/tests/editor.c +1 -1

writer.c dlls/riched20/writer.c +3 -0

No files found.
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -3951,7 +3951,7 @@ static void test_EM_STREAMOUT_empty_para(void)

    SendMessageA(hwnd, EM_STREAMOUT, SF_RTF, (LPARAM)&es);
    ok((p = strstr(buf, "\\pard")) != NULL, "missing \\pard\n");
-    todo_wine ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n");
+    ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n");

    DestroyWindow(hwnd);
 }

--- a/dlls/riched20/writer.c
+++ b/dlls/riched20/writer.c
@@ -1074,6 +1074,9 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream,
      }
      nChars--;
    } else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) {
+      if (!ME_StreamOutRTFCharProps(pStream, &cursor.pRun->member.run.style->fmt))
+        return FALSE;
+
      if (cursor.pPara->member.para.fmt.dwMask & PFM_TABLE &&
          cursor.pPara->member.para.fmt.wEffects & PFE_TABLE &&
          !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL)))