[PATCH v5 4/6] comctl32/listbox: Move the item data removal into a separate function
Gabriel Ivăncescu
gabrielopcode at gmail.com
Tue Feb 19 07:33:58 CST 2019
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/comctl32/listbox.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 6b7cc54..31e5f71 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -200,6 +200,13 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR
item->selected = FALSE;
}
+static void remove_item_data(LB_DESCR *descr, UINT index)
+{
+ if (index < descr->nb_items)
+ RtlMoveMemory(&descr->items[index], &descr->items[index + 1],
+ (descr->nb_items - index) * sizeof(LB_ITEMDATA));
+}
+
/***********************************************************************
* LISTBOX_GetCurrentPageSize
*
@@ -1699,8 +1706,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index )
*/
static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index )
{
- LB_ITEMDATA *item;
-
if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
/* We need to invalidate the original rect instead of the updated one. */
@@ -1713,15 +1718,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index )
}
descr->nb_items--;
LISTBOX_DeleteItem( descr, index );
+ remove_item_data(descr, index);
- /* Remove the item */
-
- item = &descr->items[index];
- if (index < descr->nb_items)
- RtlMoveMemory( item, item + 1,
- (descr->nb_items - index) * sizeof(LB_ITEMDATA) );
if (descr->anchor_item == descr->nb_items) descr->anchor_item--;
-
resize_storage(descr, descr->nb_items);
/* Repaint the items */
--
2.20.1
More information about the wine-devel
mailing list