August 2022 - Wine-commits - list.winehq.org

Zebediah Figura : include: Add list_move_after() and list_move_before().
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 099f84c4f07b67b63ff047dc230b916d565d1a9e URL: https://gitlab.winehq.org/wine/wine/-/commit/099f84c4f07b67b63ff047dc230b91… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 30 21:37:32 2022 +0200 include: Add list_move_after() and list_move_before(). Cherry-picked from vkd3d commit a2996c2d59b140a0a92efc85d43c8f9b59540a12. --- include/wine/list.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index b4d681fe0f3..5e92cfb253c 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -150,8 +150,8 @@ static inline unsigned int list_count( const struct list *list ) return count; } -/* move all elements from src to the tail of dst */ -static inline void list_move_tail( struct list *dst, struct list *src ) +/* move all elements from src to before the specified element */ +static inline void list_move_before( struct list *dst, struct list *src ) { if (list_empty(src)) return; @@ -162,8 +162,8 @@ static inline void list_move_tail( struct list *dst, struct list *src ) list_init(src); } -/* move all elements from src to the head of dst */ -static inline void list_move_head( struct list *dst, struct list *src ) +/* move all elements from src to after the specified element */ +static inline void list_move_after( struct list *dst, struct list *src ) { if (list_empty(src)) return; @@ -174,6 +174,18 @@ static inline void list_move_head( struct list *dst, struct list *src ) list_init(src); } +/* move all elements from src to the head of dst */ +static inline void list_move_head( struct list *dst, struct list *src ) +{ + list_move_after( dst, src ); +} + +/* move all elements from src to the tail of dst */ +static inline void list_move_tail( struct list *dst, struct list *src ) +{ + list_move_before( dst, src ); +} + /* iterate through the list */ #define LIST_FOR_EACH(cursor,list) \ for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next)

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove some flaky refcount checks.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: 6dc873bcaeed77dfaabc6f9d51cdd9fd56cd1a32 URL: https://gitlab.winehq.org/wine/wine/-/commit/6dc873bcaeed77dfaabc6f9d51cdd9… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Aug 23 13:33:06 2022 +0200 windows.media.speech/tests: Remove some flaky refcount checks. They can fail, when the recognition session outlives the test function, which is expected to happen, as the session is concurrent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53458 --- dlls/windows.media.speech/tests/speech.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 0d67c8b7cdb..75f0007089e 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1777,17 +1777,10 @@ skip_action: hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); - ref = ISpeechContinuousRecognitionSession_Release(session); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); - - ref = ISpeechRecognizer2_Release(recognizer2); - ok(ref == 2, "Got unexpected ref %lu.\n", ref); - - ref = ISpeechRecognizer_Release(recognizer); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); - - ref = IInspectable_Release(inspectable); - ok(!ref, "Got unexpected ref %lu.\n", ref); + ISpeechContinuousRecognitionSession_Release(session); + ISpeechRecognizer2_Release(recognizer2); + ISpeechRecognizer_Release(recognizer); + IInspectable_Release(inspectable); done: for (i = 0; i < ARRAY_SIZE(commands); i++)

1 0

Bernhard Kölbl : windows.media.speech: Add missing async_void_Release implementation.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: df9fc8958fcd5762a94e9dee2fdeacafa92ec85a URL: https://gitlab.winehq.org/wine/wine/-/commit/df9fc8958fcd5762a94e9dee2fdeac… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed May 25 18:25:51 2022 +0200 windows.media.speech: Add missing async_void_Release implementation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/async.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 5d20fe482f1..3c5f450cc65 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -93,6 +93,21 @@ ULONG WINAPI async_void_Release( IAsyncAction *iface ) struct async_void *impl = impl_from_IAsyncAction(iface); ULONG ref = InterlockedDecrement(&impl->ref); TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IAsyncInfo_Close(&impl->IAsyncInfo_iface); + + if (impl->invoker) + IInspectable_Release(impl->invoker); + if (impl->handler && impl->handler != HANDLER_NOT_SET) + IAsyncActionCompletedHandler_Release(impl->handler); + + impl->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&impl->cs); + free(impl); + } + return ref; } @@ -127,7 +142,7 @@ HRESULT WINAPI async_void_put_Completed( IAsyncAction *iface, IAsyncActionComple else if (impl->handler != HANDLER_NOT_SET) hr = E_ILLEGAL_DELEGATE_ASSIGNMENT; /* - impl->handler can only be set once with async_operation_put_Completed, + impl->handler can only be set once with async_void_put_Completed, so by default we set a non HANDLER_NOT_SET value, in this case handler. */ else if ((impl->handler = handler)) @@ -445,6 +460,7 @@ static ULONG WINAPI async_inspectable_Release( IAsyncOperation_IInspectable *ifa if (impl->result) IInspectable_Release(impl->result); + impl->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&impl->cs); free(impl); }

1 0

Bernhard Kölbl : include/windows.media.speechsynthesis.idl: Add missing interfaces to SpeechSynthesizerOptions runtimeclass.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: 958b3da947830680deec5071a7f5030da7de1bbb URL: https://gitlab.winehq.org/wine/wine/-/commit/958b3da947830680deec5071a7f503… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Aug 23 15:13:47 2022 +0200 include/windows.media.speechsynthesis.idl: Add missing interfaces to SpeechSynthesizerOptions runtimeclass. And their dependencies. --- include/windows.media.speechsynthesis.idl | 57 +++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index c4a0eb06106..135cc8f3765 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -27,11 +27,16 @@ import "windows.storage.streams.idl"; namespace Windows.Media.SpeechSynthesis { + typedef enum SpeechAppendedSilence SpeechAppendedSilence; + typedef enum SpeechPunctuationSilence SpeechPunctuationSilence; typedef enum VoiceGender VoiceGender; interface IInstalledVoicesStatic; interface IInstalledVoicesStatic2; interface ISpeechSynthesizer; interface ISpeechSynthesizer2; + interface ISpeechSynthesizerOptions; + interface ISpeechSynthesizerOptions2; + interface ISpeechSynthesizerOptions3; interface IVoiceInformation; interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; @@ -48,6 +53,24 @@ namespace Windows.Media.SpeechSynthesis interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } + [ + contract(Windows.Foundation.UniversalApiContract, 6.0) + ] + enum SpeechAppendedSilence + { + Default = 0, + Min = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0) + ] + enum SpeechPunctuationSilence + { + Default = 0, + Min = 1, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -112,7 +135,7 @@ namespace Windows.Media.SpeechSynthesis } [ - contract(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 4.0), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), uuid(a0e23871-cc3d-43c9-91b1-ee185324d83d) ] @@ -124,6 +147,34 @@ namespace Windows.Media.SpeechSynthesis [propput] HRESULT IncludeSentenceBoundaryMetadata([in] boolean value); } + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), + uuid(1cbef60e-119c-4bed-b118-d250c3a25793), + ] + interface ISpeechSynthesizerOptions2 : IInspectable + { + [propget] HRESULT AudioVolume([out, retval] DOUBLE *value); + [propput] HRESULT AudioVolume([in] DOUBLE value); + [propget] HRESULT SpeakingRate([out, retval] DOUBLE *value); + [propput] HRESULT SpeakingRate([in] DOUBLE value); + [propget] HRESULT AudioPitch([out, retval] DOUBLE *value); + [propput] HRESULT AudioPitch([in] DOUBLE value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), + uuid(401ed877-902c-4814-a582-a5d0c0769fa8) + ] + interface ISpeechSynthesizerOptions3 : IInspectable + { + [propget] HRESULT AppendedSilence([out, retval] Windows.Media.SpeechSynthesis.SpeechAppendedSilence *value); + [propput] HRESULT AppendedSilence([in] Windows.Media.SpeechSynthesis.SpeechAppendedSilence value); + [propget] HRESULT PunctuationSilence([out, retval] Windows.Media.SpeechSynthesis.SpeechPunctuationSilence *value); + [propput] HRESULT PunctuationSilence([in] Windows.Media.SpeechSynthesis.SpeechPunctuationSilence value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), @@ -145,12 +196,14 @@ namespace Windows.Media.SpeechSynthesis } [ - contract(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 4.0), marshaling_behavior(agile) ] runtimeclass SpeechSynthesizerOptions { [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions; + [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions2; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions3; } [

1 0

Bernhard Kölbl : windows.media.speech/tests: Add basic query tests for SpeechSynthesizerOptions.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: b2b0e7ee99ebc125bf94f5c33a6fb6d57d83f7b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2b0e7ee99ebc125bf94f5c33a6fb6… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Aug 23 13:08:26 2022 +0200 windows.media.speech/tests: Add basic query tests for SpeechSynthesizerOptions. --- dlls/windows.media.speech/tests/speech.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 75f0007089e..548012fd29b 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -73,8 +73,9 @@ static inline void check_refcount_(unsigned int line, void *obj, LONG exp) ok_(__FILE__, line)(exp == ref, "Unexpected refcount %lu, expected %lu\n", ref, exp); } -#define check_interface(obj, iid, exp) check_interface_(__LINE__, obj, iid, exp) -static void check_interface_(unsigned int line, void *obj, const IID *iid, BOOL supported) +#define check_interface(obj, iid, exp) check_interface_(__LINE__, obj, iid, exp, FALSE) +#define check_optional_interface(obj, iid, exp) check_interface_(__LINE__, obj, iid, exp, TRUE) +static void check_interface_(unsigned int line, void *obj, const IID *iid, BOOL supported, BOOL optional) { IUnknown *iface = obj; HRESULT hr, expected_hr; @@ -83,7 +84,7 @@ static void check_interface_(unsigned int line, void *obj, const IID *iid, BOOL expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr || broken(hr == E_NOINTERFACE && optional), "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -1017,11 +1018,27 @@ static void test_SpeechSynthesizer(void) hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Test ISpeechSynthesizer2 iface */ hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer2, (void **)&synthesizer2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr); /* Requires Win10 >= 1703 */ if (hr == S_OK) { + ISpeechSynthesizerOptions *options; + + hr = ISpeechSynthesizer2_get_Options(synthesizer2, &options); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + if (hr == S_OK) + { + check_interface(options, &IID_IAgileObject, TRUE); + check_optional_interface(options, &IID_ISpeechSynthesizerOptions2, TRUE); /* Requires Win10 >= 1709 */ + check_optional_interface(options, &IID_ISpeechSynthesizerOptions3, TRUE); /* Requires Win10 >= 1803 */ + + ref = ISpeechSynthesizerOptions_Release(options); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); + } + ref = ISpeechSynthesizer2_Release(synthesizer2); ok(ref == 3, "Got unexpected ref %lu.\n", ref); }

1 0

Bernhard Kölbl : windows.media.speech/tests: Skip SpeechRecognitionListConstraint tests on Win10 1709 x32 and below.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: cb2dfa437dce7dad8a1e909f2fae9e0f18a1cc94 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb2dfa437dce7dad8a1e909f2fae9e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Aug 23 13:20:00 2022 +0200 windows.media.speech/tests: Skip SpeechRecognitionListConstraint tests on Win10 1709 x32 and below. --- dlls/windows.media.speech/tests/speech.c | 35 +++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 548012fd29b..464faaf819a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -59,6 +59,7 @@ HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); static BOOL is_win10_1507 = FALSE; +static BOOL is_win10_1709 = FALSE; static inline LONG get_ref(IUnknown *obj) { @@ -1031,9 +1032,21 @@ static void test_SpeechSynthesizer(void) if (hr == S_OK) { + ISpeechSynthesizerOptions3 *options3; + check_interface(options, &IID_IAgileObject, TRUE); check_optional_interface(options, &IID_ISpeechSynthesizerOptions2, TRUE); /* Requires Win10 >= 1709 */ - check_optional_interface(options, &IID_ISpeechSynthesizerOptions3, TRUE); /* Requires Win10 >= 1803 */ + + hr = ISpeechSynthesizerOptions_QueryInterface(options, &IID_ISpeechSynthesizerOptions3, (void **)&options3); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr); /* Requires Win10 >= 1803 */ + + if (hr == S_OK) + { + ref = ISpeechSynthesizerOptions3_Release(options3); + ok(ref == 2, "Got unexpected ref %lu.\n", ref); + } + else + is_win10_1709 = TRUE; ref = ISpeechSynthesizerOptions_Release(options); ok(ref == 1, "Got unexpected ref %lu.\n", ref); @@ -1467,10 +1480,14 @@ static void test_SpeechRecognitionListConstraint(void) hr = ISpeechRecognitionListConstraintFactory_CreateWithTag(listconstraint_factory, NULL, NULL, &listconstraint); ok(hr == E_POINTER, "ISpeechRecognitionListConstraintFactory_Create failed, hr %#lx.\n", hr); - /* The create functions on Win10 1507 x32 break when handling the given iterator. Seems like a Windows bug. Skipping these tests. */ - if (broken(is_win10_1507 && (sizeof(void*) == 4))) + /* + * The create functions break on Win10 <= 1709 x32 with the given iterator. + * Seems like a Windows bug, but if you see an issue in the test's code, please FIXME. + * Skipping these tests. + */ + if (broken((is_win10_1507 || is_win10_1709) && (sizeof(void*) == 4))) { - win_skip("SpeechRecognitionListConstraint object creation broken on Win10 1507 x32!\n"); + win_skip("SpeechRecognitionListConstraint object creation broken on Win10 <= 1709 x32!\n"); goto skip_create; } @@ -1618,10 +1635,14 @@ static void test_Recognition(void) ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); } - /* The create functions for ListConstraint are broken on Win10 1507 x32 - abort early.*/ - if (broken(is_win10_1507 && (sizeof(void*) == 4))) + /* + * The create functions break on Win10 <= 1709 x32 with the given iterator. + * Seems like a Windows bug, but if you see an issue in the test's code, please FIXME. + * Skipping these tests. + */ + if (broken((is_win10_1507 || is_win10_1709) && (sizeof(void*) == 4))) { - win_skip("SpeechRecognitionListConstraint object creation broken on Win10 1507 x32!\n"); + win_skip("SpeechRecognitionListConstraint object creation broken on Win10 <= 1709 x32!\n"); goto done; }

1 0

Nikolay Sivov : evr/filter: Add IMediaEventSink stub.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: 27972922c7fa24193cb4ed56dcd6cb664ea4f75e URL: https://gitlab.winehq.org/wine/wine/-/commit/27972922c7fa24193cb4ed56dcd6cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 13:39:59 2022 +0300 evr/filter: Add IMediaEventSink stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 14 +++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 2251cb5522e..97cc2e27915 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -37,6 +37,7 @@ struct evr IAMFilterMiscFlags IAMFilterMiscFlags_iface; IMFGetService IMFGetService_iface; IMFVideoRenderer IMFVideoRenderer_iface; + IMediaEventSink IMediaEventSink_iface; IMFTransform *mixer; IMFVideoPresenter *presenter; @@ -111,6 +112,8 @@ static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IMFGetService_iface; else if (IsEqualGUID(iid, &IID_IMFVideoRenderer)) *out = &filter->IMFVideoRenderer_iface; + else if (IsEqualGUID(iid, &IID_IMediaEventSink)) + *out = &filter->IMediaEventSink_iface; else return E_NOINTERFACE; @@ -348,6 +351,44 @@ static const IMFVideoRendererVtbl filter_video_renderer_vtbl = filter_video_renderer_InitializeRenderer, }; +static struct evr *impl_from_IMediaEventSink(IMediaEventSink *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IMediaEventSink_iface); +} + +static HRESULT WINAPI filter_media_event_sink_QueryInterface(IMediaEventSink *iface, REFIID riid, void **obj) +{ + struct evr *filter = impl_from_IMediaEventSink(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, riid, obj); +} + +static ULONG WINAPI filter_media_event_sink_AddRef(IMediaEventSink *iface) +{ + struct evr *filter = impl_from_IMediaEventSink(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_media_event_sink_Release(IMediaEventSink *iface) +{ + struct evr *filter = impl_from_IMediaEventSink(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI filter_media_event_sink_Notify(IMediaEventSink *iface, LONG event, LONG_PTR param1, LONG_PTR param2) +{ + FIXME("iface %p, event %ld, param1 %Id, param2 %Id.\n", iface, event, param1, param2); + + return E_NOTIMPL; +} + +static const IMediaEventSinkVtbl filter_media_event_sink_vtbl = +{ + filter_media_event_sink_QueryInterface, + filter_media_event_sink_AddRef, + filter_media_event_sink_Release, + filter_media_event_sink_Notify, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -361,6 +402,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) object->IAMFilterMiscFlags_iface.lpVtbl = &filter_misc_flags_vtbl; object->IMFGetService_iface.lpVtbl = &filter_get_service_vtbl; object->IMFVideoRenderer_iface.lpVtbl = &filter_video_renderer_vtbl; + object->IMediaEventSink_iface.lpVtbl = &filter_media_event_sink_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 28a472a8a7f..30f7ba81ee9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -273,7 +273,9 @@ static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID static void test_interfaces(void) { - IBaseFilter *filter = create_evr(); + IBaseFilter *filter = create_evr(), *filter2; + IUnknown *unk; + HRESULT hr; ULONG ref; check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); @@ -284,6 +286,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IMediaEventSink, TRUE); check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE); @@ -296,6 +299,15 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + /* The scope of IMediaEventSink */ + hr = IBaseFilter_QueryInterface(filter, &IID_IMediaEventSink, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(filter == filter2, "Unexpected pointer.\n"); + IBaseFilter_Release(filter2); + IUnknown_Release(unk); + ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %ld.\n", ref); }

1 0

Nikolay Sivov : evr/filter: Add IMFTopologyServiceLookup stub.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: 4d7b3c7861116defacbb91b591d1b658d7461589 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d7b3c7861116defacbb91b591d1b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 14:23:10 2022 +0300 evr/filter: Add IMFTopologyServiceLookup stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 97cc2e27915..734f9621555 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -24,6 +24,7 @@ #include "evr_private.h" #include "d3d9.h" +#include "mferror.h" #include "initguid.h" #include "dxva2api.h" @@ -38,6 +39,7 @@ struct evr IMFGetService IMFGetService_iface; IMFVideoRenderer IMFVideoRenderer_iface; IMediaEventSink IMediaEventSink_iface; + IMFTopologyServiceLookup IMFTopologyServiceLookup_iface; IMFTransform *mixer; IMFVideoPresenter *presenter; @@ -114,6 +116,8 @@ static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IMFVideoRenderer_iface; else if (IsEqualGUID(iid, &IID_IMediaEventSink)) *out = &filter->IMediaEventSink_iface; + else if (IsEqualGUID(iid, &IID_IMFTopologyServiceLookup)) + *out = &filter->IMFTopologyServiceLookup_iface; else return E_NOINTERFACE; @@ -389,6 +393,46 @@ static const IMediaEventSinkVtbl filter_media_event_sink_vtbl = filter_media_event_sink_Notify, }; +static struct evr *impl_from_IMFTopologyServiceLookup(IMFTopologyServiceLookup *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IMFTopologyServiceLookup_iface); +} + +static HRESULT WINAPI filter_service_lookup_QueryInterface(IMFTopologyServiceLookup *iface, REFIID riid, void **obj) +{ + struct evr *filter = impl_from_IMFTopologyServiceLookup(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, riid, obj); +} + +static ULONG WINAPI filter_service_lookup_AddRef(IMFTopologyServiceLookup *iface) +{ + struct evr *filter = impl_from_IMFTopologyServiceLookup(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_service_lookup_Release(IMFTopologyServiceLookup *iface) +{ + struct evr *filter = impl_from_IMFTopologyServiceLookup(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI filter_service_lookup_LookupService(IMFTopologyServiceLookup *iface, MF_SERVICE_LOOKUP_TYPE lookup_type, + DWORD index, REFGUID service, REFIID riid, void **objects, DWORD *num_objects) +{ + FIXME("iface %p, lookup_type %d, index %lu, service %s, riid %s, objects %p, num_objects %p.\n", + iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid), objects, num_objects); + + return MF_E_NOTACCEPTING; +} + +static const IMFTopologyServiceLookupVtbl filter_service_lookup_vtbl = +{ + filter_service_lookup_QueryInterface, + filter_service_lookup_AddRef, + filter_service_lookup_Release, + filter_service_lookup_LookupService, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -403,6 +447,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) object->IMFGetService_iface.lpVtbl = &filter_get_service_vtbl; object->IMFVideoRenderer_iface.lpVtbl = &filter_video_renderer_vtbl; object->IMediaEventSink_iface.lpVtbl = &filter_media_event_sink_vtbl; + object->IMFTopologyServiceLookup_iface.lpVtbl = &filter_service_lookup_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 30f7ba81ee9..b632323ebb5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -603,6 +603,40 @@ static void test_display_control(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_service_lookup(void) +{ + IBaseFilter *filter = create_evr(); + IMFTopologyServiceLookup *service_lookup; + IUnknown *unk; + DWORD count; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_QueryInterface(filter, &IID_IMFTopologyServiceLookup, (void **)&service_lookup); + if (FAILED(hr)) + { + win_skip("IMFTopologyServiceLookup is not exposed.\n"); + IBaseFilter_Release(filter); + return; + } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFTopologyServiceLookup_QueryInterface(service_lookup, &IID_IBaseFilter, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(unk == (IUnknown *)filter, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + count = 1; + hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&unk, &count); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#lx.\n", hr); + + IMFTopologyServiceLookup_Release(service_lookup); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -3276,6 +3310,7 @@ START_TEST(evr) test_unconnected_eos(); test_misc_flags(); test_display_control(); + test_service_lookup(); test_default_mixer(); test_default_mixer_type_negotiation();

1 0

Nikolay Sivov : evr/filter: Implement media type testing for QueryAccept().
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: f143af50a35f77880babf817899a33e4579b1dd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f143af50a35f77880babf817899a33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 15:36:47 2022 +0300 evr/filter: Implement media type testing for QueryAccept(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 54 +++++++++++++++++ 2 files changed, 213 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 734f9621555..2f0eeb6a22d 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -25,12 +25,20 @@ #include "evr_private.h" #include "d3d9.h" #include "mferror.h" +#include "mfapi.h" #include "initguid.h" #include "dxva2api.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); +enum evr_flags +{ + EVR_INIT_SERVICES = 0x1, /* Currently in InitServices() call. */ + EVR_MIXER_INITED_SERVICES = 0x2, + EVR_PRESENTER_INITED_SERVICES = 0x4, +}; + struct evr { struct strmbase_renderer renderer; @@ -43,6 +51,7 @@ struct evr IMFTransform *mixer; IMFVideoPresenter *presenter; + unsigned int flags; }; static void evr_uninitialize(struct evr *filter) @@ -125,6 +134,96 @@ static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, return S_OK; } +static BOOL evr_is_mixer_d3d_aware(const struct evr *filter) +{ + IMFAttributes *attributes; + unsigned int value = 0; + BOOL ret; + + if (FAILED(IMFTransform_QueryInterface(filter->mixer, &IID_IMFAttributes, (void **)&attributes))) + return FALSE; + + ret = SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value)) && value; + IMFAttributes_Release(attributes); + return ret; +} + +static HRESULT evr_init_services(struct evr *filter) +{ + IMFTopologyServiceLookupClient *lookup_client; + HRESULT hr; + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(filter->mixer, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + filter->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &filter->IMFTopologyServiceLookup_iface))) + { + filter->flags |= EVR_MIXER_INITED_SERVICES; + } + filter->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); + } + + if (FAILED(hr)) return hr; + + /* Set device manager that presenter should have created. */ + if (evr_is_mixer_d3d_aware(filter)) + { + IUnknown *device_manager; + IMFGetService *gs; + + if (SUCCEEDED(IUnknown_QueryInterface(filter->presenter, &IID_IMFGetService, (void **)&gs))) + { + if (SUCCEEDED(IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, + (void **)&device_manager))) + { + IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); + IUnknown_Release(device_manager); + } + + IMFGetService_Release(gs); + } + } + + if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(filter->presenter, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + filter->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &filter->IMFTopologyServiceLookup_iface))) + { + filter->flags |= EVR_PRESENTER_INITED_SERVICES; + } + filter->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); + } + + return hr; +} + +static void evr_release_services(struct evr *filter) +{ + IMFTopologyServiceLookupClient *lookup_client; + + if (filter->flags & EVR_MIXER_INITED_SERVICES && SUCCEEDED(IMFTransform_QueryInterface(filter->mixer, + &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + { + IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + IMFTopologyServiceLookupClient_Release(lookup_client); + filter->flags &= ~EVR_MIXER_INITED_SERVICES; + } + + if (filter->flags & EVR_PRESENTER_INITED_SERVICES && SUCCEEDED(IMFVideoPresenter_QueryInterface(filter->presenter, + &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + { + IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + IMFTopologyServiceLookupClient_Release(lookup_client); + filter->flags &= ~EVR_PRESENTER_INITED_SERVICES; + } +} + static void evr_destroy(struct strmbase_renderer *iface) { struct evr *filter = impl_from_strmbase_renderer(iface); @@ -142,8 +241,37 @@ static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample) static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - FIXME("Not implemented.\n"); - return E_NOTIMPL; + struct evr *filter = impl_from_strmbase_renderer(iface); + IMFMediaType *media_type; + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + if (!filter->presenter) + hr = evr_initialize(filter, NULL, NULL); + + if (SUCCEEDED(hr)) + hr = evr_init_services(filter); + + if (SUCCEEDED(hr)) + hr = MFCreateMediaType(&media_type); + + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = MFInitMediaTypeFromAMMediaType(media_type, mt))) + { + /* TODO: some pin -> mixer input mapping is necessary to test the substreams. */ + hr = IMFTransform_SetInputType(filter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + } + + IMFMediaType_Release(media_type); + + evr_release_services(filter); + } + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + + return hr; } static const struct strmbase_renderer_ops renderer_ops = @@ -419,10 +547,37 @@ static ULONG WINAPI filter_service_lookup_Release(IMFTopologyServiceLookup *ifac static HRESULT WINAPI filter_service_lookup_LookupService(IMFTopologyServiceLookup *iface, MF_SERVICE_LOOKUP_TYPE lookup_type, DWORD index, REFGUID service, REFIID riid, void **objects, DWORD *num_objects) { - FIXME("iface %p, lookup_type %d, index %lu, service %s, riid %s, objects %p, num_objects %p.\n", + struct evr *filter = impl_from_IMFTopologyServiceLookup(iface); + HRESULT hr = S_OK; + + TRACE("iface %p, lookup_type %d, index %lu, service %s, riid %s, objects %p, num_objects %p.\n", iface, lookup_type, index, debugstr_guid(service), debugstr_guid(riid), objects, num_objects); - return MF_E_NOTACCEPTING; + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + if (!(filter->flags & EVR_INIT_SERVICES)) + hr = MF_E_NOTACCEPTING; + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMediaEventSink)) + { + *objects = &filter->IMediaEventSink_iface; + IUnknown_AddRef((IUnknown *)*objects); + } + } + else if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) + { + hr = IMFTransform_QueryInterface(filter->mixer, riid, objects); + } + else + { + WARN("Unsupported service %s.\n", debugstr_guid(service)); + hr = MF_E_UNSUPPORTED_SERVICE; + } + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + + return hr; } static const IMFTopologyServiceLookupVtbl filter_service_lookup_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b632323ebb5..acfb92f2ea5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -637,6 +637,59 @@ static void test_service_lookup(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_query_accept(void) +{ + IBaseFilter *filter = create_evr(); + AM_MEDIA_TYPE req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, 0xdeadbeef} + }; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_YUY2, + }; + + static const GUID *unsupported_subtype_tests[] = + { + &MEDIASUBTYPE_RGB8, + }; + + IBaseFilter_FindPin(filter, L"EVR Input0", &pin); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + memcpy(&req_mt.subtype, subtype_tests[i], sizeof(GUID)); + hr = IPin_QueryAccept(pin, &req_mt); + todo_wine_if(i) + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(unsupported_subtype_tests); ++i) + { + memcpy(&req_mt.subtype, unsupported_subtype_tests[i], sizeof(GUID)); + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + } + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -3311,6 +3364,7 @@ START_TEST(evr) test_misc_flags(); test_display_control(); test_service_lookup(); + test_query_accept(); test_default_mixer(); test_default_mixer_type_negotiation();

1 0

Alexandre Julliard : urlmon/tests: Run tests against the gitlab server to avoid redirects.
by Alexandre Julliard 29 Aug '22

29 Aug '22

Module: wine Branch: master Commit: 81e91afb36f014956db75d29f0dad334bf0f9e75 URL: https://gitlab.winehq.org/wine/wine/-/commit/81e91afb36f014956db75d29f0dad3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:18:26 2022 +0200 urlmon/tests: Run tests against the gitlab server to avoid redirects. --- dlls/urlmon/tests/url.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 43a47609027..7ec5bf144db 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -158,8 +158,8 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -#define WINEHQ_IP "4.4.81.124" -static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +#define WINEHQ_IP "4.4.81.126" +static const WCHAR wszWineHQSite[] = L"gitlab.winehq.org"; static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0};

1 0