Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru --- dlls/comctl32/listview.c | 8 +++++++- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5c3b1a1636c..a961c8d4032 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4257,7 +4257,13 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; } - nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; + /* According to the tests uChanged in the notification for a new item + * has only LVIF_STATE flag set. + */ + if (isNew) + nmlv.uChanged = LVIF_STATE; + else + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam;
/* Send LVN_ITEMCHANGING notification if the item is not being diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 92e11685331..3810cd8f4bc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, FALSE); } else { @@ -6100,7 +6100,7 @@ static void test_insertitem(void) item.lParam = 0xdeadbeef; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 3, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE);
/* insert item 4 */ item.mask = LVIF_PARAM;