[PATCH v2 2/3] comctl32/listbox: Use a helper to get the size of an item
Huw Davies
huw at codeweavers.com
Thu Feb 28 04:19:15 CST 2019
From: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
dlls/comctl32/listbox.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index db5dd70445..9e17235acc 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -127,6 +127,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;
@@ -137,7 +142,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);
@@ -151,7 +156,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;
}
@@ -201,24 +206,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state)
static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data)
{
+ 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);
}
/***********************************************************************
--
2.18.0
More information about the wine-devel
mailing list