[PATCH 3/5] user32/listbox: Use helper functions for item initialization

Gabriel Iv─âncescu gabrielopcode at gmail.com
Thu Feb 28 07:10:29 CST 2019


From: Huw Davies <huw at codeweavers.com>

Signed-off-by: Gabriel Iv─âncescu <gabrielopcode at gmail.com>
---
 dlls/user32/listbox.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 75257ad..127ba35 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -166,6 +166,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index )
     return HAS_STRINGS(descr) ? descr->items[index].str : NULL;
 }
 
+static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string )
+{
+    if (!(descr->style & LBS_NODATA)) descr->items[index].str = string;
+}
+
 static UINT get_item_height( const LB_DESCR *descr, UINT index )
 {
     return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height;
@@ -189,7 +194,7 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state)
         descr->items[index].selected = state;
 }
 
-static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data)
+static void insert_item_data(LB_DESCR *descr, UINT index)
 {
     LB_ITEMDATA *item;
 
@@ -198,11 +203,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR
     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;
 }
 
 static void remove_item_data(LB_DESCR *descr, UINT index)
@@ -1609,8 +1609,12 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index,
     else if ((index < 0) || (index > descr->nb_items)) return LB_ERR;
     if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR;
 
-    insert_item_data(descr, index, str, data);
+    insert_item_data(descr, index);
     descr->nb_items++;
+    set_item_string(descr, index, str);
+    set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data);
+    set_item_height(descr, index, 0);
+    set_item_selected_state(descr, index, FALSE);
 
     /* Get item height */
 
-- 
2.20.1




More information about the wine-devel mailing list