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

Gijs Vermeulen : amstream: Create ddraw if no source object was specified in ddraw_IAMMediaStream_Initialize().
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: b2c74e0ccac6eb6a63d27b7e1527b20d5b387101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c74e0ccac6eb6a63d27b7e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 25 20:57:00 2020 +0200 amstream: Create ddraw if no source object was specified in ddraw_IAMMediaStream_Initialize(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 14 +++++++++----- dlls/amstream/tests/amstream.c | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 15bd3af0a9..56230ca4e6 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -218,6 +218,13 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr); + if (!source_object) + { + if (FAILED(hr = DirectDrawCreate(NULL, &stream->ddraw, NULL))) + return hr; + IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL); + } + return S_OK; } @@ -381,13 +388,10 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi if (!ddraw) return E_POINTER; - *ddraw = NULL; if (!stream->ddraw) { - HRESULT hr = DirectDrawCreate(NULL, &stream->ddraw, NULL); - if (FAILED(hr)) - return hr; - IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL); + *ddraw = NULL; + return S_OK; } IDirectDraw_AddRef(stream->ddraw); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5e5b9ac2f5..9a97b6be65 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4803,8 +4803,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3); - if (ddraw3) IDirectDraw_Release(ddraw3); + ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3); hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Brendan Shanks : api-ms-win-core-namedpipe-ansi-l1-1-0: Add stub dll.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: fe4379eb19a201d45bc0d2d51270db133fd23a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4379eb19a201d45bc0d2d5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jun 25 10:21:51 2020 -0700 api-ms-win-core-namedpipe-ansi-l1-1-0: Add stub dll. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-namedpipe-ansi-l1-1-0.spec | 3 +++ 4 files changed, 7 insertions(+) diff --git a/configure b/configure index 106ce1625b..ee0439425a 100755 --- a/configure +++ b/configure @@ -987,6 +987,7 @@ enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_memory_l1_1_2 enable_api_ms_win_core_memory_l1_1_4 enable_api_ms_win_core_misc_l1_1_0 +enable_api_ms_win_core_namedpipe_ansi_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_namespace_l1_1_0 @@ -20317,6 +20318,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-1 enable_api_ms_win_cor wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-4 enable_api_ms_win_core_memory_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-ansi-l1-1-0 enable_api_ms_win_core_namedpipe_ansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-namespace-l1-1-0 enable_api_ms_win_core_namespace_l1_1_0 diff --git a/configure.ac b/configure.ac index a78610c649..3c03bad292 100644 --- a/configure.ac +++ b/configure.ac @@ -2903,6 +2903,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in new file mode 100644 index 0000000000..6a86fa59ec --- /dev/null +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-namedpipe-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec new file mode 100644 index 0000000000..d1e0b146dc --- /dev/null +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub GetNamedPipeClientComputerNameA +@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) kernel32.GetNamedPipeHandleStateA +@ stdcall WaitNamedPipeA (str long) kernel32.WaitNamedPipeA

1 0

Gijs Vermeulen : amstream: Implement IDirectDrawMediaStream::SetDirectDraw().
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 51fce87c607d92300bb6b3f7674e7e6c775c86ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=51fce87c607d92300bb6b3f7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 25 20:56:59 2020 +0200 amstream: Implement IDirectDrawMediaStream::SetDirectDraw(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 40 ++++++++++++++++-- dlls/amstream/tests/amstream.c | 95 ++++++++++++++++++++---------------------- 2 files changed, 83 insertions(+), 52 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index f1b6d37d08..15bd3af0a9 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -35,6 +35,7 @@ struct ddraw_stream IMemInputPin IMemInputPin_iface; IPin IPin_iface; LONG ref; + LONG sample_refs; IMultiMediaStream* parent; MSPID purpose_id; @@ -396,11 +397,35 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, - IDirectDraw *pDirectDraw) + IDirectDraw *ddraw) { - FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - return E_NOTIMPL; + TRACE("stream %p, ddraw %p.\n", stream, ddraw); + + EnterCriticalSection(&stream->cs); + + if (stream->sample_refs) + { + HRESULT hr = (stream->ddraw == ddraw) ? S_OK : MS_E_SAMPLEALLOC; + LeaveCriticalSection(&stream->cs); + return hr; + } + + if (stream->ddraw) + IDirectDraw_Release(stream->ddraw); + + if (ddraw) + { + IDirectDraw_AddRef(ddraw); + stream->ddraw = ddraw; + } + else + stream->ddraw = NULL; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, @@ -951,6 +976,7 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->sample_refs = 0; InitializeCriticalSection(&object->cs); @@ -1013,6 +1039,10 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); + EnterCriticalSection(&sample->parent->cs); + InterlockedDecrement(&sample->parent->sample_refs); + LeaveCriticalSection(&sample->parent->cs); + if (!ref) { if (sample->surface) @@ -1131,6 +1161,10 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->ref = 1; object->parent = parent; + EnterCriticalSection(&parent->cs); + InterlockedIncrement(&parent->sample_refs); + LeaveCriticalSection(&parent->cs); + if (surface) { object->surface = surface; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index d19174f12c..5e5b9ac2f5 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4798,8 +4798,8 @@ static void test_ddrawstream_getsetdirectdraw(void) /* The current ddraw is released when SetDirectDraw() is called. */ hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4807,65 +4807,62 @@ static void test_ddrawstream_getsetdirectdraw(void) if (ddraw3) IDirectDraw_Release(ddraw3); hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); EXPECT_REF(ddraw, 3); - if (hr == S_OK) - { - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); - EXPECT_REF(ddraw, 4); - IDirectDraw_Release(ddraw3); - EXPECT_REF(ddraw, 3); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + EXPECT_REF(ddraw, 3); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); - ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); - /* SetDirectDraw() doesn't take an extra reference to the ddraw object - * if there are samples extant. */ - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 3); + /* SetDirectDraw() doesn't take an extra reference to the ddraw object + * if there are samples extant. */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 3); - hr = DirectDrawCreate(NULL, &ddraw3, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); - ok(hr == DD_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw3, 1); + hr = DirectDrawCreate(NULL, &ddraw3, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); - ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); - EXPECT_REF(ddraw, 4); - IDirectDraw_Release(ddraw4); - EXPECT_REF(ddraw, 3); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw, 3); - ref = IDirectDrawStreamSample_Release(sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 2); - EXPECT_REF(ddraw3, 2); + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw3, 2); - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); - EXPECT_REF(ddraw3, 3); - IDirectDraw_Release(ddraw4); - EXPECT_REF(ddraw3, 2); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); + EXPECT_REF(ddraw3, 3); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw3, 2); - hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw3, 1); + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); - ref = IDirectDraw_Release(ddraw3); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + ref = IDirectDraw_Release(ddraw3); + ok(!ref, "Got outstanding refcount %d.\n", ref); EXPECT_REF(stream, 3); IDirectDrawMediaStream_Release(ddraw_stream);

1 0

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

June 25, 2020

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

Gabriel Ivăncescu : msscript.ocx: Implement parse_script_text on top of modules.
by Alexandre Julliard June 25, 2020

June 25, 2020

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

Gabriel Ivăncescu : msscript.ocx: Move parse_script_text up.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: e61a2a2fc0a7822de02fb84c6c43404e3a4f4b36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61a2a2fc0a7822de02fb84c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:27 2020 +0300 msscript.ocx: Move parse_script_text up. 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 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index e8c0f0af77..4460afc808 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -291,6 +291,20 @@ 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) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + hr = start_script(host); + if (FAILED(hr)) return hr; + + hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error handling */ + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1555,20 +1569,6 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } -static HRESULT parse_script_text(ScriptHost *host, BSTR script_text, DWORD flag, VARIANT *res) -{ - EXCEPINFO excepinfo; - HRESULT hr; - - hr = start_script(host); - if (FAILED(hr)) return hr; - - hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL, - NULL, NULL, 0, 1, flag, res, &excepinfo); - /* FIXME: more error handling */ - return hr; -} - static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface);

1 0

Nikolay Sivov : evr: Add IMFVideoPositionMapper stub.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: cd1cf07c80dd896328f0545e78d66541cef058a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1cf07c80dd896328f0545e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:58:01 2020 +0300 evr: Add IMFVideoPositionMapper stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1bc4f47040..7663a28ab1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -48,6 +48,7 @@ struct video_mixer IMFVideoMixerControl2 IMFVideoMixerControl2_iface; IMFGetService IMFGetService_iface; IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; + IMFVideoPositionMapper IMFVideoPositionMapper_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -89,6 +90,11 @@ static struct video_mixer *impl_from_IMFVideoMixerBitmap(IMFVideoMixerBitmap *if return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerBitmap_iface); } +static struct video_mixer *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapper *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoPositionMapper_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -142,6 +148,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoMixerBitmap_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { + *obj = &mixer->IMFVideoPositionMapper_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -858,6 +868,40 @@ static const IMFVideoMixerBitmapVtbl video_mixer_bitmap_vtbl = video_mixer_bitmap_GetAlphaBitmapParameters, }; +static HRESULT WINAPI video_mixer_position_mapper_QueryInterface(IMFVideoPositionMapper *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoPositionMapper(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_position_mapper_AddRef(IMFVideoPositionMapper *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoPositionMapper(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_position_mapper_Release(IMFVideoPositionMapper *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoPositionMapper(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface, + float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in) +{ + FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); + + return E_NOTIMPL; +} + +static const IMFVideoPositionMapperVtbl video_mixer_position_mapper_vtbl = +{ + video_mixer_position_mapper_QueryInterface, + video_mixer_position_mapper_AddRef, + video_mixer_position_mapper_Release, + video_mixer_position_mapper_MapOutputCoordinateToInputStream, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -886,6 +930,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; + object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 4e97f65be0..4f954d868a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -405,10 +405,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); todo_wine

1 0

Nikolay Sivov : evr: Add IMFVideoMixerBitmap stub.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: a9431eb0a2f787faa6a18a6a8f0f24136f1fc531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9431eb0a2f787faa6a18a6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:58:00 2020 +0300 evr: Add IMFVideoMixerBitmap stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +-- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c835a62ad9..1bc4f47040 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -27,6 +27,9 @@ #include "evr_classes.h" +#include "initguid.h" +#include "evr9.h" + WINE_DEFAULT_DEBUG_CHANNEL(evr); #define MAX_MIXER_INPUT_STREAMS 16 @@ -44,6 +47,7 @@ struct video_mixer IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoMixerControl2 IMFVideoMixerControl2_iface; IMFGetService IMFGetService_iface; + IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -80,6 +84,11 @@ static struct video_mixer *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFGetService_iface); } +static struct video_mixer *impl_from_IMFVideoMixerBitmap(IMFVideoMixerBitmap *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerBitmap_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -129,6 +138,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFGetService_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap)) + { + *obj = &mixer->IMFVideoMixerBitmap_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -787,6 +800,64 @@ static const IMFGetServiceVtbl video_mixer_getservice_vtbl = video_mixer_getservice_GetService, }; +static HRESULT WINAPI video_mixer_bitmap_QueryInterface(IMFVideoMixerBitmap *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerBitmap(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_bitmap_AddRef(IMFVideoMixerBitmap *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerBitmap(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_bitmap_Release(IMFVideoMixerBitmap *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerBitmap(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_bitmap_SetAlphaBitmap(IMFVideoMixerBitmap *iface, const MFVideoAlphaBitmap *bitmap) +{ + FIXME("%p, %p.\n", iface, bitmap); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_bitmap_ClearAlphaBitmap(IMFVideoMixerBitmap *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_bitmap_UpdateAlphaBitmapParameters(IMFVideoMixerBitmap *iface, + const MFVideoAlphaBitmapParams *params) +{ + FIXME("%p, %p.\n", iface, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_bitmap_GetAlphaBitmapParameters(IMFVideoMixerBitmap *iface, MFVideoAlphaBitmapParams *params) +{ + FIXME("%p, %p.\n", iface, params); + + return E_NOTIMPL; +} + +static const IMFVideoMixerBitmapVtbl video_mixer_bitmap_vtbl = +{ + video_mixer_bitmap_QueryInterface, + video_mixer_bitmap_AddRef, + video_mixer_bitmap_Release, + video_mixer_bitmap_SetAlphaBitmap, + video_mixer_bitmap_ClearAlphaBitmap, + video_mixer_bitmap_UpdateAlphaBitmapParameters, + video_mixer_bitmap_GetAlphaBitmapParameters, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -814,6 +885,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; + object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5ea1f1a644..4e97f65be0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -401,10 +401,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); todo_wine

1 0

Nikolay Sivov : evr: Add IMFGetService stub for the mixer.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: e4791f6f9bc02341b9bc6953b05a5c1050443a33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4791f6f9bc02341b9bc6953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:57:59 2020 +0300 evr: Add IMFGetService stub for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a65e82d4ca..c835a62ad9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -43,6 +43,7 @@ struct video_mixer IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoMixerControl2 IMFVideoMixerControl2_iface; + IMFGetService IMFGetService_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -74,6 +75,11 @@ static struct video_mixer *impl_from_IMFVideoMixerControl2(IMFVideoMixerControl2 return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerControl2_iface); } +static struct video_mixer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFGetService_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -119,6 +125,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoMixerControl2_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &mixer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -744,6 +754,39 @@ static const IMFVideoMixerControl2Vtbl video_mixer_control_vtbl = video_mixer_control_GetMixingPrefs, }; +static HRESULT WINAPI video_mixer_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFGetService(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_getservice_AddRef(IMFGetService *iface) +{ + struct video_mixer *mixer = impl_from_IMFGetService(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_getservice_Release(IMFGetService *iface) +{ + struct video_mixer *mixer = impl_from_IMFGetService(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_mixer_getservice_vtbl = +{ + video_mixer_getservice_QueryInterface, + video_mixer_getservice_AddRef, + video_mixer_getservice_Release, + video_mixer_getservice_GetService, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -770,6 +813,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; + object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6e51dba992..5ea1f1a644 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -397,10 +397,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); todo_wine

1 0

Nikolay Sivov : evr/tests: Add some tests for supported mixer interfaces.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: c8b3ae700bda3c6588a536d58df2beda7e60b8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b3ae700bda3c6588a536d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:57:58 2020 +0300 evr/tests: Add some tests for supported mixer interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 44819c1b38..6e51dba992 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -27,7 +27,7 @@ #include "mferror.h" #include "mfapi.h" #include "initguid.h" -#include "dxva2api.h" +#include "evr9.h" static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; @@ -396,6 +396,30 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0