comctl32/listbox: Use is_item_selected in GetSelCount and GetSelItems.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/listbox: Use is_item_selected in GetSelCount and GetSelItems.
170f59e5 · Gabriel Ivăncescu · Alexandre Julliard · 0a136249 · 170f59e5
Commit 170f59e5 authored Feb 25, 2019 by Gabriel Ivăncescu Committed by Alexandre Julliard Feb 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

listbox.c dlls/comctl32/listbox.c +4 -6

No files found.
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -1024,13 +1024,12 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa
 static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr )
 {
    INT i, count;
-    const LB_ITEMDATA *item = descr->items;
    if (!(descr->style & LBS_MULTIPLESEL) ||
        (descr->style & LBS_NOSEL))
      return LB_ERR;
-    for (i = count = 0; i < descr->nb_items; i++, item++)
+    for (i = count = 0; i < descr->nb_items; i++)
-        if (item->selected) count++;
+        if (is_item_selected(descr, i)) count++;
    return count;
 }
@@ -1041,11 +1040,10 @@ static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr )
 static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array )
 {
    INT i, count;
-    const LB_ITEMDATA *item = descr->items;
    if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR;
-    for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++)
+    for (i = count = 0; (i < descr->nb_items) && (count < max); i++)
-        if (item->selected) array[count++] = i;
+        if (is_item_selected(descr, i)) array[count++] = i;
    return count;
 }