ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Piotr Caban 2016-04-18 15:14:39 +02:00 committed by Alexandre Julliard
parent d11c758faf
commit 3dbd467162
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/riched20/tests/editor.c
View File

@ -732,7 +732,7 @@ static void test_EM_POSFROMCHAR(void)
SendMessageA(hwndRichEdit, WM_SETTEXT, 0, SendMessageA(hwndRichEdit, WM_SETTEXT, 0,
(LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}");
SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); 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); fmt.cbSize = sizeof(fmt);
SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt);

5
dlls/riched20/wrap.c
View File

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