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

comctl32: Check for NULL input in TAB_AdjustRect.

This commit is contained in:
Lei Zhang 2008-11-10 20:39:29 -08:00 committed by Alexandre Julliard
parent 1c64c934db
commit 87ca1b9416
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/tab.c
View File

@ -863,6 +863,8 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr
TRACE ("hwnd=%p fLarger=%ld (%s)\n", infoPtr->hwnd, fLarger, TRACE ("hwnd=%p fLarger=%ld (%s)\n", infoPtr->hwnd, fLarger,
wine_dbgstr_rect(prc)); wine_dbgstr_rect(prc));
if (!prc) return -1;
if(lStyle & TCS_VERTICAL) if(lStyle & TCS_VERTICAL)
{ {
iRightBottom = &(prc->right); iRightBottom = &(prc->right);

18
dlls/comctl32/tests/tab.c
View File

@ -856,6 +856,22 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
DestroyWindow(hTab); DestroyWindow(hTab);
} }
static void test_adjustrect(HWND parent_wnd)
{
HWND hTab;
INT r;
ok(parent_wnd != NULL, "no parent window!\n");
hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, 0, 0);
ok(hTab != NULL, "Failed to create tab control\n");
r = SendMessage(hTab, TCM_ADJUSTRECT, FALSE, 0);
expect(-1, r);
r = SendMessage(hTab, TCM_ADJUSTRECT, TRUE, 0);
expect(-1, r);
}
static void test_insert_focus(HWND parent_wnd) static void test_insert_focus(HWND parent_wnd)
{ {
HWND hTab; HWND hTab;
@ -1001,6 +1017,8 @@ START_TEST(tab)
/* Testing getters and setters with 5 tabs */ /* Testing getters and setters with 5 tabs */
test_getters_setters(parent_wnd, 5); test_getters_setters(parent_wnd, 5);
test_adjustrect(parent_wnd);
test_insert_focus(parent_wnd); test_insert_focus(parent_wnd);
test_delete_focus(parent_wnd); test_delete_focus(parent_wnd);