February 2020 - Wine-commits

Zebediah Figura : d3d8: Retrieve vertex shader constants from the primary stateblock.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: ffb8cc3623bde69ac80bfbcd5347581c0779a726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb8cc3623bde69ac80bfbcd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:30 2020 -0600 d3d8: Retrieve vertex shader constants from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 26451255c0..0fcc8bd7a0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -131,6 +131,8 @@ struct d3d8_device DWORD in_destruction : 1; DWORD padding : 14; + unsigned int vs_uniform_count; + /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ struct wined3d_swapchain *implicit_swapchain; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ef1b3afde9..90dec4aaa7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2991,26 +2991,29 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac } static HRESULT WINAPI d3d8_device_GetVertexShaderConstant(IDirect3DDevice8 *iface, - DWORD start_register, void *data, DWORD count) + DWORD start_idx, void *constants, DWORD count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, start_register %u, data %p, count %u.\n", - iface, start_register, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (start_register + count > D3D8_MAX_VERTEX_SHADER_CONSTANTF) + if (!constants) + return D3DERR_INVALIDCALL; + + if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx) { - WARN("Trying to access %u constants, but d3d8 only supports %u\n", - start_register + count, D3D8_MAX_VERTEX_SHADER_CONSTANTF); + WARN("Trying to access %u constants, but d3d8 only supports %u.\n", + start_idx + count, device->vs_uniform_count); return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, count, data); + src = wined3d_stateblock_get_state(device->state)->vs_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetVertexShaderDeclaration(IDirect3DDevice8 *iface, @@ -3668,6 +3671,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; struct d3d8_swapchain *d3d_swapchain; + struct wined3d_caps caps; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3702,6 +3706,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + device->vs_uniform_count = caps.MaxVertexShaderConst; + if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, NULL, WINED3D_SBT_PRIMARY, &device->state))) { ERR("Failed to create primary stateblock, hr %#x.\n", hr);

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetVertexShaderConstant().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: b58a5a55ba2e901e3b06d2ba37b6b50e6895e42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58a5a55ba2e901e3b06d2ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:31 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetVertexShaderConstant(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 90dec4aaa7..c2112445d8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2983,8 +2983,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_f(device->update_state, start_register, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Retrieve the pixel shader from the primary stateblock.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 7cffddc9934fe361781f084aae364bf12f5acabe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cffddc9934fe361781f084a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:32 2020 -0600 d3d8: Retrieve the pixel shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c2112445d8..cf44fa2baa 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3240,7 +3240,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((object = wined3d_device_get_pixel_shader(device->wined3d_device))) + if ((object = wined3d_stateblock_get_state(device->state)->ps)) { struct d3d8_pixel_shader *d3d8_shader; d3d8_shader = wined3d_shader_get_parent(object); @@ -3273,7 +3273,7 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO return D3DERR_INVALIDCALL; } - if (wined3d_device_get_pixel_shader(device->wined3d_device) == shader_impl->wined3d_shader) + if (wined3d_stateblock_get_state(device->state)->ps == shader_impl->wined3d_shader) IDirect3DDevice8_SetPixelShader(iface, 0); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetPixelShader().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 2f25af095d9e68ad736ee4875ff7f2abfdeaaedc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f25af095d9e68ad736ee487… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:33 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetPixelShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cf44fa2baa..957f663174 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3207,8 +3207,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { wined3d_stateblock_set_pixel_shader(device->update_state, NULL); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); return D3D_OK; } @@ -3222,8 +3220,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD TRACE("Setting shader %p.\n", shader_impl); wined3d_stateblock_set_pixel_shader(device->update_state, shader_impl->wined3d_shader); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : qasf/dmowrapper: Implement receiving and delivering samples.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: ed8d3d325fa53bcc70e16e17811f36e94f2b75c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed8d3d325fa53bcc70e16e17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:54 2020 -0600 qasf/dmowrapper: Implement receiving and delivering samples. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 247 ++++++++++++++++++++++++++++- dlls/qasf/tests/dmowrapper.c | 365 ++++++++++++++++++++++++++++++++++++++++--- include/mediaobj.idl | 17 ++ 3 files changed, 609 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed8d3d325fa53bcc70e1…

1 0

Zebediah Figura : qasf/tests: Add tests for IPin::NewSegment().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c10e54066ff6dfb7fdd3c50b80cfe8fd972834f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c10e54066ff6dfb7fdd3c50b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:55 2020 -0600 qasf/tests: Add tests for IPin::NewSegment(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 00ca09de2e..5dcc75d555 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1108,6 +1108,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; + unsigned int got_new_segment; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1250,12 +1251,24 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample return S_OK; } +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_new_segment; + ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop)); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return 0xdeadbeef; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .pfnReceive = testsink_Receive, + .sink_new_segment = testsink_new_segment, }; static void testfilter_init(struct testfilter *filter) @@ -1601,6 +1614,25 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input) IMemAllocator_Release(allocator); } +static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputPin *input, + struct testfilter *testsink, struct testfilter *testsink2) +{ + HRESULT hr; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + ok(!testsink2->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); + hr = IPin_NewSegment(sink, 10000, 20000, 1.0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + ok(testsink2->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -1609,9 +1641,9 @@ static void test_connect_pin(void) .subtype = MEDIASUBTYPE_Avi, .formattype = FORMAT_None, }; + struct testfilter testsource, testsink, testsink2; IBaseFilter *filter = create_dmo_wrapper(); - struct testfilter testsource, testsink; - IPin *sink, *source, *peer; + IPin *sink, *source, *source2, *peer; IMediaControl *control; IMemInputPin *meminput; IFilterGraph2 *graph; @@ -1621,14 +1653,17 @@ static void test_connect_pin(void) testfilter_init(&testsource); testfilter_init(&testsink); + testfilter_init(&testsink2); CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + IFilterGraph2_AddFilter(graph, &testsink2.filter.IBaseFilter_iface, L"sink2"); IFilterGraph2_AddFilter(graph, filter, L"DMO wrapper"); IBaseFilter_FindPin(filter, L"in0", &sink); IBaseFilter_FindPin(filter, L"out0", &source); + IBaseFilter_FindPin(filter, L"out1", &source2); IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&meminput); /* Test sink connection. */ @@ -1695,6 +1730,17 @@ static void test_connect_pin(void) test_filter_state(control); test_sample_processing(control, meminput); + /* Streaming event tests are more interesting if multiple source pins are + * connected. */ + + hr = IFilterGraph2_ConnectDirect(graph, source2, &testsink2.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_streaming_events(control, sink, meminput, &testsink, &testsink2); + + IFilterGraph2_Disconnect(graph, source2); + IFilterGraph2_Disconnect(graph, &testsink2.sink.pin.IPin_iface); + hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, source); @@ -1830,6 +1876,7 @@ static void test_connect_pin(void) IPin_Release(sink); IPin_Release(source); + IPin_Release(source2); IMemInputPin_Release(meminput); IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); @@ -1840,6 +1887,8 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsink2.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); } START_TEST(dmowrapper)

1 0

Zebediah Figura : qasf/dmowrapper: Flush the DMO on receiving EOS.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 86202ed6dff413d6d670118d6db0af9f3e533155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86202ed6dff413d6d670118d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:56 2020 -0600 qasf/dmowrapper: Flush the DMO on receiving EOS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 27 ++++++++++++++ dlls/qasf/tests/dmowrapper.c | 88 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 104 insertions(+), 11 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 41fe34cf1e..9e0a178542 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -335,6 +335,32 @@ out: return hr; } +static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); + DWORD index = iface - filter->sinks, i; + IMediaObject *dmo; + HRESULT hr; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) + ERR("Discontinuity() failed, hr %#x.\n", hr); + + process_output(filter, dmo); + if (FAILED(hr = IMediaObject_Flush(dmo))) + ERR("Flush() failed, hr %#x.\n", hr); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + IPin_EndOfStream(filter->sources[i].pin.pin.peer); + } + + IMediaObject_Release(dmo); + return hr; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dmo_wrapper_sink_query_interface, @@ -342,6 +368,7 @@ static const struct strmbase_sink_ops sink_ops = .base.pin_get_media_type = dmo_wrapper_sink_get_media_type, .sink_connect = dmo_wrapper_sink_connect, .sink_disconnect = dmo_wrapper_sink_disconnect, + .sink_eos = dmo_wrapper_sink_eos, .pfnReceive = dmo_wrapper_sink_Receive, }; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 5dcc75d555..b509839de4 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -307,7 +307,7 @@ static HRESULT WINAPI dmo_ProcessInput(IMediaObject *iface, DWORD index, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(len == 256, "Got length %u.\n", len); - if (testmode == 0) + if (testmode == 0 || testmode == 12) { ok(!flags, "Got flags %#x.\n", flags); ok(!timestamp, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp)); @@ -356,7 +356,10 @@ static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, ok(count == 2, "Got count %u.\n", count); ok(!!buffers[0].pBuffer, "Expected a buffer.\n"); - ok(!buffers[1].pBuffer, "Got unexpected buffer %p.\n", buffers[1].pBuffer); + if (testmode == 12) + ok(!!buffers[1].pBuffer, "Expected a buffer.\n"); + else + ok(!buffers[1].pBuffer, "Got unexpected buffer %p.\n", buffers[1].pBuffer); buffers[1].dwStatus = DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; @@ -372,6 +375,15 @@ static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, buffers[0].rtTimelength = 1000; buffers[0].rtTimestamp = 5000; + if (buffers[1].pBuffer) + { + buffers[1].dwStatus = buffers[0].dwStatus; + buffers[1].rtTimelength = buffers[0].rtTimelength; + buffers[1].rtTimestamp = buffers[0].rtTimestamp; + hr = IMediaBuffer_SetLength(buffers[1].pBuffer, 300); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + if (testmode == 3) { hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 16200); @@ -399,8 +411,9 @@ static HRESULT WINAPI dmo_ProcessOutput(IMediaObject *iface, DWORD flags, data[i] = 111 - i; hr = IMediaBuffer_SetLength(buffers[0].pBuffer, 300); ok(hr == S_OK, "Got hr %#x.\n", hr); - if (testmode != 10) + if (testdmo_buffer) IMediaBuffer_Release(testdmo_buffer); + testdmo_buffer = NULL; return S_OK; } @@ -1108,7 +1121,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; - unsigned int got_new_segment; + unsigned int got_new_segment, got_eos; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1210,12 +1223,15 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample ok(len == 300, "Got length %u.\n", len); - hr = IMediaSample_GetPointer(sample, &data); - ok(hr == S_OK, "Got hr %#x.\n", hr); + if (testmode != 12) + { + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); - for (i = 0; i < 300; ++i) - expect[i] = 111 - i; - ok(!memcmp(data, expect, 300), "Data didn't match.\n"); + for (i = 0; i < 300; ++i) + expect[i] = 111 - i; + ok(!memcmp(data, expect, 300), "Data didn't match.\n"); + } } hr = IMediaSample_GetTime(sample, &start, &stop); @@ -1262,6 +1278,13 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface, return 0xdeadbeef; } +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_eos; + return 0xdeadbeef; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, @@ -1269,6 +1292,7 @@ static const struct strmbase_sink_ops testsink_ops = .base.pin_get_media_type = testsink_get_media_type, .pfnReceive = testsink_Receive, .sink_new_segment = testsink_new_segment, + .sink_eos = testsink_eos, }; static void testfilter_init(struct testfilter *filter) @@ -1605,11 +1629,10 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input) ok(got_ProcessOutput == 2, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); - got_ProcessInput = got_ProcessOutput = got_Receive = 0; + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); - IMediaSample_Release(sample); IMemAllocator_Release(allocator); } @@ -1617,11 +1640,30 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input) static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputPin *input, struct testfilter *testsink, struct testfilter *testsink2) { + IMemAllocator *allocator; + IMediaSample *sample; HRESULT hr; + BYTE *data; + LONG i; hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + got_Flush = 0; + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); ok(!testsink2->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); hr = IPin_NewSegment(sink, 10000, 20000, 1.0); @@ -1629,8 +1671,32 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); ok(testsink2->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink2->got_new_segment); + ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + ok(!testsink2->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); + testmode = 12; + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!got_ProcessInput, "Got %u calls to ProcessInput().\n", got_ProcessInput); + ok(got_Discontinuity == 1, "Got %u calls to Discontinuity().\n", got_Discontinuity); + ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); + ok(got_Flush == 1, "Got %u calls to Flush().\n", got_Flush); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); + got_ProcessInput = got_ProcessOutput = got_Receive = got_Discontinuity = 0; + + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); } static void test_connect_pin(void)

1 0

Zebediah Figura : qasf/dmowrapper: Flush the DMO on IPin::EndFlush().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f4ae2e3b4db34afdc4fabb81046f9e29dd7e5aa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ae2e3b4db34afdc4fabb81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:57 2020 -0600 qasf/dmowrapper: Flush the DMO on IPin::EndFlush(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 23 ++++++++++++++++++++++ dlls/qasf/tests/dmowrapper.c | 47 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 9e0a178542..32a9d41b7a 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -361,6 +361,28 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) return hr; } +static HRESULT dmo_wrapper_end_flush(struct strmbase_sink *iface) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); + IMediaObject *dmo; + HRESULT hr; + DWORD i; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + if (FAILED(hr = IMediaObject_Flush(dmo))) + ERR("Flush() failed, hr %#x.\n", hr); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + IPin_EndFlush(filter->sources[i].pin.pin.peer); + } + + IMediaObject_Release(dmo); + return hr; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dmo_wrapper_sink_query_interface, @@ -369,6 +391,7 @@ static const struct strmbase_sink_ops sink_ops = .sink_connect = dmo_wrapper_sink_connect, .sink_disconnect = dmo_wrapper_sink_disconnect, .sink_eos = dmo_wrapper_sink_eos, + .sink_end_flush = dmo_wrapper_end_flush, .pfnReceive = dmo_wrapper_sink_Receive, }; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index b509839de4..9ec9f85d55 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1121,7 +1121,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; - unsigned int got_new_segment, got_eos; + unsigned int got_new_segment, got_eos, got_begin_flush, got_end_flush; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1285,6 +1285,20 @@ static HRESULT testsink_eos(struct strmbase_sink *iface) return 0xdeadbeef; } +static HRESULT testsink_begin_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_begin_flush; + return 0xdeadbeef; +} + +static HRESULT testsink_end_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_end_flush; + return 0xdeadbeef; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, @@ -1293,6 +1307,8 @@ static const struct strmbase_sink_ops testsink_ops = .pfnReceive = testsink_Receive, .sink_new_segment = testsink_new_segment, .sink_eos = testsink_eos, + .sink_begin_flush = testsink_begin_flush, + .sink_end_flush = testsink_end_flush, }; static void testfilter_init(struct testfilter *filter) @@ -1693,6 +1709,35 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP hr = IMemInputPin_Receive(input, sample); todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + got_Flush = 0; + ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + ok(!testsink2->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink2->got_begin_flush); + hr = IPin_BeginFlush(sink); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + ok(testsink2->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink2->got_begin_flush); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(sink); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ok(!testsink->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + ok(!testsink2->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink2->got_end_flush); + hr = IPin_EndFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + ok(testsink2->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink2->got_end_flush); + ok(got_Flush, "Expected IMediaObject::Flush().\n"); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + todo_wine ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + todo_wine ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); IMediaSample_Release(sample);

1 0

Zebediah Figura : qasf/dmowrapper: Implement seeking via pass-through.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: d4e91228e50595a632bbab63e5014a93c3037719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4e91228e50595a632bbab63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:58 2020 -0600 qasf/dmowrapper: Implement seeking via pass-through. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 26 ++++++++++++++++++++++++++ dlls/qasf/tests/dmowrapper.c | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 32a9d41b7a..cba9023e13 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -32,6 +32,7 @@ struct dmo_wrapper_source { struct strmbase_source pin; struct buffer buffer; + IUnknown *seeking; }; struct dmo_wrapper @@ -400,6 +401,16 @@ static inline struct dmo_wrapper_source *impl_source_from_strmbase_pin(struct st return CONTAINING_RECORD(iface, struct dmo_wrapper_source, pin.pin); } +static HRESULT dmo_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct dmo_wrapper_source *pin = impl_source_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMediaSeeking) || IsEqualGUID(iid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(pin->seeking, iid, out); + + return E_NOINTERFACE; +} + static HRESULT dmo_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->filter); @@ -476,6 +487,7 @@ static void dmo_wrapper_source_disconnect(struct strmbase_source *iface) static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = dmo_wrapper_source_query_interface, .base.pin_query_accept = dmo_wrapper_source_query_accept, .base.pin_get_media_type = dmo_wrapper_source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -556,9 +568,20 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID for (i = 0; i < output_count; ++i) { + ISeekingPassThru *passthrough; + swprintf(id, ARRAY_SIZE(id), L"out%u", i); strmbase_source_init(&sources[i].pin, &filter->filter, id, &source_ops); sources[i].buffer.IMediaBuffer_iface.lpVtbl = &buffer_vtbl; + + if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, + (IUnknown *)&sources[i].pin.pin.IPin_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&sources[i].seeking))) + ERR("Failed to create SeekingPassThru object, hr %#x.\n", hr); + + IUnknown_QueryInterface(sources[i].seeking, &IID_ISeekingPassThru, (void **)&passthrough); + ISeekingPassThru_Init(passthrough, FALSE, &sinks[0].pin.IPin_iface); + ISeekingPassThru_Release(passthrough); } EnterCriticalSection(&filter->filter.csFilter); @@ -606,7 +629,10 @@ static void dmo_wrapper_destroy(struct strmbase_filter *iface) for (i = 0; i < filter->sink_count; ++i) strmbase_sink_cleanup(&filter->sinks[i]); for (i = 0; i < filter->source_count; ++i) + { + IUnknown_Release(filter->sources[i].seeking); strmbase_source_cleanup(&filter->sources[i].pin); + } free(filter->sinks); free(filter->sources); strmbase_filter_cleanup(&filter->filter); diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 9ec9f85d55..50546ec2a8 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -574,8 +574,8 @@ static void test_interfaces(void) IBaseFilter_FindPin(filter, L"out0", &pin); - todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); check_interface(pin, &IID_IPin, TRUE); todo_wine check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE);

1 0

Francois Gouget : shell32/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 8c5795611cb40f7fef6efe473a39402b3a68f168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5795611cb40f7fef6efe47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 08:08:49 2020 +0100 shell32/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9ec7226312..f3a634dc29 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1779,7 +1779,7 @@ static void test_NonExistentPath(void) STARTUPINFOA startup; PROCESS_INFORMATION info; - sprintf(buffer, "%s tests/shellpath.c 1", selfname); + sprintf(buffer, "%s shellpath 1", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -1794,7 +1794,7 @@ static void test_NonExistentPath(void) strlen(originalPath) + 1); RegFlushKey(key); - sprintf(buffer, "%s tests/shellpath.c 2", selfname); + sprintf(buffer, "%s shellpath 2", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

1 0