June 2020 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : msscript.ocx: Implement parse_script_text on top of modules.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: e285c6e9299872abfeac7f5ac036601e040ab513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e285c6e9299872abfeac7f5a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:28 2020 +0300 msscript.ocx: Implement parse_script_text on top of modules. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 36 ++++++++++++++++++++++++------------ dlls/msscript.ocx/tests/msscript.c | 24 ++++++++++++------------ 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 4460afc808..7fc7b9570f 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -291,15 +291,15 @@ static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, return hr; } -static HRESULT parse_script_text(ScriptHost *host, BSTR script_text, DWORD flag, VARIANT *res) +static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD flag, VARIANT *res) { EXCEPINFO excepinfo; HRESULT hr; - hr = start_script(host); + hr = start_script(module->host); if (FAILED(hr)) return hr; - hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL, + hr = IActiveScriptParse_ParseScriptText(module->host->parse, script_text, module->name, NULL, NULL, 0, 1, flag, res, &excepinfo); /* FIXME: more error handling */ return hr; @@ -783,27 +783,39 @@ static HRESULT WINAPI ScriptModule_AddCode(IScriptModule *iface, BSTR code) { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(code)); + TRACE("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + if (!This->host) + return E_FAIL; + + return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptModule_Eval(IScriptModule *iface, BSTR expression, VARIANT *res) { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_w(expression), res); + TRACE("(%p)->(%s, %p)\n", This, debugstr_w(expression), res); - return E_NOTIMPL; + if (!res) + return E_POINTER; + V_VT(res) = VT_EMPTY; + if (!This->host) + return E_FAIL; + + return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptModule_ExecuteStatement(IScriptModule *iface, BSTR statement) { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(statement)); + TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); + + if (!This->host) + return E_FAIL; - return E_NOTIMPL; + return parse_script_text(This, statement, 0, NULL); } static HRESULT WINAPI ScriptModule_Run(IScriptModule *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) @@ -1578,7 +1590,7 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) if (!This->host) return E_FAIL; - return parse_script_text(This->host, code, SCRIPTTEXT_ISVISIBLE, NULL); + return parse_script_text(This->modules[0], code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) @@ -1593,7 +1605,7 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!This->host) return E_FAIL; - return parse_script_text(This->host, expression, SCRIPTTEXT_ISEXPRESSION, res); + return parse_script_text(This->modules[0], expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) @@ -1605,7 +1617,7 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR if (!This->host) return E_FAIL; - return parse_script_text(This->host, statement, 0, NULL); + return parse_script_text(This->modules[0], statement, 0, NULL); } static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 871ff51bea..807f82eee3 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2398,7 +2398,7 @@ static void test_IScriptControl_get_Modules(void) SysFreeString(str); str = SysAllocString(L"function add(a, b) { return a + b; }\n"); hr = IScriptModule_AddCode(mod, str); - todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); IScriptModule_Release(mod); SysFreeString(str); @@ -2424,15 +2424,15 @@ static void test_IScriptControl_get_Modules(void) SysFreeString(str); str = SysAllocString(L"function sub(a, b) { return a - b; }\n"); hr = IScriptModule_AddCode(mod, str); - todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); IScriptModule_Release(mod); SysFreeString(str); /* The 'Global' module is the same as the script control */ str = SysAllocString(L"add(10, 5)"); hr = IScriptControl_Eval(sc, str, &var); - todo_wine ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - todo_wine ok(V_VT(&var) == VT_I4 && V_I4(&var) == 15, "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_I4 && V_I4(&var) == 15, "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); SysFreeString(str); str = SysAllocString(L"sub(10, 5)"); hr = IScriptControl_Eval(sc, str, &var); @@ -2457,11 +2457,11 @@ static void test_IScriptControl_get_Modules(void) ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); str = SysAllocString(L"function closed() { }\n"); hr = IScriptModule_AddCode(mod, str); - todo_wine ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); SysFreeString(str); str = SysAllocString(L"sub closed\nend sub"); hr = IScriptModule_AddCode(mod, str); - todo_wine ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); IScriptModule_Release(mod); SysFreeString(str); @@ -2568,9 +2568,9 @@ static void test_IScriptControl_get_Modules(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"some code"); hr = IScriptModule_AddCode(mod, code_str); - todo_wine ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - todo_wine CHECK_CALLED(SetScriptState_STARTED); - todo_wine CHECK_CALLED(ParseScriptText); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); SysFreeString(code_str); SysFreeString(str); @@ -2631,9 +2631,9 @@ static void test_IScriptControl_get_Modules(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"code after close"); hr = IScriptModule_AddCode(mod, code_str); - todo_wine ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - todo_wine CHECK_CALLED(SetScriptState_STARTED); - todo_wine CHECK_CALLED(ParseScriptText); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); SysFreeString(code_str); SysFreeString(str);

1 0

Anton Baskanov : qasf/dmowrapper: Don't crash in ::Stop when DMO wrapper is not initialized.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 3667754aa2a5fb42ac01aa3820436a2d04e6089f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3667754aa2a5fb42ac01aa38… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jun 25 22:21:09 2020 +0700 qasf/dmowrapper: Don't crash in ::Stop when DMO wrapper is not initialized. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 3 +++ dlls/qasf/tests/dmowrapper.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index e2d4063828..8cf4404ece 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -673,6 +673,9 @@ static HRESULT dmo_wrapper_cleanup_stream(struct strmbase_filter *iface) IMediaObject *dmo; DWORD i; + if (!filter->dmo) + return E_FAIL; + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); for (i = 0; i < filter->source_count; ++i) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 72c05ee49c..f76c0c3d9d 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1995,6 +1995,23 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_uninitialized(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_DMOWrapperFilter, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_Stop(filter); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmowrapper) { DWORD cookie; @@ -2022,6 +2039,7 @@ START_TEST(dmowrapper) test_media_types(); test_enum_media_types(); test_connect_pin(); + test_uninitialized(); CoRevokeClassObject(cookie); DMOUnregister(&testdmo_clsid, &DMOCATEGORY_AUDIO_DECODER);

1 0

Anton Baskanov : amstream: Return E_NOTIMPL from AMAudioStream::QueryInterface.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 117e13e05ebb5dbdc8562de13545226b08bbf14b URL: https://source.winehq.org/git/wine.git/?a=commit;h=117e13e05ebb5dbdc8562de1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jun 25 22:21:10 2020 +0700 amstream: Return E_NOTIMPL from AMAudioStream::QueryInterface. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 2 +- dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a19cb4ea96..60a2572b3b 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -1073,7 +1073,7 @@ static HRESULT WINAPI audio_sink_QueryId(IPin *iface, WCHAR **id) static HRESULT WINAPI audio_sink_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { TRACE("iface %p, mt %p.\n", iface, mt); - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI audio_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 03c8660a42..43da41ae89 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1989,7 +1989,7 @@ static void test_media_types(void) ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); CoTaskMemFree(pmt);

1 0

Zebediah Figura : quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 7595461f77a58d2864d4217adba5c8019671d18a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7595461f77a58d2864d4217a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:41 2020 -0500 quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 8 ++------ dlls/quartz/tests/vmr9.c | 14 ++------------ dlls/quartz/vmr9.c | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1f0af817f0..4422a1f914 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1366,12 +1366,8 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = 16; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + vih.bmiHeader.biBitCount = 32; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); if (hr == VFW_E_TYPE_NOT_ACCEPTED) /* w7u */ diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index fae824b827..69065d3576 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1618,20 +1618,10 @@ static void test_connect_pin(void) req_mt.subtype = MEDIASUBTYPE_RGB8; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_WAVE; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_RGB32; peer = (IPin *)0xdeadbeef; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 09d63b6a71..e49266c30c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -424,7 +424,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE default: FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); free(filter->surfaces); - return E_INVALIDARG; + return VFW_E_TYPE_NOT_ACCEPTED; } info.dwFlags = VMR9AllocFlag_TextureSurface; @@ -456,7 +456,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } free(filter->surfaces); - return hr; + return VFW_E_TYPE_NOT_ACCEPTED; } static void vmr_start_stream(struct strmbase_renderer *iface)

1 0

Zebediah Figura : quartz/vmr9: Support YUV formats in the VMR7.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 8fcdca9dd533b1bd74eb41bcca87e354198bef6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fcdca9dd533b1bd74eb41bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:42 2020 -0500 quartz/vmr9: Support YUV formats in the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e49266c30c..e4db42223e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -417,17 +417,35 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE if (!is_vmr9(filter)) { - switch (filter->bmiheader.biBitCount) + switch (filter->bmiheader.biCompression) { - case 24: info.Format = D3DFMT_R8G8B8; break; - case 32: info.Format = D3DFMT_X8R8G8B8; break; - default: - FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); - free(filter->surfaces); - return VFW_E_TYPE_NOT_ACCEPTED; - } + case BI_RGB: + switch (filter->bmiheader.biBitCount) + { + case 24: info.Format = D3DFMT_R8G8B8; break; + case 32: info.Format = D3DFMT_X8R8G8B8; break; + default: + FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); + free(filter->surfaces); + return VFW_E_TYPE_NOT_ACCEPTED; + } + + info.dwFlags = VMR9AllocFlag_TextureSurface; + break; - info.dwFlags = VMR9AllocFlag_TextureSurface; + case mmioFOURCC('N','V','1','2'): + case mmioFOURCC('U','Y','V','Y'): + case mmioFOURCC('Y','U','Y','2'): + case mmioFOURCC('Y','V','1','2'): + info.Format = filter->bmiheader.biCompression; + info.dwFlags = VMR9AllocFlag_OffscreenSurface; + break; + + default: + WARN("Unhandled video compression %#x.\n", filter->bmiheader.biCompression); + free(filter->surfaces); + return VFW_E_TYPE_NOT_ACCEPTED; + } if (FAILED(hr = initialize_device(filter, &info, count))) free(filter->surfaces); return hr;

1 0

Zebediah Figura : quartz: Change the merit of the default video renderer to 0x800001.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 667af9a2c2d7a084298697a20a930c008163d13d URL: https://source.winehq.org/git/wine.git/?a=commit;h=667af9a2c2d7a084298697a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:43 2020 -0500 quartz: Change the merit of the default video renderer to 0x800001. To match Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 7bae46cb84..f867c4178a 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -189,7 +189,7 @@ static struct regsvr_filter const filter_list[] = { { &CLSID_VideoRendererDefault, &CLSID_LegacyAmFilterCategory, L"Video Renderer", - 0x800000, + 0x800001, { { REG_PINFLAG_B_RENDERER, { { &MEDIATYPE_Video, &GUID_NULL }, { NULL }

1 0

Zebediah Figura : quartz: Don't register the VMR7.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 79c3a24a087b2f73fac42f5218c318fd4d4e4b06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c3a24a087b2f73fac42f52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:44 2020 -0500 quartz: Don't register the VMR7. Oddly, Windows doesn't either. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index f867c4178a..92555630e9 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -198,18 +198,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_VideoMixingRenderer, - &CLSID_LegacyAmFilterCategory, - L"Video Mixing Renderer", - 0x200000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Video, &GUID_NULL }, - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_VideoMixingRenderer9, &CLSID_LegacyAmFilterCategory, L"Video Mixing Renderer 9",

1 0

Rémi Bernon : user32/tests: Add inter-desktop rawinput message tests.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 5daf0efbfe20cc08ea027ddd2b3bbed6d9db05a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5daf0efbfe20cc08ea027ddd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 24 15:28:37 2020 +0200 user32/tests: Add inter-desktop rawinput message tests. Another thread is created to execute the tests, for SetThreadDesktop to succeed consistently. It seems to fail spuriously if it is called from a thread that already created some windows before. This shows that rawinput messages may be dispatched across desktops, but only if the subscribing process has a window in the input desktop, and it is the foreground process (even if the target window may be in another desktop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 119 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3dde3ce3c0..3e57767730 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -50,6 +50,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "ddk/hidsdi.h" @@ -60,6 +61,8 @@ static HWND hWndTest; static LONG timetag = 0x10000000; +#define DESKTOP_ALL_ACCESS 0x01ff + static struct { LONG last_key_down; LONG last_key_up; @@ -1891,6 +1894,11 @@ struct rawinput_test rawinput_tests[] = { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + + /* cross-desktop foreground tests */ + { TRUE, FALSE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, 0, FALSE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, }; static void rawinput_test_process(void) @@ -1927,6 +1935,7 @@ static void rawinput_test_process(void) case 11: case 12: case 13: + case 16: GetCursorPos(&pt); hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, @@ -1960,6 +1969,9 @@ static void rawinput_test_process(void) rawinput_test_received_raw = FALSE; rawinput_test_received_rawfg = FALSE; + /* fallthrough */ + case 14: + case 15: if (i != 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); break; @@ -1998,19 +2010,87 @@ static void rawinput_test_process(void) struct rawinput_test_thread_params { + HDESK desk; HANDLE ready; HANDLE start; HANDLE done; }; +static DWORD WINAPI rawinput_test_desk_thread(void *arg) +{ + struct rawinput_test_thread_params *params = arg; + RAWINPUTDEVICE raw_devices[1]; + DWORD ret; + POINT pt; + HWND hwnd = NULL; + MSG msg; + int i; + + ok( SetThreadDesktop( params->desk ), "SetThreadDesktop failed\n" ); + + for (i = 14; i < ARRAY_SIZE(rawinput_tests); ++i) + { + WaitForSingleObject(params->ready, INFINITE); + ResetEvent(params->ready); + + switch (i) + { + case 14: + case 15: + case 16: + GetCursorPos(&pt); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + empty_message_queue(); + + /* FIXME: Try to workaround X11/Win32 focus inconsistencies and + * make the window visible and foreground as hard as possible. */ + ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + UpdateWindow(hwnd); + empty_message_queue(); + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = rawinput_tests[i].register_flags; + raw_devices[0].hwndTarget = rawinput_tests[i].register_window ? hwnd : 0; + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + break; + } + + SetEvent(params->start); + + while (MsgWaitForMultipleObjects(1, &params->done, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + ResetEvent(params->done); + if (hwnd) DestroyWindow(hwnd); + } + + return 0; +} + static DWORD WINAPI rawinput_test_thread(void *arg) { struct rawinput_test_thread_params *params = arg; + HANDLE thread; POINT pt; HWND hwnd = NULL; int i; - for (i = 0; i < ARRAY_SIZE(rawinput_tests); ++i) + for (i = 0; i < 14; ++i) { WaitForSingleObject(params->ready, INFINITE); ResetEvent(params->ready); @@ -2046,6 +2126,11 @@ static DWORD WINAPI rawinput_test_thread(void *arg) if (hwnd) DestroyWindow(hwnd); } + thread = CreateThread(NULL, 0, rawinput_test_desk_thread, params, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + return 0; } @@ -2063,6 +2148,9 @@ static void test_rawinput(const char* argv0) char path[MAX_PATH]; int i; + params.desk = CreateDesktopA( "rawinput_test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( params.desk != NULL, "CreateDesktopA failed, last error: %u\n", GetLastError() ); + params.ready = CreateEventA(NULL, FALSE, FALSE, NULL); ok(params.ready != NULL, "CreateEvent failed\n"); @@ -2103,7 +2191,8 @@ static void test_rawinput(const char* argv0) hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); ok(hwnd != 0, "CreateWindow failed\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + if (i != 14 && i != 15 && i != 16) + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); empty_message_queue(); /* FIXME: Try to workaround X11/Win32 focus inconsistencies and @@ -2135,14 +2224,30 @@ static void test_rawinput(const char* argv0) ok(!skipped, "%d: RegisterRawInputDevices failed: %u\n", i, GetLastError()); } - SetEvent(process_ready); - WaitForSingleObject(process_start, INFINITE); - ResetEvent(process_start); - SetEvent(params.ready); WaitForSingleObject(params.start, INFINITE); ResetEvent(params.start); + /* we need the main window to be over the other thread window, as although + * it is in another desktop, it will receive the messages directly otherwise */ + switch (i) + { + case 14: + case 15: + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + empty_message_queue(); + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + break; + } + + SetEvent(process_ready); + WaitForSingleObject(process_start, INFINITE); + ResetEvent(process_start); + if (i <= 3 || i == 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); @@ -2192,6 +2297,8 @@ static void test_rawinput(const char* argv0) CloseHandle(params.start); CloseHandle(params.ready); CloseHandle(thread); + + CloseDesktop(params.desk); } static void test_key_map(void)

1 0

Rémi Bernon : server: Implement rawinput inter-process message dispatch.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 57124b9905bbdedfdd0bca777481d570ffa1769a URL: https://source.winehq.org/git/wine.git/?a=commit;h=57124b9905bbdedfdd0bca77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 24 15:28:38 2020 +0200 server: Implement rawinput inter-process message dispatch. This delivers the rawinput messages to the correct process, regardless of where the input was received. As for now RIDEV_INPUTSINK is still not implemented, this only fixes the case where input is injected in a background process and where it should not receive rawinput -as in the test- or when cursor moves over a background window and the foreground process should have received rawinput messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 +- server/queue.c | 85 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3e57767730..e43e72532a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1885,7 +1885,7 @@ struct rawinput_test rawinput_tests[] = /* cross-process foreground tests */ { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, - { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, TRUE, TRUE }, + { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, /* multi-process rawinput tests */ { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, diff --git a/server/queue.c b/server/queue.c index 84ee0f9a4e..87c9267d58 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1596,13 +1596,58 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa return 1; } +/* get the foreground thread for a desktop and a window receiving input */ +static struct thread *get_foreground_thread( struct desktop *desktop, user_handle_t window ) +{ + /* if desktop has no foreground process, assume the receiving window is */ + if (desktop->foreground_input) return get_window_thread( desktop->foreground_input->focus ); + if (window) return get_window_thread( window ); + return NULL; +} + +struct rawinput_message +{ + struct thread *foreground; + struct desktop *desktop; + struct hw_msg_source source; + unsigned int time; + struct hardware_msg_data data; +}; + +/* check if process is supposed to receive a WM_INPUT message and eventually queue it */ +static int queue_rawinput_message( struct process* process, void *arg ) +{ + const struct rawinput_message* raw_msg = arg; + const struct rawinput_device *device = NULL; + struct message *msg; + + if (raw_msg->data.rawinput.type == RIM_TYPEMOUSE) + device = process->rawinput_mouse; + else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) + device = process->rawinput_kbd; + if (!device) return 0; + + if (!(msg = alloc_hardware_message( raw_msg->data.info, raw_msg->source, raw_msg->time ))) + return 0; + + msg->win = device->target; + msg->msg = WM_INPUT; + msg->wparam = RIM_INPUT; + msg->lparam = 0; + memcpy( msg->data, &raw_msg->data, sizeof(raw_msg->data) ); + + queue_hardware_message( raw_msg->desktop, msg, 1 ); + return 0; +} + /* queue a hardware message for a mouse event */ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, unsigned int origin, struct msg_queue *sender ) { - const struct rawinput_device *device; struct hardware_msg_data *msg_data; + struct rawinput_message raw_msg; struct message *msg; + struct thread *foreground; unsigned int i, time, flags; struct hw_msg_source source = { IMDT_MOUSE, origin }; int wait = 0, x, y; @@ -1651,23 +1696,23 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons y = desktop->cursor.y; } - if ((device = current->process->rawinput_mouse)) + if ((foreground = get_foreground_thread( desktop, win ))) { - if (!(msg = alloc_hardware_message( input->mouse.info, source, time ))) return 0; - msg_data = msg->data; - - msg->win = device->target; - msg->msg = WM_INPUT; - msg->wparam = RIM_INPUT; - msg->lparam = 0; + raw_msg.foreground = foreground; + raw_msg.desktop = desktop; + raw_msg.source = source; + raw_msg.time = time; + msg_data = &raw_msg.data; + msg_data->info = input->mouse.info; msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; msg_data->rawinput.mouse.y = y - desktop->cursor.y; msg_data->rawinput.mouse.data = input->mouse.data; - queue_hardware_message( desktop, msg, 0 ); + queue_rawinput_message( foreground->process, &raw_msg ); + release_object( foreground ); } for (i = 0; i < ARRAY_SIZE( messages ); i++) @@ -1704,9 +1749,10 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c unsigned int origin, struct msg_queue *sender ) { struct hw_msg_source source = { IMDT_KEYBOARD, origin }; - const struct rawinput_device *device; struct hardware_msg_data *msg_data; + struct rawinput_message raw_msg; struct message *msg; + struct thread *foreground; unsigned char vkey = input->kbd.vkey; unsigned int message_code, time; int wait; @@ -1777,22 +1823,23 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } - if ((device = current->process->rawinput_kbd)) + if ((foreground = get_foreground_thread( desktop, win ))) { - if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; - msg_data = msg->data; - - msg->win = device->target; - msg->msg = WM_INPUT; - msg->wparam = RIM_INPUT; + raw_msg.foreground = foreground; + raw_msg.desktop = desktop; + raw_msg.source = source; + raw_msg.time = time; + msg_data = &raw_msg.data; + msg_data->info = input->kbd.info; msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; msg_data->rawinput.kbd.vkey = vkey; msg_data->rawinput.kbd.scan = input->kbd.scan; - queue_hardware_message( desktop, msg, 0 ); + queue_rawinput_message( foreground->process, &raw_msg ); + release_object( foreground ); } if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0;

1 0

Rémi Bernon : server: Split cursor position update to update_desktop_cursor_pos.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: b48887bb014bf9e5bd336d533f33e8e7493afbd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b48887bb014bf9e5bd336d53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 24 15:28:39 2020 +0200 server: Split cursor position update to update_desktop_cursor_pos. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/server/queue.c b/server/queue.c index 87c9267d58..7fd3be1662 100644 --- a/server/queue.c +++ b/server/queue.c @@ -366,6 +366,20 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour return msg; } +static int update_desktop_cursor_pos( struct desktop *desktop, int x, int y ) +{ + int updated; + + x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + y = max( min( y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); + updated = (desktop->cursor.x != x || desktop->cursor.y != y); + desktop->cursor.x = x; + desktop->cursor.y = y; + desktop->cursor.last_change = get_tick_count(); + + return updated; +} + /* set the cursor position and queue the corresponding mouse message */ static void set_cursor_pos( struct desktop *desktop, int x, int y ) { @@ -1500,15 +1514,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } else if (msg->msg != WM_INPUT) { - if (msg->msg == WM_MOUSEMOVE) - { - int x = max( min( msg->x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); - int y = max( min( msg->y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); - if (desktop->cursor.x != x || desktop->cursor.y != y) always_queue = 1; - desktop->cursor.x = x; - desktop->cursor.y = y; - desktop->cursor.last_change = get_tick_count(); - } + if (msg->msg == WM_MOUSEMOVE && update_desktop_cursor_pos( desktop, msg->x, msg->y )) always_queue = 1; if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; if (desktop->keystate[VK_MBUTTON] & 0x80) msg->wparam |= MK_MBUTTON; if (desktop->keystate[VK_RBUTTON] & 0x80) msg->wparam |= MK_RBUTTON;

1 0