commit de12a970416aafa1fe4a2966f74b4958e6dbab4c
author Oleg Prokhorov <xolegpro@rbcmail.ru> Tue Oct 14 05:24:20 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 14 05:24:20 2003 +0000
tree 7b90e8871c16206d60c91cbba8a94468d8a15353
parent 46f29944c3232601102a509a162d76eb57d2053f

Another portion of HeapReAlloc fixes.

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index b6ddb38..bd14a89 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -714,10 +714,17 @@
 
     nb_items += LB_ARRAY_GRANULARITY - 1;
     nb_items -= (nb_items % LB_ARRAY_GRANULARITY);
-    if (descr->items)
+    if (descr->items) {
         nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item);
-    if (!(item = HeapReAlloc( GetProcessHeap(), 0, descr->items,
-                              nb_items * sizeof(LB_ITEMDATA) )))
+	item = HeapReAlloc( GetProcessHeap(), 0, descr->items,
+                              nb_items * sizeof(LB_ITEMDATA));
+    }
+    else {
+	item = HeapAlloc( GetProcessHeap(), 0,
+                              nb_items * sizeof(LB_ITEMDATA));
+    }
+
+    if (!item)
     {
         SEND_NOTIFICATION( hwnd, descr, LBN_ERRSPACE );
         return LB_ERRSPACE;
@@ -1477,8 +1484,13 @@
     {
         /* We need to grow the array */
         max_items += LB_ARRAY_GRANULARITY;
-        if (!(item = HeapReAlloc( GetProcessHeap(), 0, descr->items,
-                                  max_items * sizeof(LB_ITEMDATA) )))
+	if (descr->items)
+    	    item = HeapReAlloc( GetProcessHeap(), 0, descr->items,
+                                  max_items * sizeof(LB_ITEMDATA) );
+	else
+	    item = HeapAlloc( GetProcessHeap(), 0, 
+                                  max_items * sizeof(LB_ITEMDATA) );
+        if (!item)
         {
             SEND_NOTIFICATION( hwnd, descr, LBN_ERRSPACE );
             return LB_ERRSPACE;