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

user32: Don't crash in DrawTextEx when tab length is zero. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2016-03-02 15:22:10 +11:00 committed by Alexandre Julliard
parent 48bf99ea89
commit 84d0c4f0da
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/user32/tests/text.c
View File

@ -44,8 +44,9 @@ static void test_DrawTextCalcRect(void)
static WCHAR emptystringW[] = { 0 }; static WCHAR emptystringW[] = { 0 };
static CHAR wordbreak_text[] = "line1 line2"; static CHAR wordbreak_text[] = "line1 line2";
static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0};
static char tabstring[] = "one\ttwo";
INT textlen, textheight, heightcheck; INT textlen, textheight, heightcheck;
RECT rect = { 0, 0, 100, 0 }; RECT rect = { 0, 0, 100, 0 }, rect2;
BOOL ret; BOOL ret;
DRAWTEXTPARAMS dtp; DRAWTEXTPARAMS dtp;
BOOL conform_xp = TRUE; BOOL conform_xp = TRUE;
@ -580,6 +581,42 @@ static void test_DrawTextCalcRect(void)
ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n",
textheight, heightcheck * 6); textheight, heightcheck * 6);
/* DT_TABSTOP | DT_EXPANDTABS tests */
SetRect( &rect, 0,0, 10, 10);
textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_TABSTOP | DT_EXPANDTABS );
ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight);
SetRect( &rect, 0,0, 10, 10);
memset(&dtp, 0, sizeof(dtp));
dtp.cbSize = sizeof(dtp);
textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT, &dtp);
ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight);
ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength);
SetRect( &rect2, 0,0, 10, 10);
memset(&dtp, 0, sizeof(dtp));
dtp.cbSize = sizeof(dtp);
textheight = DrawTextExA(hdc, tabstring, -1, &rect2, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp);
ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight);
ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength);
ok(rect.left == rect2.left && rect.right != rect2.right && rect.top == rect2.top && rect.bottom == rect2.bottom,
"incorrect rect %d,%d-%d,%d rect2 %d,%d-%d,%d\n",
rect.left, rect.top, rect.right, rect.bottom, rect2.left, rect2.top, rect2.right, rect2.bottom );
SetRect( &rect, 0,0, 10, 10);
memset(&dtp, 0, sizeof(dtp));
dtp.cbSize = sizeof(dtp);
dtp.iTabLength = 8;
textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp);
ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight);
ok(dtp.iTabLength == 8, "invalid dtp.iTabLength = %i\n",dtp.iTabLength);
ok(rect.left == rect2.left, "unexpected value %d, got %d\n", rect.left, rect2.left);
/* XP, 2003 appear to not give the same values. */
ok(rect.right == rect2.right || broken(rect.right > rect2.right), "unexpected value %d, got %d\n",rect.right, rect2.right);
ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top);
ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom);
SelectObject(hdc, hOldFont); SelectObject(hdc, hOldFont);
ret = DeleteObject(hFont); ret = DeleteObject(hFont);
ok( ret, "DeleteObject error %u\n", GetLastError()); ok( ret, "DeleteObject error %u\n", GetLastError());

2
dlls/user32/text.c
View File

@ -948,7 +948,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (flags & DT_EXPANDTABS) if (flags & DT_EXPANDTABS)
{ {
int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; int tabstop = ((flags & DT_TABSTOP) && dtp && dtp->iTabLength) ? dtp->iTabLength : 8;
tabwidth = tm.tmAveCharWidth * tabstop; tabwidth = tm.tmAveCharWidth * tabstop;
} }