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

comctl32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal. 

Signed-off-by: Roman Pišl <rpisl@seznam.cz>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Roman Pišl 2020-04-20 12:20:14 +02:00 committed by Alexandre Julliard
parent 571489fde1
commit be1446f56c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/comctl32/edit.c
View File

@ -1579,8 +1579,12 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy)
{ {
INT nyoff; INT nyoff;
INT x_offset_in_pixels; INT x_offset_in_pixels;
INT lines_per_page = (es->format_rect.bottom - es->format_rect.top) / INT lines_per_page;
es->line_height;
if (!es->line_height || !es->char_width)
return TRUE;
lines_per_page = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
if (es->style & ES_MULTILINE) if (es->style & ES_MULTILINE)
{ {

4
dlls/comctl32/tests/edit.c
View File

@ -1790,6 +1790,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam,
ok(r == 1, "Returned %ld, expected 1.\n", r); ok(r == 1, "Returned %ld, expected 1.\n", r);
r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010);
todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r);
r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1);
ok(r == 1, "Returned %ld, expected 1.\n", r);
return result; return result;
@ -1800,6 +1802,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam,
ok(r == 1, "Returned %ld, expected 1.\n", r); ok(r == 1, "Returned %ld, expected 1.\n", r);
r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010);
todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r);
r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1);
ok(r == 1, "Returned %ld, expected 1.\n", r);
break; break;
} }