From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tab.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 8943d9dce7c..2c51bced5cb 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -55,6 +55,7 @@ #include <assert.h> #include <stdarg.h> #include <string.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -2596,10 +2597,10 @@ TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode TAB_DumpItemExternalT(pti, iItem, bUnicode); - if (!(item = Alloc(TAB_ITEM_SIZE(infoPtr)))) return FALSE; + if (!(item = calloc(1, TAB_ITEM_SIZE(infoPtr)))) return FALSE; if (DPA_InsertPtr(infoPtr->items, iItem, item) == -1) { - Free(item); + free(item); return FALSE; } @@ -2750,7 +2751,7 @@ TAB_SetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) if (tabItem->mask & TCIF_TEXT) { - Free(wineItem->pszText); + free(wineItem->pszText); wineItem->pszText = NULL; if (bUnicode) Str_SetPtrW(&wineItem->pszText, tabItem->pszText); @@ -2828,8 +2829,8 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) TAB_InvalidateTabArea(infoPtr); item = TAB_GetItem(infoPtr, iItem); - Free(item->pszText); - Free(item); + free(item->pszText); + free(item); infoPtr->uNumItem--; DPA_DeletePtr(infoPtr->items, iItem); @@ -2969,7 +2970,7 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) HFONT hOldFont; DWORD style; - infoPtr = Alloc (sizeof(TAB_INFO)); + infoPtr = calloc (1, sizeof(*infoPtr)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); @@ -3079,8 +3080,8 @@ TAB_Destroy (TAB_INFO *infoPtr) DPA_DeletePtr(infoPtr->items, iItem); infoPtr->uNumItem--; - Free(tab->pszText); - Free(tab); + free(tab->pszText); + free(tab); } DPA_Destroy(infoPtr->items); infoPtr->items = NULL; @@ -3096,7 +3097,7 @@ TAB_Destroy (TAB_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); - Free (infoPtr); + free (infoPtr); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1625