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

user32/listbox: Use a helper to get the size of an item. 

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-28 15:10:30 +02:00 committed by Alexandre Julliard
parent 0092a4bb19
commit 80ff468748
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/user32/listbox.c
View File

@ -122,6 +122,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE;
static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect );
static size_t get_sizeof_item( const LB_DESCR *descr )
{
return sizeof(LB_ITEMDATA);
}
static BOOL resize_storage(LB_DESCR *descr, UINT items_size)
{
LB_ITEMDATA *items;
@ -132,7 +137,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size)
items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1);
if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA)
{
items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA));
items = heap_realloc(descr->items, items_size * get_sizeof_item(descr));
if (!items)
{
SEND_NOTIFICATION(descr, LBN_ERRSPACE);
@ -146,7 +151,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size)
if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items)
{
memset(&descr->items[descr->nb_items], 0,
(items_size - descr->nb_items) * sizeof(LB_ITEMDATA));
(items_size - descr->nb_items) * get_sizeof_item(descr));
}
return TRUE;
}
@ -196,24 +201,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state)
static void insert_item_data(LB_DESCR *descr, UINT index)
{
size_t size = get_sizeof_item(descr);
LB_ITEMDATA *item;
if (!descr->items) return;
item = descr->items + index;
if (index < descr->nb_items)
memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA));
memmove(item + 1, item, (descr->nb_items - index) * size);
}
static void remove_item_data(LB_DESCR *descr, UINT index)
{
size_t size = get_sizeof_item(descr);
LB_ITEMDATA *item;
if (!descr->items) return;
item = descr->items + index;
if (index < descr->nb_items)
memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA));
memmove(item, item + 1, (descr->nb_items - index) * size);
}
/*********************************************************************