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

comctl32/listview: State mask should be ignored on LVM_INSERTITEM.

This commit is contained in:
Nikolay Sivov 2009-04-09 17:23:01 -04:00 committed by Alexandre Julliard
parent 3a5bbe6a0c
commit 13dfb9b3a6
2 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/comctl32/listview.c
View File

@ -3478,6 +3478,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
NMLISTVIEW nmlv; NMLISTVIEW nmlv;
UINT uChanged = 0; UINT uChanged = 0;
LVITEMW item; LVITEMW item;
/* stateMask is ignored for LVM_INSERTITEM */
UINT stateMask = isNew ? ~0 : lpLVItem->stateMask;
TRACE("()\n"); TRACE("()\n");
@ -3510,7 +3512,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
TRACE("oldState=%x, newState=%x\n", item.state, lpLVItem->state); TRACE("oldState=%x, newState=%x\n", item.state, lpLVItem->state);
/* determine what fields will change */ /* determine what fields will change */
if ((lpLVItem->mask & LVIF_STATE) && ((item.state ^ lpLVItem->state) & lpLVItem->stateMask & ~infoPtr->uCallbackMask)) if ((lpLVItem->mask & LVIF_STATE) && ((item.state ^ lpLVItem->state) & stateMask & ~infoPtr->uCallbackMask))
uChanged |= LVIF_STATE; uChanged |= LVIF_STATE;
if ((lpLVItem->mask & LVIF_IMAGE) && (lpItem->hdr.iImage != lpLVItem->iImage)) if ((lpLVItem->mask & LVIF_IMAGE) && (lpItem->hdr.iImage != lpLVItem->iImage))
@ -3531,7 +3533,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
nmlv.iItem = lpLVItem->iItem; nmlv.iItem = lpLVItem->iItem;
nmlv.uNewState = (item.state & ~lpLVItem->stateMask) | (lpLVItem->state & lpLVItem->stateMask); nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask);
nmlv.uOldState = item.state; nmlv.uOldState = item.state;
nmlv.uChanged = uChanged; nmlv.uChanged = uChanged;
nmlv.lParam = item.lParam; nmlv.lParam = item.lParam;
@ -3564,21 +3566,21 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
if (uChanged & LVIF_STATE) if (uChanged & LVIF_STATE)
{ {
if (lpItem && (lpLVItem->stateMask & ~infoPtr->uCallbackMask & ~(LVIS_FOCUSED | LVIS_SELECTED))) if (lpItem && (stateMask & ~infoPtr->uCallbackMask & ~(LVIS_FOCUSED | LVIS_SELECTED)))
{ {
lpItem->state &= ~lpLVItem->stateMask; lpItem->state &= ~stateMask;
lpItem->state |= (lpLVItem->state & lpLVItem->stateMask); lpItem->state |= (lpLVItem->state & stateMask);
} }
if (lpLVItem->state & lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED) if (lpLVItem->state & stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED)
{ {
if (infoPtr->dwStyle & LVS_SINGLESEL) LISTVIEW_DeselectAllSkipItem(infoPtr, lpLVItem->iItem); if (infoPtr->dwStyle & LVS_SINGLESEL) LISTVIEW_DeselectAllSkipItem(infoPtr, lpLVItem->iItem);
ranges_additem(infoPtr->selectionRanges, lpLVItem->iItem); ranges_additem(infoPtr->selectionRanges, lpLVItem->iItem);
} }
else if (lpLVItem->stateMask & LVIS_SELECTED) else if (stateMask & LVIS_SELECTED)
ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem);
/* if we are asked to change focus, and we manage it, do it */ /* if we are asked to change focus, and we manage it, do it */
if (lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED)
{ {
if (lpLVItem->state & LVIS_FOCUSED) if (lpLVItem->state & LVIS_FOCUSED)
{ {

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

@ -634,6 +634,72 @@ static void test_items(void)
insert_column(hwnd, 0); insert_column(hwnd, 0);
insert_column(hwnd, 1); insert_column(hwnd, 1);
/* LVIS_SELECTED with zero stateMask */
/* set */
memset (&item, 0, sizeof (item));
item.mask = LVIF_STATE;
item.state = LVIS_SELECTED;
item.stateMask = 0;
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
ok(r == 0, "ret %d\n", r);
/* get */
memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_STATE;
item.stateMask = LVIS_SELECTED;
item.state = 0;
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item);
ok(r != 0, "ret %d\n", r);
ok(item.state & LVIS_SELECTED, "Expected LVIS_SELECTED\n");
SendMessage(hwnd, LVM_DELETEITEM, 0, 0);
/* LVIS_SELECTED with zero stateMask */
/* set */
memset (&item, 0, sizeof (item));
item.mask = LVIF_STATE;
item.state = LVIS_FOCUSED;
item.stateMask = 0;
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
ok(r == 0, "ret %d\n", r);
/* get */
memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_STATE;
item.stateMask = LVIS_FOCUSED;
item.state = 0;
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item);
ok(r != 0, "ret %d\n", r);
ok(item.state & LVIS_FOCUSED, "Expected LVIS_FOCUSED\n");
SendMessage(hwnd, LVM_DELETEITEM, 0, 0);
/* LVIS_CUT with LVIS_FOCUSED stateMask */
/* set */
memset (&item, 0, sizeof (item));
item.mask = LVIF_STATE;
item.state = LVIS_CUT;
item.stateMask = LVIS_FOCUSED;
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
ok(r == 0, "ret %d\n", r);
/* get */
memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_STATE;
item.stateMask = LVIS_CUT;
item.state = 0;
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item);
ok(r != 0, "ret %d\n", r);
ok(item.state & LVIS_CUT, "Expected LVIS_CUT\n");
SendMessage(hwnd, LVM_DELETEITEM, 0, 0);
/* Insert an item with just a param */ /* Insert an item with just a param */
memset (&item, 0xcc, sizeof (item)); memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_PARAM; item.mask = LVIF_PARAM;