riched20: Correctly handle the wrapping when graphics are used.

Get rid of infinite loops when run's width was larger than the global available width.

riched20: Correctly handle the wrapping when graphics are used.
d014db68 · Eric Pouech · Alexandre Julliard · 00b48f1d · d014db68
Commit d014db68 authored Jan 27, 2008 by Eric Pouech Committed by Alexandre Julliard Feb 05, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

wrap.c dlls/riched20/wrap.c +7 -2

No files found.
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -293,8 +293,13 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
      wc->bOverflown = TRUE;
      return p;
    }
-    /* graphics or TAB - we can split before */
-    if (run->nFlags & (MERF_GRAPHICS|MERF_TAB)) {
+    /* TAB: we can split before */
+    if (run->nFlags & MERF_TAB) {
+      wc->bOverflown = TRUE;
+      return p;
+    }
+    /* graphics: we can split before, if run's width is smaller than row's width */
+    if ((run->nFlags & MERF_GRAPHICS) && run->nWidth <= wc->nAvailWidth) {
      wc->bOverflown = TRUE;
      return p;
    }