[PATCH v6 3/7] comctl32/listbox: Shrink the item array with resize_storage
Gabriel Ivăncescu
gabrielopcode at gmail.com
Mon Dec 3 07:23:09 CST 2018
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/comctl32/listbox.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 498c549..1d881f1 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -131,7 +131,8 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size)
{
LB_ITEMDATA *items;
- if (items_size > descr->items_size)
+ if (items_size > descr->items_size ||
+ items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size)
{
items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1);
items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA));
@@ -1666,7 +1667,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index )
static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index )
{
LB_ITEMDATA *item;
- INT max_items;
if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
@@ -1686,20 +1686,8 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index )
(descr->nb_items - index) * sizeof(LB_ITEMDATA) );
if (descr->anchor_item == descr->nb_items) descr->anchor_item--;
- /* Shrink the item array if possible */
+ resize_storage(descr, descr->nb_items);
- max_items = descr->items_size;
- if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY)
- {
- max_items -= LB_ARRAY_GRANULARITY;
- item = HeapReAlloc( GetProcessHeap(), 0, descr->items,
- max_items * sizeof(LB_ITEMDATA) );
- if (item)
- {
- descr->items_size = max_items;
- descr->items = item;
- }
- }
/* Repaint the items */
LISTBOX_UpdateScroll( descr );
--
2.19.1
More information about the wine-devel
mailing list