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

comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists. 

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Akihiro Sagawa 2016-01-20 22:34:42 +09:00 committed by Alexandre Julliard
parent 3f2055b1cf
commit af4a757ad2
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/listview.c
View File

@ -8808,6 +8808,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl
if (infoPtr->dwStyle & LVS_OWNERDATA) if (infoPtr->dwStyle & LVS_OWNERDATA)
{ {
INT nOldCount = infoPtr->nItemCount; INT nOldCount = infoPtr->nItemCount;
infoPtr->nItemCount = nItems;
if (nItems < nOldCount) if (nItems < nOldCount)
{ {
@ -8820,7 +8821,6 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl
} }
} }
infoPtr->nItemCount = nItems;
LISTVIEW_UpdateScroll(infoPtr); LISTVIEW_UpdateScroll(infoPtr);
/* the flags are valid only in ownerdata report and list modes */ /* the flags are valid only in ownerdata report and list modes */

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

@ -3418,6 +3418,28 @@ static void test_ownerdata(void)
style = GetWindowLongPtrA(hwnd, GWL_STYLE); style = GetWindowLongPtrA(hwnd, GWL_STYLE);
ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n");
DestroyWindow(hwnd); DestroyWindow(hwnd);
/* The focused item is updated after the invalidation */
hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT);
ok(hwnd != NULL, "failed to create a listview window\n");
res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 3, 0);
expect(TRUE, res);
memset(&item, 0, sizeof(item));
item.stateMask = LVIS_FOCUSED;
item.state = LVIS_FOCUSED;
res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item);
expect(TRUE, res);
flush_sequences(sequences, NUM_MSG_SEQUENCES);
res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0);
expect(TRUE, res);
ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
"ownerdata setitemcount", FALSE);
res = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED);
expect(-1, res);
DestroyWindow(hwnd);
} }
static void test_norecompute(void) static void test_norecompute(void)