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

user32/listbox: Move the item data insertion into a separate function. 

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-20 15:13:11 +02:00 committed by Alexandre Julliard
parent 9b6d9cb8ae
commit ff1ebccdd0
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/user32/listbox.c
View File

@ -181,6 +181,20 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state)
descr->items[index].selected = state; descr->items[index].selected = state;
} }
static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data)
{
LB_ITEMDATA *item;
item = descr->items + index;
if (index < descr->nb_items)
memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA));
item->str = str;
item->data = HAS_STRINGS(descr) ? 0 : data;
item->height = 0;
item->selected = FALSE;
}
/********************************************************************* /*********************************************************************
* listbox class descriptor * listbox class descriptor
*/ */
@ -1573,23 +1587,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible )
static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index,
LPWSTR str, ULONG_PTR data ) LPWSTR str, ULONG_PTR data )
{ {
LB_ITEMDATA *item;
INT oldfocus = descr->focus_item; INT oldfocus = descr->focus_item;
if (index == -1) index = descr->nb_items; if (index == -1) index = descr->nb_items;
else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR;
if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR;
/* Insert the item structure */ insert_item_data(descr, index, str, data);
item = &descr->items[index];
if (index < descr->nb_items)
RtlMoveMemory( item + 1, item,
(descr->nb_items - index) * sizeof(LB_ITEMDATA) );
item->str = str;
item->data = HAS_STRINGS(descr) ? 0 : data;
item->height = 0;
item->selected = FALSE;
descr->nb_items++; descr->nb_items++;
/* Get item height */ /* Get item height */