October 2020 - Wine-commits

Nikolay Sivov : mfplat: Implement MFCreateDXSurfaceBuffer().
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 23a656a083df15aeb7d4656b700e3ea9fed6b390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a656a083df15aeb7d4656b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:41 2020 +0300 mfplat: Implement MFCreateDXSurfaceBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 11 +- 3 files changed, 319 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23a656a083df15aeb7d4…

1 0

Nikolay Sivov : evr/allocator: Use different buffer implementation for surface buffers.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 959279413ee363293ceb270dc115835893fb7f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=959279413ee363293ceb270d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:42 2020 +0300 evr/allocator: Use different buffer implementation for surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 31 ++++++++++++++++--------------- dlls/evr/tests/evr.c | 6 +----- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index b65cc45a662..39520cb6020 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -306,27 +306,28 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato for (i = 0; i < sample_count; ++i) { struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + IMFMediaBuffer *buffer; - if (service) + if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, 0, format, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + if (service) { - hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - IDirect3DSurface9_Release(surface); + if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, + 0, format, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + { + hr = MFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)surface, FALSE, &buffer); + IDirect3DSurface9_Release(surface); + } + } + else + { + hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer); } - } - else - { - IMFMediaBuffer *buffer; - if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) + if (SUCCEEDED(hr)) { - if (SUCCEEDED(hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer))) - { - hr = IMFSample_AddBuffer(sample, buffer); - IMFMediaBuffer_Release(buffer); - } + hr = IMFSample_AddBuffer(sample, buffer); + IMFMediaBuffer_Release(buffer); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index e4f45396ae8..a711be7ad21 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1468,17 +1468,13 @@ todo_wine IDirect3DSurface9_Release(surface); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample);

1 0

Nikolay Sivov : evr: Add MFCreateDXSurfaceBuffer() forward.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 13aa1e12e0304108a366378eee6c285148a2158f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aa1e12e0304108a366378e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:43 2020 +0300 evr: Add MFCreateDXSurfaceBuffer() forward. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index dcf062cf5aa..67eee3122cf 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -7,7 +7,7 @@ @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array @ stdcall -import MFCopyImage(ptr long ptr long long long) -@ stub MFCreateDXSurfaceBuffer +@ stdcall -import MFCreateDXSurfaceBuffer(ptr ptr long ptr) @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr)

1 0

Nikolay Sivov : evr/presenter: Set mixer output type on type negotiation.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 30727decff4bdd1a97a6f545e98254f5175031c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30727decff4bdd1a97a6f545… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:44 2020 +0300 evr/presenter: Set mixer output type on type negotiation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 96eaa4426fc..54ad9fee994 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -157,9 +157,31 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { + IMFMediaType *media_type; + unsigned int idx = 0; + HRESULT hr; + video_presenter_get_native_video_size(presenter); - return S_OK; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &media_type))) + { + /* FIXME: check that d3d device supports this format */ + + /* FIXME: potentially adjust frame size */ + + if (SUCCEEDED(IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY))) + { + /* FIXME: should keep a copy internally too */ + + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); + break; + } + + IMFMediaType_Release(media_type); + } + + return hr; } static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : mf/copier: Move sample copier to its own file.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: f64d046117903b25a5545f0683aec4b8a3ed7a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64d046117903b25a5545f06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:45 2020 +0300 mf/copier: Move sample copier to its own file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/copier.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/main.c | 565 ------------------------------------------------- 3 files changed, 594 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f64d046117903b25a554…

1 0

Nikolay Sivov : mf/evr: Pass incoming samples to the mixer.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 41fe1ac058756611b1215d2b60871272f6d143f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fe1ac058756611b1215d2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:46 2020 +0300 mf/evr: Pass incoming samples to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4dca8515c94..618bbf8924f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -335,19 +335,36 @@ static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct video_stream *stream = impl_from_IMFStreamSink(iface); + LONGLONG timestamp; + HRESULT hr = S_OK; - FIXME("%p, %p.\n", iface, sample); + TRACE("%p, %p.\n", iface, sample); EnterCriticalSection(&stream->cs); - if (stream->flags & EVR_STREAM_PREROLLING) + + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else if (!stream->parent->clock) + hr = MF_E_NO_CLOCK; + else if (FAILED(hr = IMFSample_GetSampleTime(sample, &timestamp))) + { + WARN("No sample timestamp, hr %#x.\n", hr); + } + else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); - stream->flags &= ~EVR_STREAM_PREROLLING; - stream->flags |= EVR_STREAM_PREROLLED; + IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + + if (stream->flags & EVR_STREAM_PREROLLING) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); + stream->flags &= ~EVR_STREAM_PREROLLING; + stream->flags |= EVR_STREAM_PREROLLED; + } } + LeaveCriticalSection(&stream->cs); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type,

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

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

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 : 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