riched20: Don't allow negative margins in ME_WrapTextParagraph.

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

riched20: Don't allow negative margins in ME_WrapTextParagraph.
3dbd4671 · Piotr Caban · Alexandre Julliard · d11c758f · 3dbd4671 · 3dbd4671
Commit 3dbd4671 authored Apr 18, 2016 by Piotr Caban Committed by Alexandre Julliard Apr 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

wrap.c dlls/riched20/wrap.c +5 -0

No files found.
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -732,7 +732,7 @@ static void test_EM_POSFROMCHAR(void)
  SendMessageA(hwndRichEdit, WM_SETTEXT, 0,
          (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}");
  SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0);
-  todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x);
+  ok(pt.x == 1, "pt.x = %d\n", pt.x);

  fmt.cbSize = sizeof(fmt);
  SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt);

--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -879,6 +879,11 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) {
    wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent);
    wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset);
    wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent);
+
+    if (wc.nFirstMargin < 0)
+        wc.nFirstMargin = 0;
+    if (wc.nLeftMargin < 0)
+        wc.nLeftMargin = 0;
  }
  if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */
      pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE)