Nikolay Sivov : comctl32/treeview: Use HeapAlloc() wrappers.
Alexandre Julliard
julliard at winehq.org
Fri Feb 2 12:24:38 CST 2018
Module: wine
Branch: master
Commit: d886eda2e8d6f202622e8da0004669ca3eaa0714
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d886eda2e8d6f202622e8da0004669ca3eaa0714
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Feb 2 08:39:39 2018 +0300
comctl32/treeview: Use HeapAlloc() wrappers.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/treeview.c | 51 ++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 7713efb..56c53fc 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -64,6 +64,7 @@
#include "wine/unicode.h"
#include "wine/debug.h"
#include "wine/exception.h"
+#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(treeview);
@@ -552,7 +553,7 @@ TREEVIEW_TVItemFromItem(const TREEVIEW_INFO *infoPtr, UINT mask, TVITEMW *tvItem
if (!infoPtr->bNtfUnicode)
{
tvItem->cchTextMax = WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, NULL, 0, NULL, NULL );
- tvItem->pszText = Alloc (tvItem->cchTextMax);
+ tvItem->pszText = heap_alloc (tvItem->cchTextMax);
WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, (LPSTR)tvItem->pszText, tvItem->cchTextMax, 0, 0 );
}
else
@@ -593,8 +594,8 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action
ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr);
if (!infoPtr->bNtfUnicode)
{
- Free(nmhdr.itemOld.pszText);
- Free(nmhdr.itemNew.pszText);
+ heap_free(nmhdr.itemOld.pszText);
+ heap_free(nmhdr.itemNew.pszText);
}
return ret;
}
@@ -693,7 +694,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI
ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr);
if (!infoPtr->bNtfUnicode)
- Free(tvdi.item.pszText);
+ heap_free(tvdi.item.pszText);
return ret;
}
@@ -739,7 +740,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
(LPSTR)callback.item.pszText, -1,
NULL, 0);
buflen = max((len)*sizeof(WCHAR), TEXT_CALLBACK_SIZE);
- newText = ReAlloc(item->pszText, buflen);
+ newText = heap_realloc(item->pszText, buflen);
TRACE("returned str %s, len=%d, buflen=%d\n",
debugstr_a((LPSTR)callback.item.pszText), len, buflen);
@@ -752,12 +753,12 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
item->pszText, buflen/sizeof(WCHAR));
item->cchTextMax = buflen/sizeof(WCHAR);
}
- /* If ReAlloc fails we have nothing to do, but keep original text */
+ /* If realloc fails we have nothing to do, but keep original text */
}
else {
int len = max(lstrlenW(callback.item.pszText) + 1,
TEXT_CALLBACK_SIZE);
- LPWSTR newText = ReAlloc(item->pszText, len);
+ LPWSTR newText = heap_realloc(item->pszText, len);
TRACE("returned wstr %s, len=%d\n",
debugstr_w(callback.item.pszText), len);
@@ -768,7 +769,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
strcpyW(item->pszText, callback.item.pszText);
item->cchTextMax = len;
}
- /* If ReAlloc fails we have nothing to do, but keep original text */
+ /* If realloc fails we have nothing to do, but keep original text */
}
}
else if (mask & TVIF_TEXT) {
@@ -780,7 +781,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
(LPSTR)callback.item.pszText, -1,
NULL, 0);
buflen = max((len)*sizeof(WCHAR), TEXT_CALLBACK_SIZE);
- newText = Alloc(buflen);
+ newText = heap_alloc(buflen);
TRACE("same buffer str %s, len=%d, buflen=%d\n",
debugstr_a((LPSTR)callback.item.pszText), len, buflen);
@@ -793,7 +794,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
(LPSTR)callback.item.pszText, -1,
item->pszText, buflen/sizeof(WCHAR));
item->cchTextMax = buflen/sizeof(WCHAR);
- Free(oldText);
+ heap_free(oldText);
}
}
}
@@ -1001,7 +1002,7 @@ TREEVIEW_UpdateSubTree(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *root)
static TREEVIEW_ITEM *
TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr)
{
- TREEVIEW_ITEM *newItem = Alloc(sizeof(TREEVIEW_ITEM));
+ TREEVIEW_ITEM *newItem = heap_alloc_zero(sizeof(*newItem));
if (!newItem)
return NULL;
@@ -1017,8 +1018,8 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr)
if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1)
{
- Free(newItem);
- return NULL;
+ heap_free(newItem);
+ return NULL;
}
return newItem;
@@ -1042,7 +1043,7 @@ TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
infoPtr->dropItem = NULL;
if (infoPtr->insertMarkItem == item)
infoPtr->insertMarkItem = NULL;
- Free(item);
+ heap_free(item);
}
@@ -1133,7 +1134,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
else
len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)tvItem->pszText, -1, NULL, 0);
- newText = ReAlloc(item->pszText, len * sizeof(WCHAR));
+ newText = heap_realloc(item->pszText, len * sizeof(WCHAR));
if (newText == NULL) return FALSE;
@@ -1151,10 +1152,8 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
}
else
{
- callbackSet |= TVIF_TEXT;
-
- item->pszText = ReAlloc(item->pszText,
- TEXT_CALLBACK_SIZE * sizeof(WCHAR));
+ callbackSet |= TVIF_TEXT;
+ item->pszText = heap_realloc(item->pszText, TEXT_CALLBACK_SIZE * sizeof(WCHAR));
item->cchTextMax = TEXT_CALLBACK_SIZE;
TRACE("setting callback, item %p\n", item);
}
@@ -1499,7 +1498,7 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
infoPtr->uNumItems--;
if (item->pszText != LPSTR_TEXTCALLBACKW)
- Free(item->pszText);
+ heap_free(item->pszText);
TREEVIEW_FreeItem(infoPtr, item);
}
@@ -4031,18 +4030,18 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel)
if (!infoPtr->bNtfUnicode)
{
DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, NULL, 0 );
- newText = Alloc(len * sizeof(WCHAR));
+ newText = heap_alloc(len * sizeof(WCHAR));
MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, newText, len );
iLength = len - 1;
}
if (strcmpW(newText, editedItem->pszText) != 0)
{
- WCHAR *ptr = ReAlloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1));
+ WCHAR *ptr = heap_realloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1));
if (ptr == NULL)
{
ERR("OutOfMemory, cannot allocate space for label\n");
- if(newText != tmpText) Free(newText);
+ if (newText != tmpText) heap_free(newText);
DestroyWindow(infoPtr->hwndEdit);
infoPtr->hwndEdit = 0;
infoPtr->editItem = NULL;
@@ -4056,7 +4055,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel)
TREEVIEW_ComputeTextWidth(infoPtr, editedItem, 0);
}
}
- if(newText != tmpText) Free(newText);
+ if (newText != tmpText) heap_free(newText);
}
ShowWindow(infoPtr->hwndEdit, SW_HIDE);
@@ -5078,7 +5077,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE));
- infoPtr = Alloc(sizeof(TREEVIEW_INFO));
+ infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO));
if (infoPtr == NULL)
{
@@ -5203,7 +5202,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr)
DeleteObject(infoPtr->hUnderlineFont);
DeleteObject(infoPtr->hBoldUnderlineFont);
DestroyWindow(infoPtr->hwndToolTip);
- Free(infoPtr);
+ heap_free(infoPtr);
return 0;
}
More information about the wine-cvs
mailing list