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

comctl32/listview: Block LVM_EDITLABEL when control is unfocused and no label created.

This commit is contained in:
Nikolay Sivov 2009-06-01 23:53:48 +04:00 committed by Alexandre Julliard
parent 28d0487c24
commit 43d982fde6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/listview.c
View File

@ -5010,6 +5010,8 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW)
if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0;
if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0;
/* Edit could be created only on focused control and if isn't already created */
if (GetFocus() != infoPtr->hwndSelf && !IsWindow(infoPtr->hwndEdit)) return 0;
infoPtr->nEditLabelItem = nItem;

13
dlls/comctl32/tests/listview.c
View File

@ -2836,7 +2836,7 @@ static void test_getitemrect(void)
static void test_editbox(void)
{
HWND hwnd, hwndedit;
HWND hwnd, hwndedit, hwndedit2;
LVITEMA item;
DWORD r;
static CHAR testitemA[] = "testitem";
@ -2878,10 +2878,19 @@ static void test_editbox(void)
ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n");
/* send LVM_EDITLABEL on already created edit */
SetFocus(hwnd);
hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0);
ok(IsWindow(hwndedit), "Expected Edit window to be created\n");
/* focus will be set to edit */
ok(GetFocus() == hwndedit, "Expected Edit window to be focused\n");
hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0);
ok(IsWindow(hwndedit2), "Expected Edit window to be created\n");
/* creating label disabled when control isn't focused */
SetFocus(0);
hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0);
todo_wine ok(hwndedit == NULL, "Expected Edit window not to be created\n");
ok(hwndedit == NULL, "Expected Edit window not to be created\n");
DestroyWindow(hwnd);
}