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

Alexandre Julliard : ntdll: Use a syscall thunk for NtQueryPerformanceCounter().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 78c772e9d802d13522855fa3c8e2257c4933214a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78c772e9d802d13522855fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:51:38 2020 +0200 ntdll: Use a syscall thunk for NtQueryPerformanceCounter(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/time.c | 21 +-------------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/sync.c | 13 +++++++++++-- dlls/ntdll/unixlib.h | 3 +-- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ff1433be40..aea9174068 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -307,7 +307,7 @@ @ stdcall -syscall NtQueryMutant(long long ptr long ptr) @ stdcall -syscall NtQueryObject(long long ptr long ptr) @ stub NtQueryOpenSubKeys -@ stdcall NtQueryPerformanceCounter(ptr ptr) +@ stdcall -syscall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess # @ stub NtQueryQuotaInformationFile @ stdcall -syscall NtQuerySection(long long ptr long ptr) @@ -1295,7 +1295,7 @@ @ stdcall -private -syscall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall -private -syscall ZwQueryObject(long long ptr long ptr) NtQueryObject @ stub ZwQueryOpenSubKeys -@ stdcall -private ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter +@ stdcall -private -syscall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @ stdcall -private -syscall ZwQuerySection(long long ptr long ptr) NtQuerySection diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 15d100d10e..f92443500d 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -375,31 +375,12 @@ LONGLONG WINAPI RtlGetSystemTimePrecise( void ) return unix_funcs->RtlGetSystemTimePrecise(); } -/****************************************************************************** - * NtQueryPerformanceCounter [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) -{ - NTSTATUS status; - - __TRY - { - status = unix_funcs->NtQueryPerformanceCounter( counter, frequency ); - } - __EXCEPT_PAGE_FAULT - { - return STATUS_ACCESS_VIOLATION; - } - __ENDTRY - return status; -} - /****************************************************************************** * RtlQueryPerformanceCounter [NTDLL.@] */ BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceCounter( LARGE_INTEGER *counter ) { - unix_funcs->NtQueryPerformanceCounter( counter, NULL ); + NtQueryPerformanceCounter( counter, NULL ); return TRUE; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 99c70b400a..3f3a10155d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1362,7 +1362,6 @@ static struct unix_funcs unix_funcs = { NtCurrentTeb, NtGetContextThread, - NtQueryPerformanceCounter, DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index b7b9fa3443..2dc1a7c2aa 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -69,6 +69,7 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/server.h" +#include "wine/exception.h" #include "wine/debug.h" #include "unix_private.h" @@ -1361,8 +1362,16 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou */ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) { - counter->QuadPart = monotonic_counter(); - if (frequency) frequency->QuadPart = TICKSPERSEC; + __TRY + { + counter->QuadPart = monotonic_counter(); + if (frequency) frequency->QuadPart = TICKSPERSEC; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d7487feafc..84e1a27977 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,14 +28,13 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 89 +#define NTDLL_UNIXLIB_VERSION 90 struct unix_funcs { /* Nt* functions */ TEB * (WINAPI *NtCurrentTeb)(void); NTSTATUS (WINAPI *NtGetContextThread)( HANDLE handle, CONTEXT *context ); - NTSTATUS (WINAPI *NtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

1 0

Anton Baskanov : amstream/tests: Fix AMMultiMediaStream::OpenFile test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 6a1109f3cd0ba0953c02509e9fdb2a84a9549e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1109f3cd0ba0953c02509e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:02 2020 -0500 amstream/tests: Fix AMMultiMediaStream::OpenFile test. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 47 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a81cdba3f3..c47f11f1f6 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -231,35 +231,44 @@ static void test_interfaces(void) static void test_openfile(void) { - IAMMultiMediaStream *pams; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; + IGraphBuilder *graph; HRESULT hr; - IGraphBuilder* pgraph; + ULONG ref; - if (!(pams = create_ammultimediastream())) - return; + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!graph, "Expected NULL graph.\n"); - hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); - ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); - ok(pgraph==NULL, "Filtergraph should not be created yet\n"); + hr = IAMMultiMediaStream_OpenFile(mmstream, L"test.avi", AMMSF_NORENDER); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (pgraph) - IGraphBuilder_Release(pgraph); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + IGraphBuilder_Release(graph); - check_interface(pams, &IID_IMediaSeeking, FALSE); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); - ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); - check_interface(pams, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IMediaSeeking, FALSE); - hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); - ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); - ok(pgraph!=NULL, "Filtergraph should be created\n"); + hr = IAMMultiMediaStream_OpenFile(mmstream, L"test.avi", 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (pgraph) - IGraphBuilder_Release(pgraph); + check_interface(filter, &IID_IMediaSeeking, TRUE); - IAMMultiMediaStream_Release(pams); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_renderfile(void)

1 0

Serge Gautherie : winapi_test: Remove leftover PUUID_VECTOR from tests.dat.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 5c427685fbab7ac274260f8807c056519197281c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c427685fbab7ac274260f88… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Jul 17 05:59:27 2020 +0200 winapi_test: Remove leftover PUUID_VECTOR from tests.dat. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 57a65e1b22..a0265af422 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -999,7 +999,6 @@ PRPC_STUB_FUNCTION PRPC_SYNTAX_IDENTIFIER PSCONTEXT_QUEUE PXMIT_ROUTINE_QUINTUPLE -PUUID_VECTOR RPC_AUTH_IDENTITY_HANDLE RPC_AUTH_KEY_RETRIEVAL_FN RPC_AUTHZ_HANDLE

1 0

Serge Gautherie : winapi_test: Fix a verifying loop on headers, which never finds any type name.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 181a114d44eb7003cdcebc83936bc828855e92ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=181a114d44eb7003cdcebc83… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Jul 17 06:14:44 2020 +0200 winapi_test: Fix a verifying loop on headers, which never finds any type name. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8b7596f040..1061dd8157 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -871,8 +871,7 @@ foreach my $test_dir (@test_dirs) { foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { $output->prefix("$header: "); - $header =~ s%^include/%%; - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; + my $type_name2type = $file2types{$pointer_size}{$header}; foreach my $_type_name (sort(keys(%$type_name2type))) { my $type_name = $_type_name; @@ -886,10 +885,10 @@ $output->prefix("$winapi_dir/tests.dat: "); foreach my $type_name (sort(keys(%type_names_used))) { my $found = 0; foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; - if (exists($type_name2type{$type_name})) { - $found = 1; - } + if (exists($file2types{$pointer_size}{$header}{$type_name})) { + $found = 1; + last; + } } if (!$found) {

1 0

Serge Gautherie : winapi_test: Add common headers for rpcrt4 test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 246e9e4358d23c434aa4564df7c8616b28c9de49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=246e9e4358d23c434aa4564d… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:13 2020 +0200 winapi_test: Add common headers for rpcrt4 test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index a0265af422..7741fe30f3 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -928,6 +928,10 @@ Unit tests for data structure packing %header +basetsd.h +winnt.h +windef.h + rpc.h rpcdce.h rpcdcep.h

1 0

Serge Gautherie : winapi_test: Remove useless common headers for shlwapi test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: d67b1fe51c6cb397709c1f147b5c3c121eedc589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67b1fe51c6cb397709c1f14… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:35 2020 +0200 winapi_test: Remove useless common headers for shlwapi test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 7741fe30f3..2e344cd1eb 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1229,10 +1229,8 @@ Unit tests for data structure packing %header -basetsd.h winnt.h -windef.h -wtypes.h + shlwapi.h %include

1 0

Serge Gautherie : winapi_test: Remove useless winbase.h for wininet test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 0c3fd2238e306b50c3672124a563e9aee83170bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3fd2238e306b50c3672124… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:57 2020 +0200 winapi_test: Remove useless winbase.h for wininet test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 2e344cd1eb..c53ea5da23 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1595,7 +1595,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h -winbase.h + wininet.h %include

1 0

Serge Gautherie : winapi_test: Add a blank line between common and specific headers.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: db11d6dcca89a6d10ad66976af8e84a633aff88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db11d6dcca89a6d10ad66976… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:35:19 2020 +0200 winapi_test: Add a blank line between common and specific headers. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index c53ea5da23..e6a09923af 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -11,6 +11,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + wingdi.h %include @@ -472,6 +473,7 @@ basetsd.h winnt.h windef.h winbase.h + timezoneapi.h %include @@ -1053,6 +1055,7 @@ winnt.h windef.h wtypes.h guiddef.h + shellapi.h shtypes.h shlobj.h @@ -1265,6 +1268,7 @@ Unit tests for data structure packing winnt.h windef.h guiddef.h + urlmon.h %include @@ -1322,6 +1326,7 @@ basetsd.h winnt.h windef.h winbase.h + wingdi.h winuser.h @@ -1737,6 +1742,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + mmsystem.h digitalv.h

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_Receive().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: e4ebf09f4f5e1692b8e67a19c0c09fde59fc19d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ebf09f4f5e1692b8e67a19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:06 2020 -0500 strmbase: Get rid of BaseRendererImpl_Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 142 ++++++++++++++++++++++------------------------- include/wine/strmbase.h | 2 - 2 files changed, 66 insertions(+), 78 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f0a747a2c..bc2d0551fe 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -169,7 +169,72 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSample *sample) { struct strmbase_renderer *filter = impl_from_IPin(&pin->pin.IPin_iface); - return BaseRendererImpl_Receive(filter, sample); + REFERENCE_TIME start, stop; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + if (filter->eos || filter->sink.flushing) + return S_FALSE; + + if (filter->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (IMediaSample_GetMediaType(sample, &mt) == S_OK) + { + TRACE("Format change.\n"); + strmbase_dump_media_type(mt); + + if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + return VFW_E_TYPE_NOT_ACCEPTED; + DeleteMediaType(mt); + } + + EnterCriticalSection(&filter->csRenderLock); + if (filter->filter.state == State_Paused) + SetEvent(filter->state_event); + + if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) + { + REFERENCE_TIME now; + DWORD_PTR cookie; + + strmbase_passthrough_update_time(&filter->passthrough, start); + + IReferenceClock_GetTime(filter->filter.clock, &now); + + if (now - filter->stream_start - start <= -10000) + { + HANDLE handles[2] = {filter->advise_event, filter->flush_event}; + DWORD ret; + + IReferenceClock_AdviseTime(filter->filter.clock, filter->stream_start, + start, (HEVENT)filter->advise_event, &cookie); + + LeaveCriticalSection(&filter->csRenderLock); + + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + IReferenceClock_Unadvise(filter->filter.clock, cookie); + + if (ret == 1) + { + TRACE("Flush signaled; discarding current sample.\n"); + return S_OK; + } + + EnterCriticalSection(&filter->csRenderLock); + } + } + else + start = stop = -1; + + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + QualityControlRender_DoQOS(&filter->qc); + + LeaveCriticalSection(&filter->csRenderLock); + + return hr; } static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) @@ -267,81 +332,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_filter_cleanup(&filter->filter); } -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSample *pSample) -{ - REFERENCE_TIME start, stop; - AM_MEDIA_TYPE *pmt; - HRESULT hr; - - TRACE("(%p)->%p\n", This, pSample); - - if (This->eos || This->sink.flushing) - return S_FALSE; - - if (This->filter.state == State_Stopped) - return VFW_E_WRONG_STATE; - - if (IMediaSample_GetMediaType(pSample, &pmt) == S_OK) - { - TRACE("Format change.\n"); - strmbase_dump_media_type(pmt); - - if (FAILED(This->pFuncsTable->pfnCheckMediaType(This, pmt))) - { - return VFW_E_TYPE_NOT_ACCEPTED; - } - DeleteMediaType(pmt); - } - - EnterCriticalSection(&This->csRenderLock); - if (This->filter.state == State_Paused) - SetEvent(This->state_event); - - /* Wait for render Time */ - if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) - { - REFERENCE_TIME now; - DWORD_PTR cookie; - - strmbase_passthrough_update_time(&This->passthrough, start); - - IReferenceClock_GetTime(This->filter.clock, &now); - - if (now - This->stream_start - start <= -10000) - { - HANDLE handles[2] = {This->advise_event, This->flush_event}; - DWORD ret; - - IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, - start, (HEVENT)This->advise_event, &cookie); - - LeaveCriticalSection(&This->csRenderLock); - - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.clock, cookie); - - if (ret == 1) - { - TRACE("Flush signaled, discarding current sample.\n"); - return S_OK; - } - - EnterCriticalSection(&This->csRenderLock); - } - } - else - start = stop = -1; - - QualityControlRender_BeginRender(&This->qc, start, stop); - hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(&This->qc); - QualityControlRender_DoQOS(&This->qc); - - LeaveCriticalSection(&This->csRenderLock); - - return hr; -} - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9e0d4e7d47..24bb97702b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -334,8 +334,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops); void strmbase_renderer_cleanup(struct strmbase_renderer *filter);

1 0

Zebediah Figura : strmbase: Wait for presentation time after rendering the first sample.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 8803a81b33e0f17833226464b47ed13276b0a70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8803a81b33e0f17833226464… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:07 2020 -0500 strmbase: Wait for presentation time after rendering the first sample. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index bc2d0551fe..b6d552b3b0 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -170,13 +170,16 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp { struct strmbase_renderer *filter = impl_from_IPin(&pin->pin.IPin_iface); REFERENCE_TIME start, stop; + BOOL need_wait = FALSE; + FILTER_STATE state; + HRESULT hr = S_OK; AM_MEDIA_TYPE *mt; - HRESULT hr; if (filter->eos || filter->sink.flushing) return S_FALSE; - if (filter->filter.state == State_Stopped) + state = filter->filter.state; + if (state == State_Stopped) return VFW_E_WRONG_STATE; if (IMediaSample_GetMediaType(sample, &mt) == S_OK) @@ -194,12 +197,25 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp SetEvent(filter->state_event); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) + { + strmbase_passthrough_update_time(&filter->passthrough, start); + need_wait = TRUE; + } + else + start = stop = -1; + + if (state == State_Paused) + { + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + } + + if (need_wait) { REFERENCE_TIME now; DWORD_PTR cookie; - strmbase_passthrough_update_time(&filter->passthrough, start); - IReferenceClock_GetTime(filter->filter.clock, &now); if (now - filter->stream_start - start <= -10000) @@ -224,12 +240,14 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp EnterCriticalSection(&filter->csRenderLock); } } - else - start = stop = -1; - QualityControlRender_BeginRender(&filter->qc, start, stop); - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - QualityControlRender_EndRender(&filter->qc); + if (state == State_Running) + { + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + } + QualityControlRender_DoQOS(&filter->qc); LeaveCriticalSection(&filter->csRenderLock);

1 0