wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Derek Lesho : winegstreamer: Implement IMFMediaStream::RequestSample.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 03eaa2cc93e5e2ea4c36495870c268797aea3ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03eaa2cc93e5e2ea4c364958… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 13:57:19 2020 -0500 winegstreamer: Implement IMFMediaStream::RequestSample. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 19 +++++--- dlls/mfreadwrite/tests/mfplat.c | 16 ++++++- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 94 ++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 69 ++++++++++++++++++++++++++++ 5 files changed, 191 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03eaa2cc93e5e2ea4c36…

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::Start.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 12f1afbffed35cf9dcc18f5dbf33633aa9a7d2ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1afbffed35cf9dcc18f5d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 10:58:14 2020 -0500 winegstreamer: Implement IMFMediaSource::Start. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 8 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 307 +++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 130 ++++++++++++++++ 4 files changed, 438 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12f1afbffed35cf9dcc1…

1 0

Derek Lesho : mfreadwrite: Abort ReadSample when unable to request any samples.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 9d7f98ee7f3b078df8fafaa3b3b7b59b81492d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7f98ee7f3b078df8fafaa3… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 18:18:27 2020 +0300 mfreadwrite: Abort ReadSample when unable to request any samples. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 13 ++++++++++--- dlls/mfreadwrite/tests/mfplat.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 96a82b798ab..cc1b29a2b6a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -439,7 +439,8 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM } if (reader->streams[i].requests) - source_reader_request_sample(reader, &reader->streams[i]); + if (FAILED(source_reader_request_sample(reader, &reader->streams[i]))) + WakeAllConditionVariable(&reader->sample_event); } break; } @@ -1780,10 +1781,16 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind stream->requests++; if (FAILED(hr = source_reader_request_sample(reader, stream))) WARN("Failed to request a sample, hr %#x.\n", hr); + if (stream->stream && !(stream->flags & STREAM_FLAG_SAMPLE_REQUESTED)) + { + *stream_flags = MF_SOURCE_READERF_ERROR; + *timestamp = 0; + break; + } SleepConditionVariableCS(&reader->sample_event, &reader->cs, INFINITE); } - - source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + if (SUCCEEDED(hr)) + source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, timestamp, sample); } } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index cfe68cb6736..0e5053f905f 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -158,6 +158,8 @@ static HRESULT WINAPI test_media_stream_GetStreamDescriptor(IMFMediaStream *ifac return S_OK; } +static BOOL fail_request_sample; + static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token) { struct test_media_stream *stream = impl_from_IMFMediaStream(iface); @@ -165,6 +167,9 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn IMFSample *sample; HRESULT hr; + if (fail_request_sample) + return E_NOTIMPL; + hr = MFCreateSample(&sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); hr = IMFSample_SetSampleTime(sample, 123); @@ -977,6 +982,27 @@ static void test_source_reader_from_media_source(void) ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + /* RequestSample failure. */ + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + fail_request_sample = TRUE; + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + fail_request_sample = FALSE; } START_TEST(mfplat)

1 0

Zhiyi Zhang : dxgi/tests: Test display mode restoration.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: ef81152c8cd17f1bfb2950753428a95a81728c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81152c8cd17f1bfb295075… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:49:00 2020 +0800 dxgi/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef81152c8cd17f1bfb29…

1 0

Zhiyi Zhang : d3d9/tests: Test display mode restoration.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: df90c0ef7ea053606e684901073b26368f34ac26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df90c0ef7ea053606e684901… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:45 2020 +0800 d3d9/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 411 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 400 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df90c0ef7ea053606e68…

1 0

Zhiyi Zhang : d3d8/tests: Test display mode restoration.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: e166f6d07e436e4d769c80bd2aaf821961c9c9fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e166f6d07e436e4d769c80bd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:31 2020 +0800 d3d8/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 408 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 398 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e166f6d07e436e4d769c…

1 0

Zhiyi Zhang : ddraw/tests: Test display mode restoration.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 1a4f2e23c00eaed3e9a4a5d77941b89f972cda89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4f2e23c00eaed3e9a4a5d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:26 2020 +0800 ddraw/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 397 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1581 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a4f2e23c00eaed3e9a4…

1 0

Zhiyi Zhang : d3d9/tests: Restore display modes at the end of test_wndproc().
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: ddf1967fd030e66c8a842c109a5a00387168016f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf1967fd030e66c8a842c10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:15 2020 +0800 d3d9/tests: Restore display modes at the end of test_wndproc(). test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 53a83ad887b..2efb6ddc2e5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4435,6 +4435,8 @@ done: CloseHandle(thread_params.test_finished); CloseHandle(thread_params.window_created); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); + change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); } static void test_wndproc_windowed(void)

1 0

Zhiyi Zhang : d3d8/tests: Restore display modes at the end of test_wndproc().
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 5715b77e87de175464c68fa412c821a63e9f079e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5715b77e87de175464c68fa4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:00 2020 +0800 d3d8/tests: Restore display modes at the end of test_wndproc(). test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4c567a47603..3e933143332 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3361,6 +3361,8 @@ done: DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); + change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); } static void test_wndproc_windowed(void)

1 0

Nikolay Sivov : mf/evr: Notify presenter on new input.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 3641c80244445a8f5dd54232cdce4397c4b78cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3641c80244445a8f5dd54232… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:47 2020 +0300 mf/evr: Notify presenter on new input. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 618bbf8924f..f5bbfffc4a5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -352,7 +352,8 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS } else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) + IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); if (stream->flags & EVR_STREAM_PREROLLING) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020