[PATCH 5/5] riched20: Pass a ME_Paragraph ptr to shape_para().
Huw Davies
huw at codeweavers.com
Thu Oct 8 05:10:49 CDT 2020
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
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 48db31f4ff2..4853eefcabb 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;
--
2.23.0
More information about the wine-devel
mailing list