Huw Davies : riched20: Pass a ME_Paragraph ptr to shape_para().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 749c80bdafa9890b9fbe8f1964e2f198d671e3bd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=749c80bdafa9890b9fbe8f196...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Thu Oct  8 11:10:49 2020 +0100

riched20: Pass a ME_Paragraph ptr to shape_para().

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

---

 dlls/riched20/wrap.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index 48db31f4ff..4853eefcab 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -795,21 +795,17 @@ end:
 }
 
 
-static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p )
+static HRESULT shape_para( ME_Context *c, ME_Paragraph *para )
 {
-    ME_DisplayItem *di;
     ME_Run *run;
     HRESULT hr;
 
-    for (di = p->next; di != p->member.para.next_para; di = di->next)
+    for (run = para_first_run( para ); run; run = run_next( run ))
     {
-        if (di->type != diRun) continue;
-        run = &di->member.run;
-
         hr = shape_run( c, run );
         if (FAILED( hr ))
         {
-            run->para->nFlags &= ~MEPF_COMPLEX;
+            para->nFlags &= ~MEPF_COMPLEX;
             return hr;
         }
     }
@@ -835,7 +831,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag
       ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */)
   {
       if (SUCCEEDED( itemize_para( c, para ) ))
-          shape_para( c, para_get_di( para ) );
+          shape_para( c, para );
   }
 
   wc.context = c;