- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml/tests: Expect UpdateUI, Exec_UPDATECOMMANDS and Exec_SETTITLE in edit mode.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: a431aa42b040d9433130533dff68f0058b243135 URL: https://gitlab.winehq.org/wine/wine/-/commit/a431aa42b040d9433130533dff68f0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 mshtml/tests: Expect UpdateUI, Exec_UPDATECOMMANDS and Exec_SETTITLE in edit mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53530 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/htmldoc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5b45ccb0c75..e4780e9c379 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6018,10 +6018,12 @@ static void test_download(DWORD flags) SET_EXPECT(CountEntries); SET_EXPECT(Exec_HTTPEQUIV_DONE); } - if(nav_url || support_wbapp) { + if(nav_url || support_wbapp || editmode) { SET_EXPECT(UpdateUI); SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(Exec_SETTITLE); + } + if(nav_url || support_wbapp) { if(flags & DWL_EXPECT_HISTUPDATE) SET_EXPECT(Exec_Explorer_38); SET_EXPECT(UpdateBackForwardState); @@ -6126,10 +6128,12 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_HTTPEQUIV_DONE); } SET_CALLED(SetStatusText); - if(nav_url || support_wbapp) { /* avoiding race, FIXME: find better way */ + if(nav_url || support_wbapp || editmode) { /* avoiding race, FIXME: find better way */ CLEAR_CALLED(UpdateUI); CLEAR_CALLED(Exec_UPDATECOMMANDS); CLEAR_CALLED(Exec_SETTITLE); + } + if(nav_url || support_wbapp) { if(flags & DWL_EXPECT_HISTUPDATE) { if(flags & DWL_FROM_HISTORY) CHECK_CALLED_BROKEN(Exec_Explorer_38); /* Some old IEs don't call it. */

1 0

Gabriel Ivăncescu : jscript: Pass correct 'this' to host objects in ES5 mode.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: 2e4721ac8f2d81bd84b013ad6cc3bf32b72b64cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2e4721ac8f2d81bd84b013ad6cc3bf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 30 18:14:24 2022 +0200 jscript: Pass correct 'this' to host objects in ES5 mode. For some reason, only pure js objects are passed in mshtml's jscript engine. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 11 ++--- dlls/mshtml/tests/es5.js | 14 +++++++ dlls/mshtml/tests/script.c | 102 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 119 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4e872c93717..1a7a75875df 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2212,14 +2212,11 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, jsval_t vthis, WORD if(jsdisp) jsdisp_release(jsdisp); - if(is_undefined(vthis)) - jsthis = NULL; - else if(is_object_instance(vthis)) + if(is_object_instance(vthis) && (ctx->version < SCRIPTLANGUAGEVERSION_ES5 || + ((jsdisp = to_jsdisp(get_object(vthis))) && is_class(jsdisp, JSCLASS_OBJECT)))) jsthis = get_object(vthis); - else { - FIXME("Unimplemented 'this' passed to host object: %s\n", debugstr_jsval(vthis)); - return E_NOTIMPL; - } + else + jsthis = NULL; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(r && argc && flags == DISPATCH_METHOD) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 93ede87eeb0..e13ad055f4f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1668,6 +1668,20 @@ sync_test("builtin_context", function() { ok(obj.valueOf() === 42, "obj = " + obj); }); +sync_test("host this", function() { + var tests = [ undefined, null, external.nullDisp, function() {}, [0], "foobar", true, 42, new Number(42), external.testHostContext(true), window, document ]; + var i, obj = Object.create(Function.prototype); + + // only pure js objects are passed as 'this' (regardless of prototype) + [137].forEach(external.testHostContext(true), obj); + Function.prototype.apply.call(external.testHostContext(true), obj, [137, 0, {}]); + + for(i = 0; i < tests.length; i++) { + [137].forEach(external.testHostContext(false), tests[i]); + Function.prototype.apply.call(external.testHostContext(false), tests[i], [137, 0, {}]); + } +}); + sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b27b68b5bd1..8d9ff3cd3f7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -158,7 +158,8 @@ DEFINE_EXPECT(GetTypeInfo); #define DISPID_EXTERNAL_IS_ENGLISH 0x300009 #define DISPID_EXTERNAL_LIST_SEP 0x30000A #define DISPID_EXTERNAL_TEST_VARS 0x30000B -#define DISPID_EXTERNAL_GETMIMETYPE 0x30000C +#define DISPID_EXTERNAL_TESTHOSTCTX 0x30000C +#define DISPID_EXTERNAL_GETMIMETYPE 0x30000D static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; @@ -745,6 +746,87 @@ static IDispatchExVtbl scriptDispVtbl = { static IDispatchEx scriptDisp = { &scriptDispVtbl }; +static HRESULT WINAPI testHostContextDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(id == DISPID_VALUE, "id = %ld\n", id); + ok(wFlags == (DISPATCH_PROPERTYGET | DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 4, "pdp->cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %ld\n", pdp->rgdispidNamedArgs[0]); + ok(V_VT(&pdp->rgvarg[0]) == VT_DISPATCH, "V_VT(rgvarg[0]) = %d\n", V_VT(&pdp->rgvarg[0])); + ok(V_DISPATCH(&pdp->rgvarg[0]) != NULL, "V_DISPATCH(rgvarg[0]) = NULL\n"); + ok(V_VT(&pdp->rgvarg[1]) == VT_DISPATCH, "V_VT(rgvarg[1]) = %d\n", V_VT(&pdp->rgvarg[1])); + ok(V_DISPATCH(&pdp->rgvarg[1]) != NULL, "V_DISPATCH(rgvarg[1]) = NULL\n"); + ok(V_VT(&pdp->rgvarg[2]) == VT_I4, "V_VT(rgvarg[2]) = %d\n", V_VT(&pdp->rgvarg[2])); + ok(V_I4(&pdp->rgvarg[2]) == 0, "V_I4(rgvarg[2]) = %ld\n", V_I4(&pdp->rgvarg[2])); + ok(V_VT(&pdp->rgvarg[3]) == VT_I4, "V_VT(rgvarg[3]) = %d\n", V_VT(&pdp->rgvarg[3])); + ok(V_I4(&pdp->rgvarg[3]) == 137, "V_I4(rgvarg[3]) = %ld\n", V_I4(&pdp->rgvarg[3])); + V_VT(pvarRes) = VT_EMPTY; + return S_OK; +} + +static IDispatchExVtbl testHostContextDispVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + testHostContextDisp_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testHostContextDisp = { &testHostContextDispVtbl }; + +static HRESULT WINAPI testHostContextDisp_no_this_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(id == DISPID_VALUE, "id = %ld\n", id); + ok(wFlags == (DISPATCH_PROPERTYGET | DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 3, "pdp->cArgs = %d\n", pdp->cArgs); + ok(V_VT(&pdp->rgvarg[0]) == VT_DISPATCH, "V_VT(rgvarg[1]) = %d\n", V_VT(&pdp->rgvarg[1])); + ok(V_DISPATCH(&pdp->rgvarg[0]) != NULL, "V_DISPATCH(rgvarg[1]) = NULL\n"); + ok(V_VT(&pdp->rgvarg[1]) == VT_I4, "V_VT(rgvarg[2]) = %d\n", V_VT(&pdp->rgvarg[2])); + ok(V_I4(&pdp->rgvarg[1]) == 0, "V_I4(rgvarg[2]) = %ld\n", V_I4(&pdp->rgvarg[2])); + ok(V_VT(&pdp->rgvarg[2]) == VT_I4, "V_VT(rgvarg[3]) = %d\n", V_VT(&pdp->rgvarg[3])); + ok(V_I4(&pdp->rgvarg[2]) == 137, "V_I4(rgvarg[3]) = %ld\n", V_I4(&pdp->rgvarg[3])); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + ok(pspCaller != NULL, "pspCaller == NULL\n"); + V_VT(pvarRes) = VT_EMPTY; + return S_OK; +} + +static IDispatchExVtbl testHostContextDisp_no_this_vtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + testHostContextDisp_no_this_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testHostContextDisp_no_this = { &testHostContextDisp_no_this_vtbl }; + static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!lstrcmpW(bstrName, L"ok")) { @@ -795,6 +877,10 @@ static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, *pid = DISPID_EXTERNAL_TEST_VARS; return S_OK; } + if(!lstrcmpW(bstrName, L"testHostContext")) { + *pid = DISPID_EXTERNAL_TESTHOSTCTX; + return S_OK; + } if(!lstrcmpW(bstrName, L"getExpectedMimeType")) { *pid = DISPID_EXTERNAL_GETMIMETYPE; return S_OK; @@ -1032,6 +1118,20 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID test_script_vars(pdp->cArgs, pdp->rgvarg); return S_OK; + case DISPID_EXTERNAL_TESTHOSTCTX: + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)(V_BOOL(pdp->rgvarg) ? &testHostContextDisp : &testHostContextDisp_no_this); + return S_OK; + case DISPID_EXTERNAL_GETMIMETYPE: ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n");

1 0

Ivo Ivanov : wineusb.sys: Move event handling to a single thread.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: 46360dd73279c5bdd9a8e9e1e793bf7f34151f6d URL: https://gitlab.winehq.org/wine/wine/-/commit/46360dd73279c5bdd9a8e9e1e793bf… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sun Sep 4 11:47:37 2022 +0300 wineusb.sys: Move event handling to a single thread. Also fixes a segmentation fault on exit of winedevice.exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 --- dlls/wineusb.sys/unixlib.c | 57 +++++++++++++++++++++++----------------------- dlls/wineusb.sys/unixlib.h | 5 ++-- dlls/wineusb.sys/wineusb.c | 37 +++++++++++------------------- 3 files changed, 43 insertions(+), 56 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index f269d3e96fd..278750c37f6 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -51,10 +51,7 @@ struct unix_device static libusb_hotplug_callback_handle hotplug_cb_handle; -static bool thread_shutdown; - -static pthread_cond_t event_cond = PTHREAD_COND_INITIALIZER; -static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; +static volatile bool thread_shutdown; static struct usb_event *usb_events; static size_t usb_event_count, usb_events_capacity; @@ -92,28 +89,21 @@ static bool array_reserve(void **elements, size_t *capacity, size_t count, size_ static void queue_event(const struct usb_event *event) { - pthread_mutex_lock(&event_mutex); if (array_reserve((void **)&usb_events, &usb_events_capacity, usb_event_count + 1, sizeof(*usb_events))) usb_events[usb_event_count++] = *event; else ERR("Failed to queue event.\n"); - pthread_mutex_unlock(&event_mutex); - pthread_cond_signal(&event_cond); } -static NTSTATUS usb_get_event(void *args) +static bool get_event(struct usb_event *event) { - const struct usb_get_event_params *params = args; + if (!usb_event_count) return false; - pthread_mutex_lock(&event_mutex); - while (!usb_event_count) - pthread_cond_wait(&event_cond, &event_mutex); - *params->event = usb_events[0]; + *event = usb_events[0]; if (--usb_event_count) memmove(usb_events, usb_events + 1, usb_event_count * sizeof(*usb_events)); - pthread_mutex_unlock(&event_mutex); - return STATUS_SUCCESS; + return true; } static void add_usb_device(libusb_device *libusb_device) @@ -239,10 +229,30 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device static NTSTATUS usb_main_loop(void *args) { - static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; + const struct usb_main_loop_params *params = args; int ret; - TRACE("Starting libusb event thread.\n"); + while (!thread_shutdown) + { + if (get_event(params->event)) return STATUS_PENDING; + + if ((ret = libusb_handle_events(NULL))) + ERR("Error handling events: %s\n", libusb_strerror(ret)); + } + + libusb_exit(NULL); + free(usb_events); + usb_events = NULL; + usb_event_count = usb_events_capacity = 0; + thread_shutdown = false; + + TRACE("USB main loop exiting.\n"); + return STATUS_SUCCESS; +} + +static NTSTATUS usb_init(void *args) +{ + int ret; if ((ret = libusb_init(NULL))) { @@ -260,17 +270,6 @@ static NTSTATUS usb_main_loop(void *args) return STATUS_UNSUCCESSFUL; } - while (!thread_shutdown) - { - if ((ret = libusb_handle_events(NULL))) - ERR("Error handling events: %s\n", libusb_strerror(ret)); - } - - libusb_exit(NULL); - - queue_event(&shutdown_event); - - TRACE("Shutting down libusb event thread.\n"); return STATUS_SUCCESS; } @@ -566,8 +565,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = { #define X(name) [unix_ ## name] = name X(usb_main_loop), + X(usb_init), X(usb_exit), - X(usb_get_event), X(usb_submit_urb), X(usb_cancel_transfer), X(usb_destroy_device), diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index 0c3319969b7..eee16c8fc2b 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -31,7 +31,6 @@ enum usb_event_type USB_EVENT_ADD_DEVICE, USB_EVENT_REMOVE_DEVICE, USB_EVENT_TRANSFER_COMPLETE, - USB_EVENT_SHUTDOWN, }; struct usb_event @@ -53,7 +52,7 @@ struct usb_event } u; }; -struct usb_get_event_params +struct usb_main_loop_params { struct usb_event *event; }; @@ -77,8 +76,8 @@ struct usb_destroy_device_params enum unix_funcs { unix_usb_main_loop, + unix_usb_init, unix_usb_exit, - unix_usb_get_event, unix_usb_submit_urb, unix_usb_cancel_transfer, unix_usb_destroy_device, diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index e9e91326a84..7848b31105e 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -165,14 +165,7 @@ static void remove_unix_device(struct unix_device *unix_device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } -static HANDLE libusb_event_thread, event_thread; - -static DWORD CALLBACK libusb_event_thread_proc(void *arg) -{ - WINE_UNIX_CALL(unix_usb_main_loop, NULL); - - return 0; -} +static HANDLE event_thread; static void complete_irp(IRP *irp) { @@ -187,18 +180,18 @@ static void complete_irp(IRP *irp) static DWORD CALLBACK event_thread_proc(void *arg) { struct usb_event event; - - TRACE("Starting client event thread.\n"); - - for (;;) + struct usb_main_loop_params params = { - struct usb_get_event_params params = - { - .event = &event, - }; + .event = &event, + }; - WINE_UNIX_CALL(unix_usb_get_event, &params); + TRACE("Starting event thread.\n"); + if (WINE_UNIX_CALL(unix_usb_init, NULL) != STATUS_SUCCESS) + return 0; + + while (WINE_UNIX_CALL(unix_usb_main_loop, &params) == STATUS_PENDING) + { switch (event.type) { case USB_EVENT_ADD_DEVICE: @@ -212,12 +205,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) case USB_EVENT_TRANSFER_COMPLETE: complete_irp(event.u.completed_irp); break; - - case USB_EVENT_SHUTDOWN: - TRACE("Shutting down client event thread.\n"); - return 0; } } + + TRACE("Shutting down event thread.\n"); + return 0; } static NTSTATUS fdo_pnp(IRP *irp) @@ -266,7 +258,6 @@ static NTSTATUS fdo_pnp(IRP *irp) } case IRP_MN_START_DEVICE: - libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); irp->IoStatus.Status = STATUS_SUCCESS; @@ -281,8 +272,6 @@ static NTSTATUS fdo_pnp(IRP *irp) struct usb_device *device, *cursor; WINE_UNIX_CALL(unix_usb_exit, NULL); - WaitForSingleObject(libusb_event_thread, INFINITE); - CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); CloseHandle(event_thread);

1 0

Zebediah Figura : wined3d: Use unsigned int for "refcount" variables.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: f5ce9f63121950007b3ce0b8a6e81b88586047b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5ce9f63121950007b3ce0b8a6e81b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 30 10:35:03 2022 -0600 wined3d: Use unsigned int for "refcount" variables. --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/palette.c | 4 ++-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 12 ++++++------ dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/vertexdeclaration.c | 4 ++-- dlls/wined3d/view.c | 12 ++++++------ 14 files changed, 36 insertions(+), 37 deletions(-)

1 0

Rémi Bernon : kernelbase: Restore HEAP_REALLOC_IN_PLACE_ONLY usage in LocalReAlloc.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: 4979ae5a94188b7c1943a64a0cb8cca39bbe8fad URL: https://gitlab.winehq.org/wine/wine/-/commit/4979ae5a94188b7c1943a64a0cb8cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 30 15:16:49 2022 +0100 kernelbase: Restore HEAP_REALLOC_IN_PLACE_ONLY usage in LocalReAlloc. This effectively reverts 2be9b0ff4a61f3738eb2c05a7f196a60a95d40c6, which incorrectly removed the flag, when the reallocation failures the tests showed were coming from an underlying LFH in-place reallocation failure. Thus, it restores todo_wine where appropriate while removing other todos for sizes outside of the LFH block size range. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53996 --- dlls/kernel32/tests/heap.c | 44 ++++++++++++++++++++++++-------------------- dlls/kernelbase/memory.c | 4 ++-- 2 files changed, 26 insertions(+), 22 deletions(-)

1 0

Robert Wilhelm : vbscript: Handle "case" statements without separators.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: 39058487ecddf8e528cab226f66c99d2c4790a22 URL: https://gitlab.winehq.org/wine/wine/-/commit/39058487ecddf8e528cab226f66c99… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed Nov 30 14:49:10 2022 +0300 vbscript: Handle "case" statements without separators. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53678 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/parser.y | 11 +++++++---- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 88f098f3714..816252eb2ec 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -323,10 +323,9 @@ Else_opt | tELSE StatementsNl_opt { $$ = $2; } CaseClausules - : /* empty */ { $$ = NULL; } - | tCASE tELSE StSep StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } - | tCASE ExpressionList StSep StatementsNl_opt CaseClausules - { $$ = new_case_clausule(ctx, $2, $4, $5); } + : /* empty */ { $$ = NULL; } + | tCASE tELSE StSep_opt StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE ExpressionList StSep_opt StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } Arguments : tEMPTYBRACKETS { $$ = NULL; } @@ -513,6 +512,10 @@ Identifier | tPROPERTY { ctx->last_token = tIdentifier; $$ = $1; } | tSTEP { ctx->last_token = tIdentifier; $$ = $1; } +StSep_opt + : /* empty */ + | StSep + /* Most statements accept both new line and ':' as separators */ StSep : tNL diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d27277508c0..3a67cd09dff 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -766,6 +766,26 @@ end select select case 0 : case 1 : case else : end select +' Case without separator +function SelectCaseTest(x) + select case x + case 0: SelectCaseTest = 100 + case 1 SelectCaseTest = 200 + case 2 + SelectCaseTest = 300 + case 3 + case 4 SelectCaseTest = 400 + case else SelectCaseTest = 500 + end select +end function + +call ok(SelectCaseTest(0) = 100, "Unexpected case " & SelectCaseTest(0)) +call ok(SelectCaseTest(1) = 200, "Unexpected case " & SelectCaseTest(1)) +call ok(SelectCaseTest(2) = 300, "Unexpected case " & SelectCaseTest(2)) +call ok(SelectCaseTest(3) = vbEmpty, "Unexpected case " & SelectCaseTest(3)) +call ok(SelectCaseTest(4) = 400, "Unexpected case " & SelectCaseTest(4)) +call ok(SelectCaseTest(5) = 500, "Unexpected case " & SelectCaseTest(5)) + if false then Sub testsub x = true

1 0

Rémi Bernon : kernel32/tests: Add more GlobalReAlloc tests with larger size.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: a568704c320fa98e087c6dc740e30dedda96d37b URL: https://gitlab.winehq.org/wine/wine/-/commit/a568704c320fa98e087c6dc740e30d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 30 15:06:21 2022 +0100 kernel32/tests: Add more GlobalReAlloc tests with larger size. In place reallocation is possible, although it depends on the underlying heap strategy. The LFH heap usually fails as it doesn't blocks to grow or shrink out of their size class. Larger block (LFH is limited to 16K blocks), more often allow in-place reallocation, and some native DLLs depend on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53996 --- dlls/kernel32/tests/heap.c | 284 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 282 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : kernel32/tests: Make sure the LFH is enabled for some sizes.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: b793367c676c643602f5a0986b0bbb4c9f4b0694 URL: https://gitlab.winehq.org/wine/wine/-/commit/b793367c676c643602f5a0986b0bbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 30 12:07:48 2022 +0100 kernel32/tests: Make sure the LFH is enabled for some sizes. Making the GlobalReAlloc tests more sensible, as they fail to reallocate when the block was allocated with the LFH and the new size wouldn't. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54012 --- dlls/kernel32/tests/heap.c | 286 +++++++++++++++++++++------------------------ 1 file changed, 131 insertions(+), 155 deletions(-)

1 0

Rémi Bernon : ntdll: Move delayed free support out of heap_free.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: a51e2a3f94baa3cece9f344c10db838aad4dc4a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a51e2a3f94baa3cece9f344c10db83… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 15:19:55 2022 +0100 ntdll: Move delayed free support out of heap_free. --- dlls/ntdll/heap.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f8aba405234..1de9fe6a4b6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -749,22 +749,33 @@ static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, } +static struct block *heap_delay_free( struct heap *heap, ULONG flags, struct block *block ) +{ + struct block *tmp; + + if (!heap->pending_free) return block; + + block_set_type( block, BLOCK_TYPE_DEAD ); + mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), flags ); + + heap_lock( heap, flags ); + + tmp = heap->pending_free[heap->pending_pos]; + heap->pending_free[heap->pending_pos] = block; + heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; + + heap_unlock( heap, flags ); + + return tmp; +} + + static NTSTATUS heap_free_block( struct heap *heap, ULONG flags, struct block *block ) { struct entry *entry; SIZE_T block_size; SUBHEAP *subheap; - if (heap->pending_free) - { - struct block *tmp = heap->pending_free[heap->pending_pos]; - heap->pending_free[heap->pending_pos] = block; - heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; - block_set_type( block, BLOCK_TYPE_DEAD ); - mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), heap->flags ); - if (!(block = tmp)) return STATUS_SUCCESS; - } - block_size = block_get_size( block ); if (block_get_flags( block ) & BLOCK_FLAG_PREV_FREE) { @@ -1579,6 +1590,8 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * status = STATUS_INVALID_PARAMETER; else if (block_get_flags( block ) & BLOCK_FLAG_LARGE) status = heap_free_large( heap, heap_flags, block ); + else if (!(block = heap_delay_free( heap, heap_flags, block ))) + status = STATUS_SUCCESS; else { heap_lock( heap, heap_flags );

1 0

Rémi Bernon : ntdll: Return the old data size from heap_reallocate.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: ce450253bd282fc92dd9f1a5e48abd2522a901ba URL: https://gitlab.winehq.org/wine/wine/-/commit/ce450253bd282fc92dd9f1a5e48abd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 00:18:21 2022 +0100 ntdll: Return the old data size from heap_reallocate. --- dlls/ntdll/heap.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 505900b2573..d2c5ee1ff3a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1623,11 +1623,11 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * } -static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *block, - SIZE_T block_size, SIZE_T size, void **ret ) +static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *block, SIZE_T block_size, + SIZE_T size, SIZE_T *old_size, void **ret ) { SUBHEAP *subheap = block_get_subheap( heap, block ); - SIZE_T old_block_size, old_size; + SIZE_T old_block_size; struct entry *entry; struct block *next; NTSTATUS status; @@ -1636,7 +1636,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b { ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block ); old_block_size = large->block_size; - old_size = large->data_size; + *old_size = large->data_size; if (old_block_size - sizeof(*block) < size) { @@ -1646,8 +1646,8 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b } /* FIXME: we could remap zero-pages instead */ - valgrind_notify_resize( block + 1, old_size, size ); - initialize_block( block, old_size, size, flags ); + valgrind_notify_resize( block + 1, *old_size, size ); + initialize_block( block, *old_size, size, flags ); large->data_size = size; valgrind_make_noaccess( (char *)block + sizeof(*block) + large->data_size, @@ -1660,7 +1660,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b /* Check if we need to grow the block */ old_block_size = block_get_size( block ); - old_size = old_block_size - block_get_overhead( block ); + *old_size = old_block_size - block_get_overhead( block ); if (block_size > old_block_size) { @@ -1671,8 +1671,8 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, block_size, size, ret ))) return status; valgrind_notify_alloc( *ret, size, 0 ); - memcpy( *ret, block + 1, old_size ); - if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); + memcpy( *ret, block + 1, *old_size ); + if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + *old_size, 0, size - *old_size ); valgrind_notify_free( block + 1 ); free_used_block( heap, flags, block ); return STATUS_SUCCESS; @@ -1687,11 +1687,11 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b old_block_size += block_get_size( next ); } - valgrind_notify_resize( block + 1, old_size, size ); + valgrind_notify_resize( block + 1, *old_size, size ); block_set_flags( block, BLOCK_FLAG_USER_MASK & ~BLOCK_FLAG_USER_INFO, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, block, old_block_size, block_size, size ); - initialize_block( block, old_size, size, flags ); + initialize_block( block, *old_size, size, flags ); mark_block_tail( block, flags ); *ret = block + 1; @@ -1703,9 +1703,9 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b */ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T size ) { + SIZE_T block_size, old_size; struct block *block; struct heap *heap; - SIZE_T block_size; ULONG heap_flags; void *ret = NULL; NTSTATUS status; @@ -1721,7 +1721,7 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si else { heap_lock( heap, heap_flags ); - status = heap_reallocate( heap, heap_flags, block, block_size, size, &ret ); + status = heap_reallocate( heap, heap_flags, block, block_size, size, &old_size, &ret ); heap_unlock( heap, heap_flags ); }

1 0