November 2022 - Wine-Commits

Tag wine-7.20 : Alexandre Julliard : Release 7.20
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: refs/tags/wine-7.20 Tag: 9c818ff48c1ff5f9fa3dbc8a75b2dc7a8961de84 URL: https://gitlab.winehq.org/wine/wine/-/tags/9c818ff48c1ff5f9fa3dbc8a75b2dc7a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 22:47:59 2022 +0100 Release 7.20

1 0

Alexandre Julliard : Release 7.20.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: e43cb422502d5883a0fcde3dadcb8e6ef25632de URL: https://gitlab.winehq.org/wine/wine/-/commit/e43cb422502d5883a0fcde3dadcb8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 22:47:59 2022 +0100 Release 7.20. --- ANNOUNCE | 770 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 421 insertions(+), 372 deletions(-)

1 0

Nikolay Sivov : mf/samplegrabber: Send MEStreamSinkScrubSampleComplete event.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 9706a70bdaf16203e250f9cc2254e6fb0c830848 URL: https://gitlab.winehq.org/wine/wine/-/commit/9706a70bdaf16203e250f9cc2254e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 31 21:48:06 2022 +0300 mf/samplegrabber: Send MEStreamSinkScrubSampleComplete event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 84b8d71d6be..e41e74d35ac 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -83,6 +83,7 @@ struct sample_grabber IUnknown *cancel_key; UINT32 ignore_clock; UINT64 sample_time_offset; + float rate; enum sink_state state; CRITICAL_SECTION cs; }; @@ -1138,7 +1139,13 @@ static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sin } do_callback = state != grabber->state || state != SINK_STATE_PAUSED; if (do_callback) + { + if (grabber->rate == 0.0f && state == SINK_STATE_RUNNING) + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, MEStreamSinkScrubSampleComplete, + &GUID_NULL, S_OK, NULL); + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } grabber->state = state; } } @@ -1212,7 +1219,10 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink if (grabber->is_shut_down) hr = MF_E_SHUTDOWN; else + { IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, MEStreamSinkRateChanged, &GUID_NULL, S_OK, NULL); + grabber->rate = rate; + } LeaveCriticalSection(&grabber->cs); @@ -1433,6 +1443,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; object->refcount = 1; + object->rate = 1.0f; if (FAILED(IMFSampleGrabberSinkCallback_QueryInterface(context->callback, &IID_IMFSampleGrabberSinkCallback2, (void **)&object->callback2))) {

1 0

Nikolay Sivov : mf/samplegrabber: Send MEStreamSinkRateChanged event.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: ec7d032b16505e8d66a690675bf53560c91dcd4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ec7d032b16505e8d66a690675bf535… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 31 21:20:40 2022 +0300 mf/samplegrabber: Send MEStreamSinkRateChanged event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 2d9f8109aca..84b8d71d6be 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1203,10 +1203,23 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + HRESULT hr = S_OK; TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); - return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); + EnterCriticalSection(&grabber->cs); + + if (grabber->is_shut_down) + hr = MF_E_SHUTDOWN; + else + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, MEStreamSinkRateChanged, &GUID_NULL, S_OK, NULL); + + LeaveCriticalSection(&grabber->cs); + + if (SUCCEEDED(hr)) + hr = IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); + + return hr; } static HRESULT WINAPI sample_grabber_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj)

1 0

Gabriel Ivăncescu : mshtml: Implement document.referrer.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: a3d08482ad01538dced169951842bb7b0b842559 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3d08482ad01538dced169951842bb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 31 18:27:37 2022 +0200 mshtml: Implement document.referrer. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e7722f9c602..dd7d9f44d48 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1040,11 +1040,14 @@ static HRESULT WINAPI HTMLDocument_get_vlinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_get_referrer(IHTMLDocument2 *iface, BSTR *p) { HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface); + nsAString nsstr; + nsresult nsres; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - return S_OK; + nsAString_InitDepend(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetReferrer(This->nsdoc, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLocation **p)

1 0

Piotr Caban : winemac.drv: Fix registry path size in create_original_display_mode_descriptor.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 223ac6704435a09423030f4865b1a92a87e6ea49 URL: https://gitlab.winehq.org/wine/wine/-/commit/223ac6704435a09423030f4865b1a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 31 19:47:16 2022 +0100 winemac.drv: Fix registry path size in create_original_display_mode_descriptor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53081 --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e8d26dfd241..e5dbadde332 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -308,7 +308,7 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C snprintf(display_key, sizeof(display_key), display_key_format, CGDisplayUnitNumber(displayID)); /* @@ Wine registry key: HKLM\Software\Wine\Mac Driver\Initial Display Mode\Display 0xnnnnnnnn */ - if (!(hkey = reg_open_key(NULL, nameW, asciiz_to_unicode(nameW, display_key)))) + if (!(hkey = reg_open_key(NULL, nameW, asciiz_to_unicode(nameW, display_key) - sizeof(WCHAR)))) return NULL; desc = malloc(sizeof(*desc));

1 0

Jacek Caban : makedep: Always use -mno-cygwin for extra test modules.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 4920d08e5f5f7cd3156f5dade59c1099f01fc346 URL: https://gitlab.winehq.org/wine/wine/-/commit/4920d08e5f5f7cd3156f5dade59c10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 31 20:45:03 2022 +0100 makedep: Always use -mno-cygwin for extra test modules. --- tools/makedep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 82cd37934b5..ac2b7a19ff3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3065,14 +3065,15 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c static void output_source_spec( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); - struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); + struct strarray dll_flags = empty_strarray; struct strarray all_libs = empty_strarray, dep_libs = empty_strarray; struct strarray default_imports = empty_strarray; const char *dll_name, *obj_name, *res_name, *output_file, *debug_file; unsigned int arch = make->is_cross ? 1 : 0; if (!imports.count) imports = make->imports; - if (!dll_flags.count) dll_flags = make->extradllflags; + strarray_addall( &dll_flags, make->extradllflags ); + strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) );

1 0

Paul Gofman : ws2_32/tests: Also test bind to any together with loopback in a different order.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: f307d472706d56ea4cfdeb98daaac39239b7d814 URL: https://gitlab.winehq.org/wine/wine/-/commit/f307d472706d56ea4cfdeb98daaac3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 26 13:28:00 2022 -0500 ws2_32/tests: Also test bind to any together with loopback in a different order. --- dlls/ws2_32/tests/sock.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 943ee8539ea..5460bc621d3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2123,7 +2123,7 @@ static void test_so_reuseaddr(void) closesocket(s3); closesocket(s4); - /* Test binding and listening on any addr together with loopback. */ + /* Test binding and listening on any addr together with loopback, any addr first. */ s1 = socket(tests[i].domain, SOCK_STREAM, 0); ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); @@ -2157,6 +2157,41 @@ static void test_so_reuseaddr(void) closesocket(s3); closesocket(s4); + /* Test binding and listening on any addr together with loopback, loopback addr first. */ + + s1 = socket(tests[i].domain, SOCK_STREAM, 0); + ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + rc = bind(s1, tests[i].addr_loopback, tests[i].addrlen); + ok(!rc, "got error %d.\n", WSAGetLastError()); + + rc = listen(s1, 1); + ok(!rc, "got error %d.\n", WSAGetLastError()); + + s2 = socket(tests[i].domain, SOCK_STREAM, 0); + ok(s2 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + rc = bind(s2, tests[i].addr_any, tests[i].addrlen); + todo_wine ok(!rc, "got rc %d, error %d.\n", rc, WSAGetLastError()); + + rc = listen(s2, 1); + todo_wine ok(!rc, "got error %d.\n", WSAGetLastError()); + + s3 = socket(tests[i].domain, SOCK_STREAM, 0); + ok(s3 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + rc = connect(s3, tests[i].addr_loopback, tests[i].addrlen); + ok(!rc, "got error %d.\n", WSAGetLastError()); + size = tests[i].addrlen; + s4 = accept(s1, &saddr, &size); + + ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + closesocket(s1); + closesocket(s2); + closesocket(s3); + closesocket(s4); + /* Test binding to INADDR_ANY on two sockets. */ s1 = socket(tests[i].domain, SOCK_STREAM, 0); ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError());

1 0

Gabriel Ivăncescu : jscript: Implement VariantChangeType for VT_DISPATCH and VT_UNKNOWN.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: d984fb14a52881697f997fd8e5462388427be861 URL: https://gitlab.winehq.org/wine/wine/-/commit/d984fb14a52881697f997fd8e54623… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 31 18:27:36 2022 +0200 jscript: Implement VariantChangeType for VT_DISPATCH and VT_UNKNOWN. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsutils.c | 10 ++++++++++ dlls/jscript/tests/caller.c | 24 +++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 96e42625dc6..166fdc696b9 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -955,6 +955,16 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY case VT_NULL: hres = V_VT(src) == VT_NULL ? S_OK : E_NOTIMPL; break; + case VT_UNKNOWN: + case VT_DISPATCH: + if(V_VT(src) != vt) + hres = E_NOTIMPL; + else { + IUnknown_AddRef(V_UNKNOWN(src)); + V_UNKNOWN(dst) = V_UNKNOWN(src); + hres = S_OK; + } + break; default: FIXME("vt %d not implemented\n", vt); hres = E_NOTIMPL; diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 0da8c9abb08..836f5a820a1 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -97,14 +97,14 @@ static void _call_change_type(unsigned line, IVariantChangeType *change_type, VA HRESULT hres; VariantInit(dst); - if(V_VT(src) == VT_DISPATCH && vt != VT_BOOL) { + if(V_VT(src) != vt && vt != VT_BOOL && (V_VT(src) == VT_DISPATCH || V_VT(src) == VT_UNKNOWN)) { SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); } hres = IVariantChangeType_ChangeType(change_type, dst, src, 0, vt); ok_(__FILE__,line)(hres == S_OK, "ChangeType(%d) failed: %08lx\n", vt, hres); ok_(__FILE__,line)(V_VT(dst) == vt, "V_VT(dst) = %d\n", V_VT(dst)); - if(V_VT(src) == VT_DISPATCH && vt != VT_BOOL) { + if(V_VT(src) != vt && vt != VT_BOOL && (V_VT(src) == VT_DISPATCH || V_VT(src) == VT_UNKNOWN)) { CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); } @@ -118,7 +118,7 @@ static void _change_type_fail(unsigned line, IVariantChangeType *change_type, VA V_VT(&v) = VT_EMPTY; hres = IVariantChangeType_ChangeType(change_type, &v, src, 0, vt); - ok_(__FILE__,line)(hres == exhres, "ChangeType failed: %08lx, expected %08lx\n", hres, exhres); + ok_(__FILE__,line)(hres == exhres, "ChangeType failed: %08lx, expected %08lx [%d]\n", hres, exhres, V_VT(src)); } static void test_change_type(IVariantChangeType *change_type, VARIANT *src, const conv_results_t *ex) @@ -158,6 +158,20 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons call_change_type(change_type, &v, src, VT_I2); ok(V_I2(&v) == (INT16)ex->int_result, "V_I2(v) = %d, expected %d\n", V_I2(&v), ex->int_result); + + if(V_VT(src) != VT_UNKNOWN) + change_type_fail(change_type, src, VT_UNKNOWN, E_NOTIMPL); + else { + call_change_type(change_type, &v, src, VT_UNKNOWN); + ok(V_UNKNOWN(&v) == V_UNKNOWN(src), "V_UNKNOWN(v) != V_UNKNOWN(src)\n"); + } + + if(V_VT(src) != VT_DISPATCH) + change_type_fail(change_type, src, VT_DISPATCH, E_NOTIMPL); + else { + call_change_type(change_type, &v, src, VT_DISPATCH); + ok(V_DISPATCH(&v) == V_DISPATCH(src), "V_DISPATCH(v) != V_DISPATCH(src)\n"); + } } static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_disp) @@ -200,6 +214,10 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di V_VT(&v) = VT_NULL; test_change_type(change_type, &v, &null_results); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)obj_disp; + test_change_type(change_type, &v, &obj_results); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = obj_disp; test_change_type(change_type, &v, &obj_results);

1 0

Gabriel Ivăncescu : mshtml: Allow null or undefined func in addEventListener.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: de2192bbece698184fb5111392f9ec2603825b37 URL: https://gitlab.winehq.org/wine/wine/-/commit/de2192bbece698184fb5111392f9ec… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 31 18:27:37 2022 +0200 mshtml: Allow null or undefined func in addEventListener. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 3 +++ dlls/mshtml/tests/events.c | 2 ++ dlls/mshtml/tests/events.js | 15 +++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ebedff82564..7deb51ad1e9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4105,6 +4105,9 @@ static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR typ TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), function, capture); + if(!function) + return S_OK; + container = get_listener_container(This, type, TRUE); if(!container) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 1819bc6bdd9..b53851d61bf 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1898,6 +1898,7 @@ static void test_onclick(IHTMLDocument2 *doc) VariantClear(&v); if(document_mode >= 9) { + add_event_listener((IUnknown*)div, L"click", NULL, VARIANT_FALSE); add_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); add_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); } @@ -2052,6 +2053,7 @@ static void test_onclick(IHTMLDocument2 *doc) doc_detach_event(doc, L"onclick", (IDispatch*)&doc_onclick_attached_obj); if(document_mode >= 9) { + remove_event_listener((IUnknown*)div, L"click", NULL, VARIANT_FALSE); remove_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); remove_event_listener((IUnknown*)div, L"click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); } diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 997e583ad20..156330e984b 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -198,6 +198,21 @@ sync_test("add_remove_listener", function() { calls = ""; div.click(); ok(calls === "", "calls = " + calls); + + /* test undefined function argument */ + div.addEventListener("click", undefined, false); + + calls = ""; + div.click(); + ok(calls === "", "calls = " + calls); + + div.addEventListener("click", listener, false); + div.removeEventListener("click", undefined); + + calls = ""; + div.click(); + ok(calls === "listener,", "calls = " + calls); + div.removeEventListener("click", listener); }); sync_test("event_phase", function() {

1 0