[PATCH 0/7] MR1490: comctl32: Use CRT allocation functions.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/animate.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index adac333b663..87687fce7b1 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -36,7 +36,6 @@ #include "mmsystem.h" #include "comctl32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(animate); @@ -188,20 +187,20 @@ static void ANIMATE_Free(ANIMATE_INFO *infoPtr) FreeResource(infoPtr->hRes); infoPtr->hRes = 0; } - heap_free (infoPtr->lpIndex); + free (infoPtr->lpIndex); infoPtr->lpIndex = NULL; if (infoPtr->hic) { fnIC.fnICClose(infoPtr->hic); infoPtr->hic = 0; } - heap_free (infoPtr->inbih); + free (infoPtr->inbih); infoPtr->inbih = NULL; - heap_free (infoPtr->outbih); + free (infoPtr->outbih); infoPtr->outbih = NULL; - heap_free (infoPtr->indata); + free (infoPtr->indata); infoPtr->indata = NULL; - heap_free (infoPtr->outdata); + free (infoPtr->outdata); infoPtr->outdata = NULL; if (infoPtr->hbmPrevFrame) { @@ -565,7 +564,7 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) return FALSE; } - infoPtr->inbih = heap_alloc_zero(mmckInfo.cksize); + infoPtr->inbih = calloc(1, mmckInfo.cksize); if (!infoPtr->inbih) { WARN("Can't alloc input BIH\n"); return FALSE; @@ -612,7 +611,7 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) /* FIXME: should handle the 'rec ' LIST when present */ - infoPtr->lpIndex = heap_alloc_zero(infoPtr->mah.dwTotalFrames * sizeof(DWORD)); + infoPtr->lpIndex = calloc(infoPtr->mah.dwTotalFrames, sizeof(DWORD)); if (!infoPtr->lpIndex) return FALSE; @@ -636,7 +635,7 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) infoPtr->ash.dwSuggestedBufferSize = insize; } - infoPtr->indata = heap_alloc_zero(infoPtr->ash.dwSuggestedBufferSize); + infoPtr->indata = calloc(1, infoPtr->ash.dwSuggestedBufferSize); if (!infoPtr->indata) return FALSE; @@ -667,9 +666,8 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr) outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)infoPtr->inbih, 0L); - infoPtr->outbih = heap_alloc_zero(outSize); - if (!infoPtr->outbih) - return FALSE; + if (!(infoPtr->outbih = calloc(1, outSize))) + return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) @@ -678,9 +676,8 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr) return FALSE; } - infoPtr->outdata = heap_alloc_zero(infoPtr->outbih->biSizeImage); - if (!infoPtr->outdata) - return FALSE; + if (!(infoPtr->outdata = calloc(1, infoPtr->outbih->biSizeImage))) + return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) { @@ -772,12 +769,12 @@ static BOOL ANIMATE_OpenA(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPSTR lpsz return ANIMATE_OpenW(infoPtr, hInstance, (LPWSTR)lpszName); len = MultiByteToWideChar(CP_ACP, 0, lpszName, -1, NULL, 0); - lpwszName = heap_alloc(len * sizeof(WCHAR)); + lpwszName = malloc(len * sizeof(WCHAR)); if (!lpwszName) return FALSE; MultiByteToWideChar(CP_ACP, 0, lpszName, -1, lpwszName, len); result = ANIMATE_OpenW(infoPtr, hInstance, lpwszName); - heap_free (lpwszName); + free (lpwszName); return result; } @@ -809,7 +806,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) } /* allocate memory for info structure */ - infoPtr = heap_alloc_zero(sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); if (!infoPtr) return FALSE; /* store crossref hWnd <-> info structure */ @@ -839,7 +836,7 @@ static LRESULT ANIMATE_Destroy(ANIMATE_INFO *infoPtr) infoPtr->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&infoPtr->cs); - heap_free(infoPtr); + free(infoPtr); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/pager.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 7d807c8b2c4..42516a34607 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -53,6 +53,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -62,7 +63,6 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(pager); @@ -576,7 +576,7 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) INT ret; /* allocate memory for info structure */ - infoPtr = heap_alloc_zero (sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -611,8 +611,8 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - heap_free (infoPtr->pwszBuffer); - heap_free (infoPtr); + free (infoPtr->pwszBuffer); + free (infoPtr); return 0; } @@ -1099,9 +1099,9 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) { if (!infoPtr->pwszBuffer) - infoPtr->pwszBuffer = heap_alloc(size); + infoPtr->pwszBuffer = malloc(size); else if (infoPtr->nBufferSize < size) - infoPtr->pwszBuffer = heap_realloc(infoPtr->pwszBuffer, size); + infoPtr->pwszBuffer = realloc(infoPtr->pwszBuffer, size); if (!infoPtr->pwszBuffer) return FALSE; if (infoPtr->nBufferSize < size) infoPtr->nBufferSize = size; @@ -1153,7 +1153,7 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT * if ((*text && flags & (CONVERT_SEND | ZERO_SEND)) || (!*text && flags & SEND_EMPTY_IF_NULL)) { bufferSize = textMax ? *textMax : lstrlenW(*text) + 1; - sendBuffer = heap_alloc_zero(bufferSize); + sendBuffer = calloc(1, bufferSize); if (!sendBuffer) goto done; if (!(flags & ZERO_SEND)) WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); *text = (WCHAR *)sendBuffer; @@ -1167,18 +1167,18 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT * if (*text == oldText) { bufferSize = lstrlenA((CHAR *)*text) + 1; - receiveBuffer = heap_alloc(bufferSize); + receiveBuffer = malloc(bufferSize); if (!receiveBuffer) goto done; memcpy(receiveBuffer, *text, bufferSize); MultiByteToWideChar(CP_ACP, 0, receiveBuffer, bufferSize, oldText, oldTextMax); - heap_free(receiveBuffer); + free(receiveBuffer); } else MultiByteToWideChar(CP_ACP, 0, (CHAR *)*text, -1, oldText, oldTextMax); } done: - heap_free(sendBuffer); + free(sendBuffer); *text = oldText; return ret; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/updown.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 1d00db275f2..f2befd9d448 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -33,7 +33,6 @@ #include "comctl32.h" #include "uxtheme.h" #include "vssym32.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(updown); @@ -902,7 +901,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L { CREATESTRUCTW *pcs = (CREATESTRUCTW*)lParam; - infoPtr = heap_alloc_zero(sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ @@ -935,9 +934,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_DESTROY: - heap_free (infoPtr->AccelVect); + free (infoPtr->AccelVect); UPDOWN_ResetSubclass (infoPtr); - heap_free (infoPtr); + free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme); @@ -1060,12 +1059,12 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L TRACE("UDM_SETACCEL\n"); if(infoPtr->AccelVect) { - heap_free (infoPtr->AccelVect); + free (infoPtr->AccelVect); infoPtr->AccelCount = 0; infoPtr->AccelVect = 0; } if(wParam==0) return TRUE; - infoPtr->AccelVect = heap_alloc(wParam*sizeof(UDACCEL)); + infoPtr->AccelVect = malloc(wParam*sizeof(UDACCEL)); if(!infoPtr->AccelVect) return FALSE; memcpy(infoPtr->AccelVect, (void*)lParam, wParam*sizeof(UDACCEL)); infoPtr->AccelCount = wParam; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/treeview.c | 45 +++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d3a69bb438e..d9ef075489b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -60,7 +60,6 @@ #include "vssym32.h" #include "wine/debug.h" #include "wine/exception.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(treeview); @@ -549,7 +548,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 = heap_alloc (tvItem->cchTextMax); + tvItem->pszText = malloc (tvItem->cchTextMax); WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, (LPSTR)tvItem->pszText, tvItem->cchTextMax, 0, 0 ); } else @@ -590,8 +589,8 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { - heap_free(nmhdr.itemOld.pszText); - heap_free(nmhdr.itemNew.pszText); + free(nmhdr.itemOld.pszText); + free(nmhdr.itemNew.pszText); } return ret; } @@ -690,7 +689,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) - heap_free(tvdi.item.pszText); + free(tvdi.item.pszText); return ret; } @@ -736,7 +735,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 = heap_realloc(item->pszText, buflen); + newText = realloc(item->pszText, buflen); TRACE("returned str %s, len=%d, buflen=%d\n", debugstr_a((LPSTR)callback.item.pszText), len, buflen); @@ -754,7 +753,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else { int len = max(lstrlenW(callback.item.pszText) + 1, TEXT_CALLBACK_SIZE); - LPWSTR newText = heap_realloc(item->pszText, len*sizeof(WCHAR)); + LPWSTR newText = realloc(item->pszText, len*sizeof(WCHAR)); TRACE("returned wstr %s, len=%d\n", debugstr_w(callback.item.pszText), len); @@ -777,7 +776,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 = heap_alloc(buflen); + newText = malloc(buflen); TRACE("same buffer str %s, len=%d, buflen=%d\n", debugstr_a((LPSTR)callback.item.pszText), len, buflen); @@ -790,7 +789,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); - heap_free(oldText); + free(oldText); } } } @@ -998,7 +997,7 @@ TREEVIEW_UpdateSubTree(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *root) static TREEVIEW_ITEM * TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) { - TREEVIEW_ITEM *newItem = heap_alloc_zero(sizeof(*newItem)); + TREEVIEW_ITEM *newItem = calloc(1, sizeof(*newItem)); if (!newItem) return NULL; @@ -1014,7 +1013,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { - heap_free(newItem); + free(newItem); return NULL; } @@ -1039,7 +1038,7 @@ TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->dropItem = NULL; if (infoPtr->insertMarkItem == item) infoPtr->insertMarkItem = NULL; - heap_free(item); + free(item); } @@ -1133,13 +1132,13 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)tvItem->pszText, -1, NULL, 0); /* Allocate new block to make pointer comparison in item_changed() work. */ - newText = heap_alloc(len * sizeof(WCHAR)); + newText = malloc(len * sizeof(WCHAR)); if (newText == NULL) return FALSE; callbackClear |= TVIF_TEXT; - heap_free(item->pszText); + free(item->pszText); item->pszText = newText; item->cchTextMax = len; if (isW) @@ -1153,7 +1152,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else { callbackSet |= TVIF_TEXT; - item->pszText = heap_realloc(item->pszText, TEXT_CALLBACK_SIZE * sizeof(WCHAR)); + item->pszText = realloc(item->pszText, TEXT_CALLBACK_SIZE * sizeof(WCHAR)); item->cchTextMax = TEXT_CALLBACK_SIZE; TRACE("setting callback, item %p\n", item); } @@ -1498,7 +1497,7 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->uNumItems--; if (item->pszText != LPSTR_TEXTCALLBACKW) - heap_free(item->pszText); + free(item->pszText); TREEVIEW_FreeItem(infoPtr, item); } @@ -4086,7 +4085,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!infoPtr->bNtfUnicode) { DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, NULL, 0 ); - newText = heap_alloc(len * sizeof(WCHAR)); + newText = malloc(len * sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, newText, len ); iLength = len - 1; } @@ -4095,11 +4094,11 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (lstrcmpW(newText, editedItem->pszText) != 0) { - WCHAR *ptr = heap_realloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); + WCHAR *ptr = realloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); - if (newText != tmpText) heap_free(newText); + if (newText != tmpText) free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; infoPtr->editItem = NULL; @@ -4113,7 +4112,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) TREEVIEW_ComputeTextWidth(infoPtr, editedItem, 0); } } - if (newText != tmpText) heap_free(newText); + if (newText != tmpText) free(newText); } ShowWindow(infoPtr->hwndEdit, SW_HIDE); @@ -5135,9 +5134,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TRACE("wnd %p, style %#lx\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); - infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO)); - - if (infoPtr == NULL) + if (!(infoPtr = calloc(1, sizeof(*infoPtr)))) { ERR("could not allocate info memory!\n"); return 0; @@ -5260,7 +5257,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hUnderlineFont); DeleteObject(infoPtr->hBoldUnderlineFont); DestroyWindow(infoPtr->hwndToolTip); - heap_free(infoPtr); + free(infoPtr); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/progress.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index f8fc2a14eb0..d8e4e343156 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -26,6 +26,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -37,7 +38,6 @@ #include "uxtheme.h" #include "vssym32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(progress); @@ -554,7 +554,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); /* allocate memory for info struct */ - infoPtr = heap_alloc_zero (sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -576,7 +576,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd); - heap_free (infoPtr); + free (infoPtr); SetWindowLongPtrW(hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 146a5a5ae1f..2bdf4c0503b 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -39,7 +39,6 @@ #include "vsstyle.h" #include "vssym32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); @@ -210,7 +209,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) SetWindowLongW (hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & ~WS_BORDER); - infoPtr = heap_alloc_zero (sizeof(*infoPtr)); + infoPtr = calloc (1, sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -273,7 +272,7 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) SetWindowLongPtrW (infoPtr->Self, 0, 0); theme = GetWindowTheme (infoPtr->Self); CloseThemeData (theme); - heap_free (infoPtr); + free (infoPtr); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/hotkey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index f27b71e3124..ed2be658cc9 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -29,6 +29,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -39,7 +40,6 @@ #include "comctl32.h" #include "uxtheme.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(hotkey); @@ -243,7 +243,7 @@ HOTKEY_Destroy (HOTKEY_INFO *infoPtr) { /* free hotkey info data */ SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - heap_free (infoPtr); + free (infoPtr); return 0; } @@ -412,7 +412,7 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) dwExStyle | WS_EX_CLIENTEDGE); /* allocate memory for info structure */ - infoPtr = heap_alloc_zero (sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126614 Your paranoid android. === debian11 (32 bit report) === d3d8: stateblock: Timeout visual: Timeout d3d9: d3d9ex: Timeout device: Timeout stateblock: Timeout visual: Timeout d3dcompiler_43: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout d3dcompiler_46: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout d3dcompiler_47: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout d3drm: d3drm: Timeout vector: Timeout Report validation errors: d3dx10_34:d3dx10 timeout === debian11 (build log) === WineRunWineTest.pl:error: The task timed out
This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1490
participants (4)
-
Marvin -
Nikolay Sivov -
Nikolay Sivov (＠nsivov)
-
Zhiyi Zhang (＠zhiyi)