[PATCH 3/4] user32/listbox: Use is_item_selected in GetSelCount and GetSelItems
Gabriel Ivăncescu
gabrielopcode at gmail.com
Fri Feb 22 06:00:58 CST 2019
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/user32/listbox.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 0be4867..0e9f97c 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -1066,13 +1066,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++)
- if (item->selected) count++;
+ for (i = count = 0; i < descr->nb_items; i++)
+ count += is_item_selected(descr, i);
return count;
}
@@ -1083,11 +1082,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++)
- if (item->selected) array[count++] = i;
+ for (i = count = 0; (i < descr->nb_items) && (count < max); i++)
+ if (is_item_selected(descr, i)) array[count++] = i;
return count;
}
--
2.20.1
More information about the wine-devel
mailing list