[PATCH v6 3/6] comctl32/listbox: Move the item data insertion into a separate function

Huw Davies huw at codeweavers.com
Wed Feb 20 06:04:58 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 | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index ba8b7eeade..44e3b1c7d1 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -186,6 +186,20 @@ 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)
+{
+    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_GetCurrentPageSize
  *
@@ -1563,23 +1577,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible )
 static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index,
                                    LPWSTR str, ULONG_PTR data )
 {
-    LB_ITEMDATA *item;
     INT oldfocus = descr->focus_item;
 
     if (index == -1) index = descr->nb_items;
     else if ((index < 0) || (index > descr->nb_items)) return LB_ERR;
     if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR;
 
-    /* Insert the item structure */
-
-    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;
+    insert_item_data(descr, index, str, data);
     descr->nb_items++;
 
     /* Get item height */
-- 
2.18.0




More information about the wine-devel mailing list