November 2022 - Wine-commits

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

22 Nov '22

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/treeview: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '22

22 Nov '22

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/progress: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '22

22 Nov '22

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/ipaddress: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '22

22 Nov '22

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/hotkey: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 644143d55366d044c206266b3908e109ac2ad031 URL: https://gitlab.winehq.org/wine/wine/-/commit/644143d55366d044c206266b3908e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 12:25:29 2022 +0300 comctl32/hotkey: Use CRT allocation functions. 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 */

1 0

Rémi Bernon : hidclass.sys: Add more trace messages.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 1d2ea5fb890a3b1cb6d7aceb44f2ea3305eb948e URL: https://gitlab.winehq.org/wine/wine/-/commit/1d2ea5fb890a3b1cb6d7aceb44f2ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 17:23:38 2022 +0100 hidclass.sys: Add more trace messages. --- dlls/hidclass.sys/device.c | 2 ++ dlls/hidclass.sys/pnp.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 7c0dbdcbc10..ac201afeddf 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -229,6 +229,8 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack KIRQL irql; IRP *irp; + TRACE("device %p, packet %p\n", device, packet); + if (IsEqualGUID( ext->class_guid, &GUID_DEVINTERFACE_HID )) { size = offsetof( RAWINPUT, data.hid.bRawData[report_len] ); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 91624b40eff..46b6e803465 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -117,6 +117,8 @@ static void send_wm_input_device_change(BASE_DEVICE_EXTENSION *ext, LPARAM param RAWINPUT rawinput; INPUT input; + TRACE("ext %p, lparam %p\n", ext, (void *)param); + if (!IsEqualGUID( ext->class_guid, &GUID_DEVINTERFACE_HID )) return; rawinput.header.dwType = RIM_TYPEHID; @@ -298,6 +300,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) HID_StartDeviceThread(child_pdo); send_wm_input_device_change(pdo_ext, GIDC_ARRIVAL); + + TRACE( "created device %p, rawinput handle %#x\n", pdo_ext, pdo_ext->u.pdo.rawinput_handle ); } static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp)

1 0

Rémi Bernon : winebus.sys: Add more trace messages.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 1429d211ac0c1df9fb65691b0443f08820f05dd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1429d211ac0c1df9fb65691b0443f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 17:23:38 2022 +0100 winebus.sys: Add more trace messages. --- dlls/winebus.sys/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 1037295c955..35f84bd9e29 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -322,6 +322,8 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, UINT64 uni list_add_tail(&device_list, &ext->entry); RtlLeaveCriticalSection(&device_list_cs); + + TRACE("created device %p/%#I64x\n", device, unix_device); return device; } @@ -415,7 +417,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) if (TRACE_ON(hid)) { - TRACE("read input report length %lu:\n", report->length); + TRACE("device %p/%#I64x input report length %lu:\n", ext->device, ext->unix_device, report->length); for (i = 0; i < report->length;) { char buffer[256], *buf = buffer;

1 0

Jason Millard : vbscript: Add support for redim byref.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 393f740bb70b90171511e067520a674fc63de19d URL: https://gitlab.winehq.org/wine/wine/-/commit/393f740bb70b90171511e067520a67… Author: Jason Millard <jsm174(a)gmail.com> Date: Tue Nov 22 08:41:24 2022 -0500 vbscript: Add support for redim byref. --- dlls/vbscript/interp.c | 33 ++++++++++++++++++++++++--------- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 77875ee7f44..2d33982839e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1283,6 +1283,7 @@ static HRESULT interp_redim(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned dim_cnt = ctx->instr->arg2.uint; + VARIANT *v; SAFEARRAYBOUND *bounds; SAFEARRAY *array; ref_t ref; @@ -1312,9 +1313,16 @@ static HRESULT interp_redim(exec_ctx_t *ctx) /* FIXME: We should check if we're not modifying an existing static array here */ - VariantClear(ref.u.v); - V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; - V_ARRAY(ref.u.v) = array; + v = ref.u.v; + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { + v = V_VARIANTREF(v); + } + + VariantClear(v); + V_VT(v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(v) = array; + return S_OK; } @@ -1323,6 +1331,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) BSTR identifier = ctx->instr->arg1.bstr; const unsigned dim_cnt = ctx->instr->arg2.uint; unsigned i; + VARIANT *v; SAFEARRAYBOUND *bounds; SAFEARRAY *array; ref_t ref; @@ -1341,12 +1350,18 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) return E_FAIL; } - if(!(V_VT(ref.u.v) & VT_ARRAY)) { - FIXME("ReDim Preserve not valid on type %d\n", V_VT(ref.u.v)); + v = ref.u.v; + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { + v = V_VARIANTREF(v); + } + + if(!(V_VT(v) & VT_ARRAY)) { + FIXME("ReDim Preserve not valid on type %d\n", V_VT(v)); return E_FAIL; } - array = V_ARRAY(ref.u.v); + array = V_ARRAY(v); hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); if(FAILED(hres)) @@ -1355,9 +1370,9 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) if(array == NULL || array->cDims == 0) { /* can initially allocate the array */ array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); - VariantClear(ref.u.v); - V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; - V_ARRAY(ref.u.v) = array; + VariantClear(v); + V_VT(v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(v) = array; return S_OK; } else if(array->cDims != dim_cnt) { /* can't otherwise change the number of dimensions */ diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index beb7c7e86c9..990d830234d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1562,6 +1562,28 @@ sub TestReDimList end sub call TestReDimList +dim rx(4) +sub TestReDimByRef(byref x) + ok ubound(x) = 4, "ubound(x) = " & ubound(x) + redim x(6) + ok ubound(x) = 6, "ubound(x) = " & ubound(x) +end sub +call TestReDimByRef(rx) +ok ubound(rx) = 6, "ubound(rx) = " & ubound(rx) + +redim rx(5) +rx(3)=2 +sub TestReDimPreserveByRef(byref x) + ok ubound(x) = 5, "ubound(x) = " & ubound(x) + ok x(3) = 2, "x(3) = " & x(3) + redim preserve x(7) + ok ubound(x) = 7, "ubound(x) = " & ubound(x) + ok x(3) = 2, "x(3) = " & x(3) +end sub +call TestReDimPreserveByRef(rx) +ok ubound(rx) = 7, "ubound(rx) = " & ubound(rx) +ok rx(3) = 2, "rx(3) = " & rx(3) + Class ArrClass Dim classarr(3) Dim classnoarr()

1 0

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

22 Nov '22

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

Alexandre Julliard : ntdll: Always set WINELOADER variable to the current loader name.
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: d45de318748639cfd1e80a976b39f5e19213990f URL: https://gitlab.winehq.org/wine/wine/-/commit/d45de318748639cfd1e80a976b39f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 12:08:19 2022 +0100 ntdll: Always set WINELOADER variable to the current loader name. --- dlls/ntdll/unix/env.c | 3 +++ dlls/ntdll/unix/loader.c | 48 +++++++++++++++++++++--------------------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5e36f2c2e0d..46c3d97c852 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -354,6 +354,7 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINEHOMEDIR=" ) || STARTS_WITH( var, "WINEBUILDDIR=" ) || STARTS_WITH( var, "WINECONFIGDIR=" ) || + STARTS_WITH( var, "WINELOADER=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || STARTS_WITH( var, "WINEUNIXCP=" ) || STARTS_WITH( var, "WINEUSERLOCALE=" ) || @@ -1068,6 +1069,7 @@ static void add_system_dll_path_var( WCHAR **env, SIZE_T *pos, SIZE_T *size ) static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) { const char *overrides = getenv( "WINEDLLOVERRIDES" ); + const char *wineloader = getenv( "WINELOADER" ); unsigned int i; char str[22]; @@ -1083,6 +1085,7 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) sprintf( str, "WINEDLLDIR%u", i ); append_envW( env, pos, size, str, NULL ); add_system_dll_path_var( env, pos, size ); + append_envA( env, pos, size, "WINELOADER", wineloader ); append_envA( env, pos, size, "WINEUSERNAME", user_name ); append_envA( env, pos, size, "WINEDLLOVERRIDES", overrides ); if (unix_cp.CodePage != CP_UTF8) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3bb7f056b2a..fa0811ac468 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -378,10 +378,10 @@ static const BOOL use_preloader = TRUE; static const BOOL use_preloader = FALSE; #endif -static char *argv0; static const char *bin_dir; static const char *dll_dir; static const char *ntdll_dir; +static const char *wineloader; static SIZE_T dll_path_maxlen; static int *p___wine_main_argc; static char ***p___wine_main_argv; @@ -618,8 +618,10 @@ static void set_config_dir(void) static void init_paths( char *argv[] ) { Dl_info info; + char *basename, *env; - argv0 = strdup( argv[0] ); + if ((basename = strrchr( argv[0], '/' ))) basename++; + else basename = argv[0]; if (!dladdr( init_paths, &info ) || !(ntdll_dir = realpath_dirname( info.dli_fname ))) fatal_error( "cannot get path to ntdll.so\n" ); @@ -639,11 +641,18 @@ static void init_paths( char *argv[] ) free( path ); } #else - bin_dir = realpath_dirname( argv0 ); + bin_dir = realpath_dirname( argv[0] ); #endif if (!bin_dir) bin_dir = build_path( dll_dir, DLL_TO_BINDIR ); data_dir = build_path( bin_dir, BIN_TO_DATADIR ); + wineloader = build_path( bin_dir, basename ); } + else wineloader = build_path( build_path( build_dir, "loader" ), basename ); + + env = malloc( sizeof("WINELOADER=") + strlen(wineloader) ); + strcpy( env, "WINELOADER=" ); + strcat( env, wineloader ); + putenv( env ); set_dll_path(); set_system_dll_path(); @@ -726,8 +735,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i WORD machine = pe_info->machine; ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; - const char *loader = argv0; - const char *loader_env = getenv( "WINELOADER" ); + const char *loader = wineloader; char preloader_reserve[64], socket_env[64]; BOOL is_child_64bit; @@ -738,28 +746,14 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i if (!is_win64 ^ !is_child_64bit) { - /* remap WINELOADER to the alternate 32/64-bit version if necessary */ - if (loader_env) - { - int len = strlen( loader_env ); - char *env = malloc( sizeof("WINELOADER=") + len + 2 ); + int len = strlen( loader ); + char *env = malloc( len + 2 ); - if (!env) return STATUS_NO_MEMORY; - strcpy( env, "WINELOADER=" ); - strcat( env, loader_env ); - if (is_child_64bit) - { - strcat( env, "64" ); - } - else - { - len += sizeof("WINELOADER=") - 1; - if (!strcmp( env + len - 2, "64" )) env[len - 2] = 0; - } - loader = env; - putenv( env ); - } - else loader = is_child_64bit ? "wine64" : "wine"; + if (!env) return STATUS_NO_MEMORY; + strcpy( env, loader ); + if (is_child_64bit) strcat( env, "64" ); + else if (!strcmp( env + len - 2, "64" )) env[len - 2] = 0; + loader = env; } signal( SIGPIPE, SIG_DFL ); @@ -2510,7 +2504,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) memcpy( new_argv + 1, argv, (argc + 1) * sizeof(*argv) ); putenv( noexec ); - loader_exec( argv0, new_argv, current_machine ); + loader_exec( wineloader, new_argv, current_machine ); fatal_error( "could not exec the wine loader\n" ); } }

1 0