[PATCH v4 2/4] comctl32/listbox: Move the item data removal into a separate function
Gabriel Ivăncescu
gabrielopcode at gmail.com
Mon Feb 18 07:47:52 CST 2019
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/comctl32/listbox.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 330d3ae..214bfb0 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -126,6 +126,7 @@ typedef enum
static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE;
static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect );
+static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index );
static BOOL resize_storage(LB_DESCR *descr, UINT items_size)
{
@@ -208,6 +209,14 @@ static void insert_item_data(LB_DESCR *descr, INT index, WCHAR *str, ULONG_PTR d
}
}
+static void remove_item_data(LB_DESCR *descr, INT index)
+{
+ LISTBOX_DeleteItem(descr, index);
+ if (index < descr->nb_items)
+ RtlMoveMemory(&descr->items[index], &descr->items[index + 1],
+ (descr->nb_items - index) * sizeof(LB_ITEMDATA));
+}
+
/***********************************************************************
* LISTBOX_GetCurrentPageSize
*
@@ -1689,8 +1698,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. */
@@ -1702,16 +1709,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index )
return LB_OKAY;
}
descr->nb_items--;
- LISTBOX_DeleteItem( 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--;
+ remove_item_data(descr, index);
+ descr->anchor_item = min(descr->anchor_item, descr->nb_items - 1);
resize_storage(descr, descr->nb_items);
/* Repaint the items */
--
2.20.1
More information about the wine-devel
mailing list