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

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>
This commit is contained in:
Gabriel Ivăncescu 2019-02-25 10:31:00 +00:00 committed by Alexandre Julliard
parent 0a1362498d
commit 170f59e574
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/comctl32/listbox.c
View File

@ -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 ) static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr )
{ {
INT i, count; INT i, count;
const LB_ITEMDATA *item = descr->items;
if (!(descr->style & LBS_MULTIPLESEL) || if (!(descr->style & LBS_MULTIPLESEL) ||
(descr->style & LBS_NOSEL)) (descr->style & LBS_NOSEL))
return LB_ERR; 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; 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 ) static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array )
{ {
INT i, count; INT i, count;
const LB_ITEMDATA *item = descr->items;
if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; 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; return count;
} }