November 2020 - Wine-Commits

Alexandre Julliard : kernel32: Implement BaseThreadInitThunk in assembly also for PE builds.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: d896b1195d876085f7127accd445c3ecd504da3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d896b1195d876085f7127acc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 13:58:27 2020 +0100 kernel32: Implement BaseThreadInitThunk in assembly also for PE builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50171 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 13 ++++++------- include/wine/asm.h | 12 +++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1cd309d84b4..1f4f938af51 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -33,8 +33,11 @@ #include "kernel_private.h" +/*********************************************************************** + * BaseThreadInitThunk (KERNEL32.@) + */ #ifdef __i386__ -__ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, +__ASM_FASTCALL_FUNC( BaseThreadInitThunk, 12, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -50,16 +53,12 @@ __ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, "call *%edx\n\t" "movl %eax,(%esp)\n\t" "call " __ASM_STDCALL( "RtlExitUserThread", 4 )) -#endif - -/*********************************************************************** - * BaseThreadInitThunk (KERNEL32.@) - */ +#else void __fastcall BaseThreadInitThunk( DWORD unknown, LPTHREAD_START_ROUTINE entry, void *arg ) { RtlExitUserThread( entry( arg ) ); } - +#endif /*********************************************************************** * FreeLibraryAndExitThread (KERNEL32.@) diff --git a/include/wine/asm.h b/include/wine/asm.h index 788e26126cb..2d1607ca772 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -28,9 +28,11 @@ #endif #if defined(_WIN32) && defined(__i386__) -# define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args +# define __ASM_STDCALL(name,args) "_" name "@" #args +# define __ASM_FASTCALL(name,args) "@" name "@" #args #else -# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) #endif #if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__)) @@ -78,21 +80,21 @@ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) - #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) +#define __ASM_FASTCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_FASTCALL(#name,args),code) /* fastcall support */ #if defined(__i386__) && !defined(_WIN32) # define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ + __ASM_FASTCALL_FUNC( func, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_STDCALL(#func,4) ) # define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ + __ASM_FASTCALL_FUNC( func, args, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \

1 0

Nikolay Sivov : mf/tests: Relax error code test for IsMediaTypeSupported() of SAR.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 73c3c8e0315182acfc3cd3154e0b6ff9b3012a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c3c8e0315182acfc3cd315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:34:34 2020 +0300 mf/tests: Relax error code test for IsMediaTypeSupported() of SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 27e859fa82d..117e2d2e785 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3106,11 +3106,17 @@ todo_wine hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + /* Actual return value is MF_E_ATRIBUTENOTFOUND triggered by missing MF_MT_MAJOR_TYPE */ hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); -todo_wine - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/tests: Add another test for SAR time source.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 95f3bed3266ccb5618074e5785535730abaf1acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f3bed3266ccb5618074e57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:34:35 2020 +0300 mf/tests: Add another test for SAR time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 117e2d2e785..41ca385cc2b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2925,11 +2925,11 @@ static void test_sar(void) { IMFPresentationClock *present_clock, *present_clock2; IMFMediaType *mediatype, *mediatype2, *mediatype3; + IMFClockStateSink *state_sink, *state_sink2; IMFMediaTypeHandler *handler, *handler2; IMFPresentationTimeSource *time_source; IMFSimpleAudioVolume *simple_volume; IMFAudioStreamVolume *stream_volume; - IMFClockStateSink *state_sink; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; IMFAttributes *attributes; @@ -2967,6 +2967,14 @@ todo_wine if (SUCCEEDED(hr)) { + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(state_sink == state_sink2, "Unexpected clock sink.\n"); + IMFClockStateSink_Release(state_sink2); + IMFClockStateSink_Release(state_sink); + hr = IMFPresentationTimeSource_GetUnderlyingClock(time_source, &clock); ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); @@ -3008,6 +3016,9 @@ if (SUCCEEDED(hr)) check_interface(sink, &IID_IMFMediaSinkPreroll, TRUE); check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); check_interface(sink, &IID_IMFClockStateSink, TRUE); + check_interface(sink, &IID_IMFGetService, TRUE); + todo_wine check_interface(sink, &IID_IMFPresentationTimeSource, TRUE); + check_service_interface(sink, &MR_POLICY_VOLUME_SERVICE, &IID_IMFSimpleAudioVolume, TRUE); /* Clock */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink); @@ -3057,6 +3068,8 @@ todo_wine ok(hr == S_OK, "Failed to get a stream, hr %#x.\n", hr); check_interface(stream_sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(stream_sink, &IID_IMFMediaTypeHandler, TRUE); + todo_wine check_interface(stream_sink, &IID_IMFGetService, TRUE); hr = IMFStreamSink_GetIdentifier(stream_sink, &id); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.162.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 7d8c50e4371f2fc5300b90b323210c922d80d4e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8c50e4371f2fc5300b90b3… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 23 05:56:49 2020 -0800 winevulkan: Update to VK spec version 1.2.162. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 616 +++++++++- dlls/winevulkan/vulkan_thunks.h | 245 +++- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2552 +++++++++++++++++++++++---------------- 5 files changed, 2317 insertions(+), 1100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d8c50e4371f2fc5300b…

1 0

Nikolay Sivov : evr/tests: Add some tests for presenter quality control.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 22d77e4327212dbd4df572850f3aee12cc67d40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d77e4327212dbd4df57285… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:35:03 2020 +0300 evr/tests: Add some tests for presenter quality control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bebffada509..2740f2263f0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1165,6 +1165,7 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); + todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); @@ -2010,6 +2011,67 @@ static void test_presenter_video_window(void) DestroyWindow(window); } +static void test_presenter_quality_control(void) +{ + IMFQualityAdviseLimits *qa_limits; + IMFVideoPresenter *presenter; + MF_QUALITY_DROP_MODE mode; + IMFQualityAdvise *advise; + MF_QUALITY_LEVEL level; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (qa_limits) +{ + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); + + IMFQualityAdviseLimits_Release(qa_limits); +} + +todo_wine { + mode = 1; + hr = IMFQualityAdvise_GetDropMode(advise, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + level = 1; + hr = IMFQualityAdvise_GetQualityLevel(advise, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); + + hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); + ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); + ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); +} + + IMFQualityAdvise_Release(advise); + + IMFVideoPresenter_Release(presenter); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2511,6 +2573,7 @@ START_TEST(evr) test_presenter_native_video_size(); test_presenter_ar_mode(); test_presenter_video_window(); + test_presenter_quality_control(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples();

1 0

Alistair Leslie-Hughes : include: Add some DB_S_ defines.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 6b17d4d90b6648a782356036958a9a9ac2b64703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b17d4d90b6648a782356036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 23 19:32:46 2020 +1100 include: Add some DB_S_ defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledberr.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 61093ea1491..c0eccba1e97 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -83,6 +83,9 @@ #define DB_E_MISMATCHEDPROVIDER 0x80040e75 +#define DB_S_BOOKMARKSKIPPED 0x00040ec3 +#define DB_S_NONEXTROWSET 0x00040ec5 +#define DB_S_ENDOFROWSET 0x00040ec6 #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */

1 0

Gijs Vermeulen : msctf/tests: Add ITfSource::[Un]AdviseSink() test with ITfActiveLanguageProfileNotifySink.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 4a103ea9612997ffb04be2c721a25b487d63ada3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a103ea9612997ffb04be2c7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Nov 22 17:13:32 2020 +0100 msctf/tests: Add ITfSource::[Un]AdviseSink() test with ITfActiveLanguageProfileNotifySink. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 48 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f21042a794c..1c97d2c5d1c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -63,7 +63,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD dmSinkCookie; static DWORD documentStatus; -static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie; +static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie, active_lang_sink_cookie; static DWORD fake_service_onactivated_flags = 0; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; @@ -801,6 +801,45 @@ static const ITfTransitoryExtensionSinkVtbl TfTransitoryExtensionSinkVtbl = { static ITfTransitoryExtensionSink TfTransitoryExtensionSink = { &TfTransitoryExtensionSinkVtbl }; +static HRESULT WINAPI TfActiveLanguageProfileNotifySink_QueryInterface(ITfActiveLanguageProfileNotifySink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfActiveLanguageProfileNotifySink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfActiveLanguageProfileNotifySink_AddRef(ITfActiveLanguageProfileNotifySink *iface) +{ + return 2; +} + +static ULONG WINAPI TfActiveLanguageProfileNotifySink_Release(ITfActiveLanguageProfileNotifySink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfActiveLanguageProfileNotifySink_OnActivated(ITfActiveLanguageProfileNotifySink *iface, REFCLSID clsid, + REFGUID guidProfile, BOOL activated) +{ + trace("Got OnActivated: {clsid %s, guidProfile %s, activated %d}\n", wine_dbgstr_guid(clsid), + wine_dbgstr_guid(guidProfile), activated); + + return S_OK; +} + +static const ITfActiveLanguageProfileNotifySinkVtbl TfActiveLanguageProfileNotifySinkVtbl = { + TfActiveLanguageProfileNotifySink_QueryInterface, + TfActiveLanguageProfileNotifySink_AddRef, + TfActiveLanguageProfileNotifySink_Release, + TfActiveLanguageProfileNotifySink_OnActivated +}; + +static ITfActiveLanguageProfileNotifySink TfActiveLanguageProfileNotifySink = { &TfActiveLanguageProfileNotifySinkVtbl }; + /******************************************************************************************** * Stub text service for testing ********************************************************************************************/ @@ -1231,6 +1270,10 @@ static void test_ThreadMgrAdviseSinks(void) &profile_activation_sink_cookie); ok(hr == S_OK, "Failed to Advise ITfInputProcessorProfileActivationSink\n"); + hr = ITfSource_AdviseSink(source, &IID_ITfActiveLanguageProfileNotifySink, (IUnknown*)&TfActiveLanguageProfileNotifySink, + &active_lang_sink_cookie); + ok(hr == S_OK, "Failed to Advise ITfActiveLanguageProfileNotifySink\n"); + ITfSource_Release(source); } @@ -1258,6 +1301,9 @@ static void test_ThreadMgrUnadviseSinks(void) hr = ITfSource_UnadviseSink(source, profile_activation_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfInputProcessorProfileActivationSink\n"); + hr = ITfSource_UnadviseSink(source, active_lang_sink_cookie); + ok(hr == S_OK, "Failed to unadvise ITfActiveLanguageProfileNotifySink\n"); + ITfSource_Release(source); }

1 0

Zebediah Figura : quartz: Correct return value handling in IMediaSeeking::GetDuration().
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 627b6b29cd083208ccf0c4f8403a450432e523ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=627b6b29cd083208ccf0c4f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:02 2020 -0600 quartz: Correct return value handling in IMediaSeeking::GetDuration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 53 ++++++++++++++++++++++++----------------- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b3aebabbdad..fb0890fda1f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2237,36 +2237,45 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI return S_OK; } -static HRESULT WINAPI FoundDuration(struct filter_graph *This, IMediaSeeking *seek, DWORD_PTR pduration) +static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - HRESULT hr; - LONGLONG duration = 0, *pdur = (LONGLONG*)pduration; + struct filter_graph *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = E_NOTIMPL, filter_hr; + LONGLONG filter_duration; + struct filter *filter; - hr = IMediaSeeking_GetDuration(seek, &duration); - if (FAILED(hr)) - return hr; + TRACE("graph %p, duration %p.\n", graph, duration); - if (*pdur < duration) - *pdur = duration; - return hr; -} + if (!duration) + return E_POINTER; -static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *pDuration) -{ - struct filter_graph *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + *duration = 0; - TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); + EnterCriticalSection(&graph->cs); - if (!pDuration) - return E_POINTER; + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) + { + update_seeking(filter); + if (!filter->seeking) + continue; - EnterCriticalSection(&This->cs); - *pDuration = 0; - hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); - LeaveCriticalSection(&This->cs); + filter_hr = IMediaSeeking_GetDuration(filter->seeking, &filter_duration); + if (SUCCEEDED(filter_hr)) + { + hr = S_OK; + *duration = max(*duration, filter_duration); + } + else if (filter_hr != E_NOTIMPL) + { + LeaveCriticalSection(&graph->cs); + return filter_hr; + } + } + + LeaveCriticalSection(&graph->cs); - TRACE("--->%08x\n", hr); + TRACE("Returning hr %#x, duration %s (%s seconds).\n", hr, + wine_dbgstr_longlong(*duration), debugstr_time(*duration)); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 853155ab100..b6e68f3f6b9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4401,13 +4401,13 @@ static void test_graph_seeking(void) filter1.seek_hr = filter2.seek_hr = 0xbeef; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; filter2.seek_hr = S_OK; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = 0xdeadbeef;

1 0

Zebediah Figura : quartz/tests: Add some more tests for IMediaSeeking return value handling.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: ec4feafcc04bdb7c04ef8c0e8d31436e30f38526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4feafcc04bdb7c04ef8c0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:01 2020 -0600 quartz/tests: Add some more tests for IMediaSeeking return value handling. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e7ee4e5c446..853155ab100 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1623,7 +1623,7 @@ static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *durat struct testfilter *filter = impl_from_IMediaSeeking(iface); if (winetest_debug > 1) trace("%p->GetDuration()\n", iface); *duration = filter->seek_duration; - return S_OK; + return filter->seek_hr; } static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) @@ -4399,6 +4399,26 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + filter1.seek_hr = filter2.seek_hr = 0xbeef; + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + + filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time)); + + filter1.seek_hr = 0xdeadbeef; + hr = IMediaSeeking_GetDuration(seeking, &time); + ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); + + filter1.seek_hr = filter2.seek_hr = E_NOTIMPL; + hr = IMediaSeeking_GetDuration(seeking, &time); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + filter1.seek_hr = filter2.seek_hr = S_OK; + flush_cached_seeking(graph, &filter1); flush_cached_seeking(graph, &filter2); @@ -4420,6 +4440,7 @@ static void test_graph_seeking(void) ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time)); @@ -4470,6 +4491,7 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 9281b542ff445ef69f7880b2e3435415de57bcaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9281b542ff445ef69f7880b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:56 2020 -0600 quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 142 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 558e6989c98..c33c074d93d 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -877,6 +877,147 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control ok(hr == S_OK, "Got hr %#x.\n", hr); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = send_frame(input); + todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 2000); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); +} + static void test_connect_pin(void) { ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; @@ -971,6 +1112,7 @@ static void test_connect_pin(void) test_filter_state(input, control); test_flushing(pin, input, control); + test_eos(pin, input, control); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0