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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3d291dd7eed2524e857ae2075f550441b694abb9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d291dd7eed2524e857ae2075f...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Fri Mar  3 10:10:41 2017 +0000

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

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

---

 dlls/riched20/tests/editor.c | 2 +-
 dlls/riched20/writer.c       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 5e71e51..ef53c56 100644
--- 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);
 }
diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c
index baa2886..809b93e 100644
--- 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)))