commit ef9adbb6f531f04a5c2d13032b9917ae53b12928
author Dimitrie O. Paun <dpaun@rogers.com> Wed Oct 16 19:05:02 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Oct 16 19:05:02 2002 +0000
tree 4a4742ebb9abc3cec7967c9cfaf68b181788d854
parent 8d2f7224f10cc87e4a055369e0163c9eff6e817b

Compute only the old state that we're gonna look at.

dlls/comctl32/listview.c

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index b94987e..91523da 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -2782,9 +2782,9 @@
     /* a virtual listview stores only the state for the main item */
     if (lpLVItem->iSubItem || !(lpLVItem->mask & LVIF_STATE)) return FALSE;
 
-    oldState = LISTVIEW_GetItemState(infoPtr, lpLVItem->iItem, LVIS_FOCUSED | LVIS_SELECTED);
-    TRACE("oldState=%x, newState=%x, uCallbackMask=%x\n", 
-	  oldState, lpLVItem->state, infoPtr->uCallbackMask);
+    oldState = (LVIS_FOCUSED | LVIS_SELECTED) & ~infoPtr->uCallbackMask;
+    if (oldState) oldState = LISTVIEW_GetItemState(infoPtr, lpLVItem->iItem, oldState);
+    TRACE("oldState=%x, newState=%x\n", oldState, lpLVItem->state);
 
     /* we're done if we don't need to change anything we handle */
     if ( !((oldState ^ lpLVItem->state) & lpLVItem->stateMask &
@@ -2860,9 +2860,10 @@
     if (!lpItem) return FALSE;
 
     /* we need to handle the focus, and selection differently */
-    oldState = LISTVIEW_GetItemState(infoPtr, lpLVItem->iItem, LVIS_FOCUSED | LVIS_SELECTED);
+    oldState = (LVIS_FOCUSED | LVIS_SELECTED) & ~infoPtr->uCallbackMask;
+    if (oldState) oldState = LISTVIEW_GetItemState(infoPtr, lpLVItem->iItem, oldState);
 
-    TRACE("lpItem->state=0x%x\n", lpItem->state);
+    TRACE("oldState=0x%x, state=0x%x\n", oldState, lpItem->state);
     /* determine what fields will change */    
     if ((lpLVItem->mask & LVIF_STATE) && ((oldState ^ lpLVItem->state) & lpLVItem->stateMask & ~infoPtr->uCallbackMask))
 	uChanged |= LVIF_STATE;