- Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/ipaddress: Use CRT allocation functions.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 389f961bc58bd64a85cc2dc28c18ae941f5291ca URL: https://gitlab.winehq.org/wine/wine/-/commit/389f961bc58bd64a85cc2dc28c18ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:23:32 2022 +0300 comctl32/ipaddress: Use CRT allocation functions. 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; }

1 0

Nikolay Sivov : comctl32/updown: Use CRT allocation functions.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: fca468beb45ef313bd7c8184379f098bde705f52 URL: https://gitlab.winehq.org/wine/wine/-/commit/fca468beb45ef313bd7c8184379f09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:16:46 2022 +0300 comctl32/updown: Use CRT allocation functions. 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;

1 0

Nikolay Sivov : comctl32/progress: Use CRT allocation functions.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 40c9966efefce273708bfc62dd0416e7c0e47fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/40c9966efefce273708bfc62dd0416… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:22:08 2022 +0300 comctl32/progress: Use CRT allocation functions. 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);

1 0

Nikolay Sivov : comctl32/treeview: Use CRT allocation functions.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 25ad6d759480036adc0f4a607d5e34733450dbc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/25ad6d759480036adc0f4a607d5e34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:19:18 2022 +0300 comctl32/treeview: Use CRT allocation functions. 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; }

1 0

Nikolay Sivov : comctl32/pager: Use CRT allocation functions.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: a79b761cdd14c2af69e03df9a5db9e7ac8db5047 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79b761cdd14c2af69e03df9a5db9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:15:04 2022 +0300 comctl32/pager: Use CRT allocation functions. 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; }

1 0

Nikolay Sivov : comctl32/animate: Use CRT allocation functions.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 80de4101393cdba01209cb383a74f691f19efcc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/80de4101393cdba01209cb383a74f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:12:26 2022 +0300 comctl32/animate: Use CRT allocation functions. 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; }

1 0

Ivo Ivanov : dinput: Remove redundant physical range values.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 6b1b5211934aa9e5302de2bde19d018c8fb59a6b URL: https://gitlab.winehq.org/wine/wine/-/commit/6b1b5211934aa9e5302de2bde19d01… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Aug 18 05:27:32 2022 +0300 dinput: Remove redundant physical range values. The physical range is not correct for the given usage. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> --- dlls/dinput/joystick_hid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3ea15009d8f..2065fe429eb 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1845,8 +1845,6 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap if (instance->wCollectionNumber == effect_update->axes_coll) { SET_REPORT_ID( effect_update ); - caps->physical_min = 0; - caps->physical_max = 36000; if (effect_update->axis_count >= 6) FIXME( "more than 6 PID axes detected\n" ); else effect_update->axis_caps[effect_update->axis_count] = caps; effect_update->axis_count++;

1 0

Ivo Ivanov : dinput: Prevent a potential array overflow error during the conversion from spherical to Cartesian coordinates.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 29894e1c9a15bd81ea84c4e3082e8e8ac8c01c85 URL: https://gitlab.winehq.org/wine/wine/-/commit/29894e1c9a15bd81ea84c4e3082e8e… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Tue Aug 9 02:21:22 2022 +0300 dinput: Prevent a potential array overflow error during the conversion from spherical to Cartesian coordinates. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> --- dlls/dinput/joystick_hid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ebebbee6eb2..3ea15009d8f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2350,7 +2350,8 @@ static void convert_directions_from_spherical( const DIEFFECT *in, DIEFFECT *out tmp = cos( in->rglDirection[i - 1] * M_PI / 18000 ) * 10000; for (j = 0; j < i; ++j) out->rglDirection[j] = round( out->rglDirection[j] * tmp / 10000.0 ); - out->rglDirection[i] = sin( in->rglDirection[i - 1] * M_PI / 18000 ) * 10000; + if (i < in->cAxes) + out->rglDirection[i] = sin( in->rglDirection[i - 1] * M_PI / 18000 ) * 10000; } out->cAxes = in->cAxes; break;

1 0

Alexandre Julliard : ntdll: Fall back to the current loader if the corresponding 32/64-bit loader isn't found.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 9e7a9270e2a7fd5eaf388c1b9277e52b5bbb48e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e7a9270e2a7fd5eaf388c1b9277e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 13:58:49 2022 +0100 ntdll: Fall back to the current loader if the corresponding 32/64-bit loader isn't found. --- dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/loader.c | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 46c3d97c852..328040bbda6 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1863,6 +1863,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); wow_peb = (PEB32 *)((char *)peb + page_size); set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); + ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) ); } #endif diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index db9e1d60162..f87e11f073c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -706,14 +706,9 @@ static NTSTATUS loader_exec( char **argv, WORD machine ) strcpy( argv[1], wineloader ); strcat( argv[1], "64" ); preloader_exec( argv ); - return STATUS_INVALID_IMAGE_FORMAT; } } - else if ((argv[1] = remove_tail( wineloader, "64" ))) - { - preloader_exec( argv ); - return STATUS_INVALID_IMAGE_FORMAT; - } + else if ((argv[1] = remove_tail( wineloader, "64" ))) preloader_exec( argv ); } argv[1] = strdup( wineloader );

1 0

Alexandre Julliard : makedep: Assume that all modules are built with msvcrt.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: a9183c7e3bd6ee25aeab2aed6c57a58d9558b614 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9183c7e3bd6ee25aeab2aed6c57a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 15:34:48 2022 +0100 makedep: Assume that all modules are built with msvcrt. --- tools/makedep.c | 56 ++++++++++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index cf916922390..484d2902817 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -198,7 +198,6 @@ struct makefile const char *staticlib; const char *importlib; const char *unixlib; - int use_msvcrt; int data_only; int is_win16; int is_exe; @@ -598,6 +597,17 @@ static int is_multiarch( unsigned int arch ) } +/******************************************************************* + * is_using_msvcrt + * + * Check if the files of a makefile use msvcrt by default. + */ +static int is_using_msvcrt( struct makefile *make ) +{ + return make->module || make->testdll; +} + + /******************************************************************* * arch_module_name */ @@ -856,7 +866,7 @@ static struct incl_file *add_generated_source( struct makefile *make, const char file->basename = xstrdup( filename ? filename : name ); file->filename = obj_dir_path( make, file->basename ); file->file->flags = FLAG_GENERATED; - file->use_msvcrt = make->use_msvcrt; + file->use_msvcrt = is_using_msvcrt( make ); list_add_tail( &make->sources, &file->entry ); if (make == include_makefile) { @@ -1605,7 +1615,7 @@ static struct incl_file *add_src_file( struct makefile *make, const char *name ) memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); - file->use_msvcrt = make->use_msvcrt; + file->use_msvcrt = is_using_msvcrt( make ); file->is_external = !!make->extlib; list_add_tail( &make->sources, &file->entry ); if (make == include_makefile) @@ -1804,13 +1814,12 @@ static void add_generated_sources( struct makefile *make ) unsigned int i, arch; struct incl_file *source, *next, *file, *dlldata = NULL; struct strarray objs = get_expanded_make_var_array( make, "EXTRA_OBJS" ); - int multiarch = archs.count > 1 && make->use_msvcrt; LIST_FOR_EACH_ENTRY_SAFE( source, next, &make->sources, struct incl_file, entry ) { for (arch = 0; arch < archs.count; arch++) { - if (!arch != !multiarch) continue; + if (!is_multiarch( arch )) continue; if (source->file->flags & FLAG_IDL_CLIENT) { file = add_generated_source( make, replace_extension( source->name, ".idl", "_c.c" ), NULL, arch ); @@ -1914,7 +1923,7 @@ static void add_generated_sources( struct makefile *make ) { for (arch = 0; arch < archs.count; arch++) { - if (!arch != !multiarch) continue; + if (!is_multiarch( arch )) continue; file = add_generated_source( make, "testlist.o", "testlist.c", arch ); add_dependency( file->file, "wine/test.h", INCL_NORMAL ); add_all_includes( make, file, file->file ); @@ -2161,7 +2170,6 @@ static int is_crt_module( const char *file ) */ static const char *get_default_crt( const struct makefile *make ) { - if (!make->use_msvcrt) return NULL; if (make->module && is_crt_module( make->module )) return NULL; /* don't add crt import to crt dlls */ return !make->testdll && (!make->staticlib || make->extlib) ? "ucrtbase" : "msvcrt"; } @@ -2362,6 +2370,7 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi strarray_add( &ret, strmake( "-I%s", root_src_dir_path( "include/msvcrt" ))); for (i = 0; i < make->include_paths.count; i++) strarray_add( &ret, strmake( "-I%s", make->include_paths.str[i] )); + strarray_add( &ret, get_crt_define( make )); } strarray_addall( &ret, make->define_args ); strarray_addall( &ret, get_expanded_file_local_var( make, obj, "EXTRADEFS" )); @@ -2422,7 +2431,9 @@ static void output_winegcc_command( struct makefile *make, unsigned int arch ) output_filename( tools_path( make, "winebuild" )); } output_filenames( target_flags[arch] ); - if (!arch) output_filenames( lddll_flags ); + if (arch) return; + output_filename( "-mno-cygwin" ); + output_filenames( lddll_flags ); } @@ -2815,7 +2826,6 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, struct strarray multiarch_targets[MAX_ARCHS] = { empty_strarray }; const char *dest; unsigned int i, arch; - int multiarch; if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; if (!source->file->flags) return; @@ -2839,10 +2849,9 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, for (i = 0; i < ARRAY_SIZE(idl_outputs); i++) { if (!(source->file->flags & idl_outputs[i].flag)) continue; - multiarch = (make->use_msvcrt && archs.count > 1); for (arch = 0; arch < archs.count; arch++) { - if (!arch != !multiarch) continue; + if (!is_multiarch( arch )) continue; dest = strmake( "%s%s%s", arch_dirs[arch], obj, idl_outputs[i].ext ); if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); strarray_add( &multiarch_targets[arch], dest ); @@ -3123,13 +3132,13 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou if (arch) { if (source->file->flags & FLAG_C_UNIX) return; - if (!make->use_msvcrt && !make->staticlib && !(source->file->flags & FLAG_C_IMPLIB)) return; + if (!is_using_msvcrt( make ) && !make->staticlib && !(source->file->flags & FLAG_C_IMPLIB)) return; } else if (source->file->flags & FLAG_C_UNIX) { if (!*dll_ext) return; } - else if (archs.count > 1 && make->use_msvcrt && + else if (archs.count > 1 && is_using_msvcrt( make ) && !(source->file->flags & FLAG_C_IMPLIB) && (!make->staticlib || make->extlib)) return; @@ -3315,12 +3324,6 @@ static void output_module( struct makefile *make, unsigned int arch ) strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, arch )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); - if (!make->use_msvcrt) - { - strarray_addall( &all_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); - strarray_addall( &all_libs, libs ); - } - if (delay_load_flags[arch]) { for (i = 0; i < make->delayimports.count; i++) @@ -3548,7 +3551,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output( ": %s", obj_dir_path( make, testmodule )); if (parent) { - char *parent_module = arch_module_name( make->testdll, parent->use_msvcrt ? arch : 0 ); + char *parent_module = arch_module_name( make->testdll, arch ); output_filename( obj_dir_path( parent, parent_module )); if (parent->unixlib) output_filename( obj_dir_path( parent, parent->unixlib )); } @@ -3799,12 +3802,7 @@ static void output_sources( struct makefile *make ) } else if (make->module) { - if (!make->use_msvcrt) output_module( make, 0 ); - else - { - for (arch = 0; arch < archs.count; arch++) - if (is_multiarch( arch )) output_module( make, arch ); - } + for (arch = 0; arch < archs.count; arch++) if (is_multiarch( arch )) output_module( make, arch ); if (make->unixlib) output_unix_lib( make ); if (make->importlib) for (arch = 0; arch < archs.count; arch++) output_import_lib( make, arch ); if (make->is_exe && !make->is_win16 && *dll_ext && strendswith( make->module, ".exe" )) @@ -4246,13 +4244,9 @@ static void load_sources( struct makefile *make ) } make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); make->data_only = strarray_exists( &make->extradllflags, "-Wb,--data-only" ); - make->use_msvcrt = (make->module || make->testdll || make->is_win16) && - !strarray_exists( &make->extradllflags, "-mcygwin" ); make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); - if (make->use_msvcrt) strarray_add_uniq( &make->extradllflags, "-mno-cygwin" ); - if (make->module) { /* add default install rules if nothing was specified */ @@ -4309,8 +4303,6 @@ static void load_sources( struct makefile *make ) add_generated_sources( make ); - if (make->use_msvcrt) strarray_add( &make->define_args, get_crt_define( make )); - LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file );

1 0