November 2021 - Wine-commits

Jacek Caban : explorer: Set lib name for null driver.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: cf87ceda7c5d288bd9b4ef33f53f54434f9fe017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf87ceda7c5d288bd9b4ef33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 10 13:04:45 2021 +0100 explorer: Set lib name for null driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 2ba276f52cb..6d577dd0fd1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -836,6 +836,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!wcscmp( name, L"null" )) { TRACE( "display %s using null driver\n", debugstr_guid(guid) ); + wcscpy( libname, L"null" ); null_driver = TRUE; break; }

1 0

Nikolay Sivov : evr/mixer: Implement repainting requests.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: f861bc2abcb7b8e3705812180700ce9b652d2be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f861bc2abcb7b8e370581218… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 10 15:33:21 2021 +0300 evr/mixer: Implement repainting requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 75 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 4f5837a49a4..b9a28c4ad75 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -95,7 +95,8 @@ struct video_mixer IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; - unsigned int is_streaming; + unsigned int is_streaming : 1; + unsigned int output_rendered : 1; struct { COLORREF rgba; @@ -207,6 +208,20 @@ static void video_mixer_update_zorder_map(struct video_mixer *mixer) qsort(mixer->zorder, mixer->input_count, sizeof(*mixer->zorder), video_mixer_zorder_sort_compare); } +static void video_mixer_flush_input(struct video_mixer *mixer) +{ + unsigned int i; + + for (i = 0; i < mixer->input_count; ++i) + { + if (mixer->inputs[i].sample) + IMFSample_Release(mixer->inputs[i].sample); + mixer->inputs[i].sample = NULL; + mixer->inputs[i].sample_requested = 0; + } + mixer->output_rendered = 0; +} + static void video_mixer_clear_types(struct video_mixer *mixer) { unsigned int i; @@ -216,10 +231,8 @@ static void video_mixer_clear_types(struct video_mixer *mixer) if (mixer->inputs[i].media_type) IMFMediaType_Release(mixer->inputs[i].media_type); mixer->inputs[i].media_type = NULL; - if (mixer->inputs[i].sample) - IMFSample_Release(mixer->inputs[i].sample); - mixer->inputs[i].sample = NULL; } + video_mixer_flush_input(mixer); for (i = 0; i < mixer->output.rt_formats_count; ++i) { IMFMediaType_Release(mixer->output.rt_formats[i].media_type); @@ -1129,17 +1142,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, case MFT_MESSAGE_COMMAND_FLUSH: EnterCriticalSection(&mixer->cs); - - for (i = 0; i < mixer->input_count; ++i) - { - if (mixer->inputs[i].sample) - { - IMFSample_Release(mixer->inputs[i].sample); - mixer->inputs[i].sample = NULL; - mixer->inputs[i].sample_requested = 0; - } - } - + video_mixer_flush_input(mixer); LeaveCriticalSection(&mixer->cs); break; @@ -1189,10 +1192,12 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW { if (!input->media_type || !mixer->output.media_type) hr = MF_E_TRANSFORM_TYPE_NOT_SET; - else if (input->sample) + else if (input->sample && !mixer->output_rendered) hr = MF_E_NOTACCEPTING; else { + if (input->sample && mixer->output_rendered) + video_mixer_flush_input(mixer); mixer->is_streaming = 1; input->sample_requested = 0; input->sample = sample; @@ -1361,6 +1366,7 @@ static HRESULT video_mixer_get_sample_desired_time(IMFSample *sample, LONGLONG * IMFDesiredSample *desired; HRESULT hr; + *timestamp = *duration = 0; if (SUCCEEDED(hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired))) { hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired, timestamp, duration); @@ -1370,6 +1376,18 @@ static HRESULT video_mixer_get_sample_desired_time(IMFSample *sample, LONGLONG * return hr; } +static BOOL video_mixer_has_input(const struct video_mixer *mixer) +{ + unsigned int i; + + for (i = 0; i < mixer->input_count; ++i) + { + if (!mixer->inputs[i].sample) return FALSE; + } + + return TRUE; +} + static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { @@ -1377,6 +1395,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D LONGLONG timestamp, duration; IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + BOOL repaint = FALSE; unsigned int i; HRESULT hr; @@ -1396,15 +1415,20 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D { if (mixer->is_streaming) { - for (i = 0; i < mixer->input_count; ++i) + /* Desired timestamp is ignored, duration is required to be non-zero but is not used either. */ + if (SUCCEEDED(video_mixer_get_sample_desired_time(buffers->pSample, &timestamp, &duration))) { - if (!mixer->inputs[i].sample) + if (!(repaint = !!duration)) { - hr = MF_E_TRANSFORM_NEED_MORE_INPUT; - break; + WARN("Unexpected sample duration.\n"); + hr = E_INVALIDARG; } } + /* Not enough input, or no new input. */ + if (SUCCEEDED(hr) && (!video_mixer_has_input(mixer) || (!repaint && mixer->output_rendered))) + hr = MF_E_TRANSFORM_NEED_MORE_INPUT; + if (SUCCEEDED(hr)) { video_mixer_render(mixer, surface); @@ -1412,22 +1436,17 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D timestamp = duration = 0; if (SUCCEEDED(IMFSample_GetSampleTime(mixer->inputs[0].sample, &timestamp))) { - IMFSample_SetSampleTime(buffers->pSample, timestamp); - IMFSample_GetSampleDuration(mixer->inputs[0].sample, &duration); + IMFSample_SetSampleTime(buffers->pSample, timestamp); IMFSample_SetSampleDuration(buffers->pSample, duration); } + mixer->output_rendered = 1; } - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && !repaint) { for (i = 0; i < mixer->input_count; ++i) - { - if (mixer->inputs[i].sample) - IMFSample_Release(mixer->inputs[i].sample); - mixer->inputs[i].sample = NULL; video_mixer_request_sample(mixer, i); - } } } else

1 0

Nikolay Sivov : evr/mixer: Flush on MFT_MESSAGE_NOTIFY_END_STREAMING.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: d86580b69f11572b46390b95ff8a927777864a07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86580b69f11572b46390b95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 10 15:33:22 2021 +0300 evr/mixer: Flush on MFT_MESSAGE_NOTIFY_END_STREAMING. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 21 +++------ dlls/evr/tests/evr.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 14 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b9a28c4ad75..8fe80c2f4a9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1125,34 +1125,27 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, TRACE("%p, %#x, %#lx.\n", iface, message, param); + EnterCriticalSection(&mixer->cs); + switch (message) { case MFT_MESSAGE_SET_D3D_MANAGER: - - EnterCriticalSection(&mixer->cs); - video_mixer_release_device_manager(mixer); if (param) hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager); - LeaveCriticalSection(&mixer->cs); - break; case MFT_MESSAGE_COMMAND_FLUSH: - - EnterCriticalSection(&mixer->cs); video_mixer_flush_input(mixer); - LeaveCriticalSection(&mixer->cs); break; case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING: case MFT_MESSAGE_NOTIFY_END_STREAMING: - - EnterCriticalSection(&mixer->cs); - - if (!mixer->is_streaming) + if (mixer->is_streaming) + video_mixer_flush_input(mixer); + else { for (i = 0; i < mixer->input_count; ++i) video_mixer_request_sample(mixer, i); @@ -1160,8 +1153,6 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, mixer->is_streaming = message == MFT_MESSAGE_NOTIFY_BEGIN_STREAMING; - LeaveCriticalSection(&mixer->cs); - break; case MFT_MESSAGE_COMMAND_DRAIN: @@ -1172,6 +1163,8 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, hr = E_NOTIMPL; } + LeaveCriticalSection(&mixer->cs); + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 57b64937b79..046a7e4db59 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -94,6 +94,15 @@ static IFilterGraph2 *create_graph(void) return ret; } +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -3061,6 +3070,117 @@ static void test_MFIsFormatYUV(void) } } +static void test_mixer_render(void) +{ + IMFMediaType *video_type, *output_type; + IMFVideoMixerControl *mixer_control; + IDirect3DDeviceManager9 *manager; + IMFVideoProcessor *processor; + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + IMFTransform *mixer; + IMFSample *sample; + DWORD status; + HWND window; + UINT token; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); + ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Configure device and media types. */ + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + video_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputAvailableType(mixer, 0, 0, &output_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(mixer, 0, output_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(output_type); + IMFMediaType_Release(video_type); + + surface = create_surface(manager, 64, 64); + ok(!!surface, "Failed to create input surface.\n"); + + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(sample, 1); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 2); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + + /* FLUSH/END_STREAMING releases input */ + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 1); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 2); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_FLUSH, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 1); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + + IMFSample_Release(sample); + IDirect3DSurface9_Release(surface); + IMFTransform_Release(mixer); + + IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); + +done: + DestroyWindow(window); +} + START_TEST(evr) { IMFVideoPresenter *presenter; @@ -3099,6 +3219,7 @@ START_TEST(evr) test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); + test_mixer_render(); test_MFIsFormatYUV(); CoUninitialize();

1 0

Jacek Caban : winebuild: Use find_clang_tool for ld and nm tools.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: c41059bcbafacd4725d48327101087a36d36cd7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c41059bcbafacd4725d48327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 10 17:48:26 2021 +0100 winebuild: Use find_clang_tool for ld and nm tools. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 16b1fc2d968..07acb80eb8a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -273,9 +273,9 @@ struct strarray find_tool( const char *name, const char * const *names ) names++; } - if (!file && names == alt_names + 1) + if (!file && strcmp( name, "as" )) /* llvm-as is not a gas replacement */ { - if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" ); + if (cc_command.count) file = find_clang_tool( cc_command, name ); if (!file && !(file = find_binary( "llvm", name ))) { struct strarray clang = empty_strarray;

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::SetStreamsSelected().
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 5d0858ee9887ef5b99e09912d4379880979ab974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0858ee9887ef5b99e09912… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 10:41:09 2021 -0600 winegstreamer: Implement IWMSyncReader::SetStreamsSelected(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 3 +++ dlls/winegstreamer/wm_reader.c | 48 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 21 +++++++++++------ 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9674ee35052..c7c72ab65fc 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -123,6 +123,7 @@ struct wm_stream WORD index; bool eos; struct wg_format format; + WMT_STREAM_SELECTION selection; }; struct wm_reader @@ -173,5 +174,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); +HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, + const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections); #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index bcae50e5d1e..6b29415e363 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1413,6 +1413,7 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i); stream->reader = reader; stream->index = i; + stream->selection = WMT_ON; wg_parser_stream_get_preferred_format(stream->wg_stream, &stream->format); if (stream->format.major_type == WG_MAJOR_TYPE_AUDIO) { @@ -1739,6 +1740,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, struct wg_parser_event event; struct buffer *object; + if (stream->selection == WMT_OFF) + return NS_E_INVALID_REQUEST; + if (stream->eos) return NS_E_NO_MORE_SAMPLES; @@ -1824,6 +1828,50 @@ void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration) LeaveCriticalSection(&reader->cs); } +HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, + const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections) +{ + struct wm_stream *stream; + WORD i; + + if (!count) + return E_INVALIDARG; + + EnterCriticalSection(&reader->cs); + + for (i = 0; i < count; ++i) + { + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]))) + { + LeaveCriticalSection(&reader->cs); + WARN("Invalid stream number %u; returning NS_E_INVALID_REQUEST.\n", stream_numbers[i]); + return NS_E_INVALID_REQUEST; + } + } + + for (i = 0; i < count; ++i) + { + stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]); + stream->selection = selections[i]; + if (selections[i] == WMT_OFF) + { + TRACE("Disabling stream %u.\n", stream_numbers[i]); + wg_parser_stream_disable(stream->wg_stream); + } + else if (selections[i] == WMT_ON) + { + if (selections[i] != WMT_ON) + FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n", + selections[i], stream_numbers[i]); + TRACE("Enabling stream %u.\n", stream_numbers[i]); + wg_parser_stream_enable(stream->wg_stream, &stream->format); + } + } + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index fff048df06e..3e980c59601 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -83,8 +83,8 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, DWORD *flags, DWORD *output_number, WORD *ret_stream_number) { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + HRESULT hr = NS_E_NO_MORE_SAMPLES; struct wm_stream *stream; - HRESULT hr; WORD i; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," @@ -104,8 +104,12 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, for (i = 0; i < reader->reader.stream_count; ++i) { WORD index = (i + reader->last_read_stream + 1) % reader->reader.stream_count; + struct wm_stream *stream = &reader->reader.streams[index]; - hr = wm_reader_get_stream_sample(&reader->reader.streams[index], sample, pts, duration, flags); + if (stream->selection == WMT_OFF) + continue; + + hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); if (hr == S_OK) { if (output_number) @@ -296,12 +300,15 @@ static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, W return E_NOTIMPL; } -static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, + WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); - return S_OK; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n", + reader, count, stream_numbers, selections); + + return wm_reader_set_streams_selected(&reader->reader, count, stream_numbers, selections); } static HRESULT WINAPI WMSyncReader2_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num,

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetStreamsSelected().
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 3e0a9877eafef1f484987126cd453cc36cfdeb42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0a9877eafef1f484987126… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 10:41:10 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::SetStreamsSelected(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index b7b96c8b884..ced02d454a2 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -85,7 +85,12 @@ static DWORD WINAPI stream_thread(void *arg) for (i = 0; i < stream_count; ++i) { - hr = wm_reader_get_stream_sample(&reader->reader.streams[i], &sample, &pts, &duration, &flags); + struct wm_stream *stream = &reader->reader.streams[i]; + + if (stream->selection == WMT_OFF) + continue; + + hr = wm_reader_get_stream_sample(stream, &sample, &pts, &duration, &flags); if (hr == S_OK) { if (reader->user_clock) @@ -441,12 +446,15 @@ static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvance return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, + WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p %p)\n", This, stream_count, stream_numbers, selections); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n", + reader, count, stream_numbers, selections); + + return wm_reader_set_streams_selected(&reader->reader, count, stream_numbers, selections); } static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num,

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetStreamSelected().
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: a1a51f54dcb3863f9accfbf8c261407794d2bd13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a51f54dcb3863f9accfbf8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 10:41:11 2021 -0600 winegstreamer: Implement IWMSyncReader::GetStreamSelected(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/wm_reader.c | 19 +++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 11 +++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c7c72ab65fc..e1dec7b755c 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -168,6 +168,8 @@ struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader WORD stream_number); HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags); +HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, + WORD stream_number, WMT_STREAM_SELECTION *selection); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 6b29415e363..0e0c639d504 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1872,6 +1872,25 @@ HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, return S_OK; } +HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, + WORD stream_number, WMT_STREAM_SELECTION *selection) +{ + struct wm_stream *stream; + + EnterCriticalSection(&reader->cs); + + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + *selection = stream->selection; + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 3e980c59601..73bbf18898f 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -221,11 +221,14 @@ static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *ifac return S_OK; } -static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_num, WMT_STREAM_SELECTION *selection) +static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, + WORD stream_number, WMT_STREAM_SELECTION *selection) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, stream_number %u, selection %p.\n", reader, stream_number, selection); + + return wm_reader_get_stream_selection(&reader->reader, stream_number, selection); } static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *filename)

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::GetStreamSelected().
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 72b3cb68a702284122a16cbcdd87a621c29bb7a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72b3cb68a702284122a16cbc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 10:41:12 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::GetStreamSelected(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index ced02d454a2..35ed8221aa0 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -457,12 +457,14 @@ static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *if return wm_reader_set_streams_selected(&reader->reader, count, stream_numbers, selections); } -static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num, - WMT_STREAM_SELECTION *selection) +static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, + WORD stream_number, WMT_STREAM_SELECTION *selection) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream_num, selection); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, stream_number %u, selection %p.\n", reader, stream_number, selection); + + return wm_reader_get_stream_selection(&reader->reader, stream_number, selection); } static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks)

1 0

Zebediah Figura : wmvcore/tests: Add tests for stream selection.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: f4b3eb7efbe1d433d7dcf850430f99f0f0066347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b3eb7efbe1d433d7dcf850… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 10:41:13 2021 -0600 wmvcore/tests: Add tests for stream selection. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 236 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 234 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4b3eb7efbe1d433d7dc…

1 0

Rémi Bernon : dinput8/tests: Make test_device_input tests more predictable.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 352b5b188e743088c4e642dbdda95275fc54500f URL: https://source.winehq.org/git/wine.git/?a=commit;h=352b5b188e743088c4e642db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:22 2021 +0100 dinput8/tests: Make test_device_input tests more predictable. Using a notification event to wait for input, addressing spurious failures or timeouts. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 97 ++++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 32 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3cad4ce256c..5ae9e225dc9 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -90,67 +90,100 @@ static void flush_events(void) } } -static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, UINT_PTR expected) +static void test_device_input( IDirectInputDevice8A *device, DWORD type, DWORD code, UINT_PTR expected ) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; - DWORD data_size = 1; + DWORD res, data_size = 1; + HANDLE event; int i; - hr = IDirectInputDevice8_Acquire(lpdid); - ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, error %u\n", GetLastError() ); - if (event_type == INPUT_KEYBOARD) - keybd_event(0, event, KEYEVENTF_SCANCODE, 0); + IDirectInputDevice_Unacquire( device ); - if (event_type == INPUT_MOUSE) - mouse_event( event, 0, 0, 0, 0); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "SetEventNotification returned %#x\n", hr ); - flush_events(); - IDirectInputDevice8_Poll(lpdid); - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); - if (data_size != 1) + if (type == INPUT_KEYBOARD) { - win_skip("We're not able to inject input into Windows dinput8 with events\n"); - IDirectInputDevice_Unacquire(lpdid); - return; + keybd_event( 0, code, KEYEVENTF_SCANCODE, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + keybd_event( 0, code, KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + } + if (type == INPUT_MOUSE) + { + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); } - ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%lu\n", obj_data.uAppData, expected); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( data_size == 1, "got data size %u, expected 1\n", data_size ); + ok( obj_data.uAppData == expected, "got action uAppData %p, expected %p\n", + (void *)obj_data.uAppData, (void *)expected ); /* Check for buffer overflow */ for (i = 0; i < 17; i++) - if (event_type == INPUT_KEYBOARD) + { + if (type == INPUT_KEYBOARD) { - keybd_event( VK_SPACE, DIK_SPACE, 0, 0); - keybd_event( VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + keybd_event( VK_SPACE, DIK_SPACE, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + keybd_event( VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); } - else if (event_type == INPUT_MOUSE) + if (type == INPUT_MOUSE) { - mouse_event(MOUSEEVENTF_LEFTDOWN, 1, 1, 0, 0); - mouse_event(MOUSEEVENTF_LEFTUP, 1, 1, 0, 0); - } + mouse_event( MOUSEEVENTF_LEFTDOWN, 1, 1, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); - flush_events(); - IDirectInputDevice8_Poll(lpdid); + mouse_event( MOUSEEVENTF_LEFTUP, 1, 1, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + } + } data_size = 1; - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); - ok(hr == DI_BUFFEROVERFLOW, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); data_size = 1; - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); - ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( data_size == 1, "got data_size %u, expected 1\n", data_size ); /* drain device's queue */ while (data_size == 1) { - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); if (hr != DI_OK) break; } - IDirectInputDevice_Unacquire(lpdid); + hr = IDirectInputDevice_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned %#x\n", hr ); + + hr = IDirectInputDevice8_SetEventNotification( device, NULL ); + ok( hr == DI_OK, "SetEventNotification returned %#x\n", hr ); + + CloseHandle( event ); } static void test_build_action_map(IDirectInputDevice8A *lpdid, DIACTIONFORMATA *lpdiaf,

1 0