September 2020 - Wine-commits

Jeff Smith : qcap: Enumerate one media type if pin format has been set.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 7712a48c8907059426ddb78a47184b2d218d822b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7712a48c8907059426ddb78a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Sep 8 11:15:10 2020 -0500 qcap: Enumerate one media type if pin format has been set. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 1 + dlls/qcap/tests/videocapture.c | 7 ++----- dlls/qcap/v4l.c | 16 ++++++++++++++++ dlls/qcap/vfwcapture.c | 15 ++------------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 70a8c85ad4..bbbe2ef43e 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -51,6 +51,7 @@ struct video_capture_device_ops HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt); + HRESULT (*get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt); HRESULT (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE **mt, VIDEO_STREAM_CONFIG_CAPS *caps); LONG (*get_caps_count)(struct video_capture_device *device); HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 8bda036e1d..e8175f5df9 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -109,7 +109,7 @@ static void test_stream_config(IPin *pin) ok(hr == S_OK, "Got hr %#x.\n", hr); DeleteMediaType(format2); hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); IEnumMediaTypes_Release(enum_media_types); format->majortype = MEDIATYPE_Audio; @@ -200,10 +200,7 @@ static void test_stream_config(IPin *pin) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - - todo_wine_if (!compare_media_types(format, format2)) - ok(compare_media_types(format, format2), "Media types didn't match.\n"); - + ok(compare_media_types(format, format2), "Media types didn't match.\n"); DeleteMediaType(format2); IEnumMediaTypes_Release(enum_media_types); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 94fe6b7dd0..b1d7e68d42 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -227,6 +227,21 @@ static HRESULT v4l_device_get_format(struct video_capture_device *iface, AM_MEDI return CopyMediaType(mt, &device->current_caps->media_type); } +static HRESULT v4l_device_get_media_type(struct video_capture_device *iface, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct v4l_device *device = v4l_device(iface); + unsigned int caps_count = (device->current_caps) ? 1 : device->caps_count; + + if (index >= caps_count) + return VFW_S_NO_MORE_ITEMS; + + if (device->current_caps) + return CopyMediaType(mt, &device->current_caps->media_type); + + return CopyMediaType(mt, &device->caps[index].media_type); +} + static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) { switch (property) @@ -515,6 +530,7 @@ static const struct video_capture_device_ops v4l_device_ops = .check_format = v4l_device_check_format, .set_format = v4l_device_set_format, .get_format = v4l_device_get_format, + .get_media_type = v4l_device_get_media_type, .get_caps = v4l_device_get_caps, .get_caps_count = v4l_device_get_caps_count, .get_prop_range = v4l_device_get_prop_range, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 910be107b0..c4df4cb1c8 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -521,21 +521,10 @@ static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE } static HRESULT source_get_media_type(struct strmbase_pin *pin, - unsigned int index, AM_MEDIA_TYPE *pmt) + unsigned int index, AM_MEDIA_TYPE *mt) { VfwCapture *filter = impl_from_strmbase_pin(pin); - AM_MEDIA_TYPE *vfw_pmt; - HRESULT hr; - - if (index >= filter->device->ops->get_caps_count(filter->device)) - return VFW_S_NO_MORE_ITEMS; - - if (SUCCEEDED(hr = filter->device->ops->get_caps(filter->device, index, &vfw_pmt, NULL))) - { - CopyMediaType(pmt, vfw_pmt); - DeleteMediaType(vfw_pmt); - } - return hr; + return filter->device->ops->get_media_type(filter->device, index, mt); } static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out)

1 0

Jacek Caban : conhost: Move console input processing into a separated function.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 33be1cf598b0319855bf14ee88a0120636df6032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33be1cf598b0319855bf14ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 19:35:04 2020 +0200 conhost: Move console input processing into a separated function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9830ff0182..1afc3517e7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -396,9 +396,19 @@ static NTSTATUS read_console_input( struct console *console, size_t out_size ) return STATUS_SUCCESS; } +static NTSTATUS process_console_input( struct console *console ) +{ + if (console->record_count && console->pending_read) + { + read_console_input( console, console->pending_read ); + console->pending_read = 0; + } + return STATUS_SUCCESS; +} + /* add input events to a console input queue */ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, - unsigned int count ) + unsigned int count, BOOL flush ) { TRACE( "%u\n", count ); @@ -443,12 +453,7 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD } } console->record_count += count; - if (count && console->pending_read) - { - read_console_input( console, console->pending_read ); - console->pending_read = 0; - } - return STATUS_SUCCESS; + return flush ? process_console_input( console ) : STATUS_SUCCESS; } static NTSTATUS screen_buffer_activate( struct screen_buffer *screen_buffer ) @@ -604,7 +609,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, ir.EventType = WINDOW_BUFFER_SIZE_EVENT; ir.Event.WindowBufferSizeEvent.dwSize.X = info->width; ir.Event.WindowBufferSizeEvent.dwSize.Y = info->height; - write_console_input( screen_buffer->console, &ir, 1 ); + write_console_input( screen_buffer->console, &ir, 1, TRUE ); } } if (params->mask & SET_CONSOLE_OUTPUT_INFO_ATTR) @@ -1146,7 +1151,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_WRITE_INPUT: if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; - return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) ); + return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD), TRUE ); case IOCTL_CONDRV_PEEK: {

1 0

Jacek Caban : conhost: Add tty input implementation.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: a8ccb7fa04cae768214e649928e1ee10804f0c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ccb7fa04cae768214e6499… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 19:35:12 2020 +0200 conhost: Add tty input implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.c | 263 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 262 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ccb7fa04cae768214e…

1 0

Jacek Caban : conhost/tests: Add tty input tests.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: ed64fd72a7ab48f5f48e7dcbd4d666f851365993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed64fd72a7ab48f5f48e7dcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 19:35:21 2020 +0200 conhost/tests: Add tty input tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 257 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 256 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed64fd72a7ab48f5f48e…

1 0

Jacek Caban : kernel32/tests: Skip more tests on old Windows.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: e151e4c8a12281306caee136edfa24cadeabde59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e151e4c8a12281306caee136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 19:35:31 2020 +0200 kernel32/tests: Skip more tests on old Windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 46816f6ac0..b42594a73f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3652,6 +3652,8 @@ static void test_FreeConsole(void) ret = SetConsoleOutputCP(GetOEMCP()); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + if (skip_nt) return; + SetLastError(0xdeadbeef); memset( title, 0xc0, sizeof(title) ); size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); @@ -3659,8 +3661,6 @@ static void test_FreeConsole(void) ok(title[0] == 0xc0c0, "title byffer changed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); - if (skip_nt) return; - SetLastError(0xdeadbeef); ret = SetConsoleTitleW( L"test" ); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleTitleW returned %x(%u)\n", ret, GetLastError());

1 0

Jacek Caban : conhost: Use more standard hide cursor sequence.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: e58ef508a935e69f26c614063346d4ba67667cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58ef508a935e69f26c61406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 19:35:37 2020 +0200 conhost: Use more standard hide cursor sequence. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/tests/tty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 087cbf9d0a..84a1c8ac7d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -247,7 +247,7 @@ static void hide_tty_cursor( struct console *console ) { if (console->tty_cursor_visible) { - tty_write( console, "\x1b[25l", 5 ); + tty_write( console, "\x1b[?25l", 6 ); console->tty_cursor_visible = FALSE; } } diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 6b645aa873..6bcfa176f3 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -119,7 +119,7 @@ static BOOL skip_byte_(unsigned int line, char ch) static void expect_hide_cursor_(unsigned int line) { if (!console_output_count) fetch_console_output_(line); - ok_(__FILE__,line)(skip_sequence_(line, "\x1b[25l") || broken(skip_sequence_(line, "\x1b[?25l")), + ok_(__FILE__,line)(skip_sequence_(line, "\x1b[?25l") || broken(skip_sequence_(line, "\x1b[25l")), "expected hide cursor escape\n"); }

1 0

Nikolay Sivov : mf/tests: Fix tests crashes.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 9c898dcc1944105abbaeaeb3d53ce6f7f6113956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c898dcc1944105abbaeaeb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:05:57 2020 +0300 mf/tests: Fix tests crashes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f01385cc46..7013939ab0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1451,7 +1451,10 @@ todo_wine return; hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); +todo_wine ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + return; hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Create stream sinks for default mixer inputs.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 98fab7e0acd85e51c21d6549e5da34de49eae54e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98fab7e0acd85e51c21d6549… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:05:58 2020 +0300 mf/evr: Create stream sinks for default mixer inputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 93ad06b949..161c0d9b73 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -409,11 +409,35 @@ static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface return S_OK; } +static HRESULT video_renderer_add_stream(struct video_renderer *renderer, unsigned int id, + IMFStreamSink **stream_sink) +{ + struct video_stream *stream; + HRESULT hr; + + if (!mf_array_reserve((void **)&renderer->streams, &renderer->stream_size, renderer->stream_count + 1, + sizeof(*renderer->streams))) + { + return E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr = video_renderer_stream_create(renderer, id, &stream))) + { + if (stream_sink) + { + *stream_sink = &stream->IMFStreamSink_iface; + IMFStreamSink_AddRef(*stream_sink); + } + renderer->streams[renderer->stream_count++] = stream; + } + + return hr; +} + static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD id, IMFMediaType *media_type, IMFStreamSink **stream_sink) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); - struct video_stream *stream; HRESULT hr; TRACE("%p, %#x, %p, %p.\n", iface, id, media_type, stream_sink); @@ -425,20 +449,7 @@ static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO hr = MF_E_SHUTDOWN; else if (SUCCEEDED(hr = IMFTransform_AddInputStreams(renderer->mixer, 1, &id))) { - if (mf_array_reserve((void **)&renderer->streams, &renderer->stream_size, renderer->stream_count + 1, - sizeof(*renderer->streams))) - { - if (SUCCEEDED(hr = video_renderer_stream_create(renderer, id, &stream))) - { - *stream_sink = &stream->IMFStreamSink_iface; - IMFStreamSink_AddRef(*stream_sink); - renderer->streams[renderer->stream_count++] = stream; - } - } - else - hr = E_OUTOFMEMORY; - - if (FAILED(hr)) + if (FAILED(hr = video_renderer_add_stream(renderer, id, stream_sink))) IMFTransform_DeleteInputStream(renderer->mixer, id); } @@ -1109,6 +1120,35 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA IMFTopologyServiceLookupClient_Release(lookup_client); } + if (SUCCEEDED(hr)) + { + unsigned int input_count, output_count; + unsigned int *ids, *oids; + size_t i; + + /* Create stream sinks for inputs that mixer already has by default. */ + if (SUCCEEDED(IMFTransform_GetStreamCount(*out, &input_count, &output_count))) + { + ids = heap_calloc(input_count, sizeof(*ids)); + oids = heap_calloc(output_count, sizeof(*oids)); + + if (ids && oids) + { + if (SUCCEEDED(IMFTransform_GetStreamIDs(*out, input_count, ids, output_count, oids))) + { + for (i = 0; i < input_count; ++i) + { + video_renderer_add_stream(renderer, ids[i], NULL); + } + } + + } + + heap_free(ids); + heap_free(oids); + } + } + return hr; }

1 0

Nikolay Sivov : mf/evr: Add a IMFMediaTypeHandler stub for input video streams.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 3625f762500970d1ae3d4b21a6fd23cf4a0f0c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3625f762500970d1ae3d4b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:05:59 2020 +0300 mf/evr: Add a IMFMediaTypeHandler stub for input video streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 161c0d9b73..b27610e073 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -37,6 +37,7 @@ struct video_renderer; struct video_stream { IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; unsigned int id; struct video_renderer *parent; @@ -114,6 +115,11 @@ static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); } +static struct video_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct video_stream, IMFMediaTypeHandler_iface); +} + static void video_renderer_release_services(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; @@ -137,12 +143,26 @@ static void video_renderer_release_services(struct video_renderer *renderer) static HRESULT WINAPI video_stream_sink_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { + struct video_stream *stream = impl_from_IMFStreamSink(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + *obj = NULL; + if (IsEqualIID(riid, &IID_IMFStreamSink) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFStreamSink_AddRef(iface); + } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &stream->IMFMediaTypeHandler_iface; + } + + if (*obj) + { + IUnknown_AddRef((IUnknown *)*obj); return S_OK; } @@ -252,9 +272,20 @@ static HRESULT WINAPI video_stream_sink_GetIdentifier(IMFStreamSink *iface, DWOR static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + if (!handler) + return E_POINTER; + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + *handler = &stream->IMFMediaTypeHandler_iface; + IMFMediaTypeHandler_AddRef(*handler); + + return S_OK; } static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -296,6 +327,82 @@ static const IMFStreamSinkVtbl video_stream_sink_vtbl = video_stream_sink_Flush, }; +static HRESULT WINAPI video_stream_typehandler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, + void **obj) +{ + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI video_stream_typehandler_AddRef(IMFMediaTypeHandler *iface) +{ + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) +{ + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static const IMFMediaTypeHandlerVtbl video_stream_type_handler_vtbl = +{ + video_stream_typehandler_QueryInterface, + video_stream_typehandler_AddRef, + video_stream_typehandler_Release, + video_stream_typehandler_IsMediaTypeSupported, + video_stream_typehandler_GetMediaTypeCount, + video_stream_typehandler_GetMediaTypeByIndex, + video_stream_typehandler_SetCurrentMediaType, + video_stream_typehandler_GetCurrentMediaType, + video_stream_typehandler_GetMajorType, +}; + static HRESULT video_renderer_stream_create(struct video_renderer *renderer, unsigned int id, struct video_stream **ret) { @@ -306,6 +413,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; + stream->IMFMediaTypeHandler_iface.lpVtbl = &video_stream_type_handler_vtbl; stream->refcount = 1; if (FAILED(hr = MFCreateEventQueue(&stream->event_queue)))

1 0

Nikolay Sivov : mf/evr: Add GetMajorType() for the stream sink.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 3d8d05dbeb373bc2189d74bb48a433618c62e90f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8d05dbeb373bc2189d74bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:06:00 2020 +0300 mf/evr: Add GetMajorType() for the stream sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 13 +++++++++++-- dlls/mf/tests/mf.c | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index b27610e073..31bc110ea4 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -385,9 +385,18 @@ static HRESULT WINAPI video_stream_typehandler_GetCurrentMediaType(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { - FIXME("%p, %p.\n", iface, type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + if (!type) + return E_POINTER; + + memcpy(type, &MFMediaType_Video, sizeof(*type)); + return S_OK; } static const IMFMediaTypeHandlerVtbl video_stream_type_handler_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7013939ab0..2c02b1d8e5 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3236,16 +3236,19 @@ todo_wine static void test_evr(void) { IMFMediaEventGenerator *ev_generator; + IMFMediaTypeHandler *type_handler; IMFVideoRenderer *video_renderer; IMFClockStateSink *clock_sink; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; + IMFStreamSink *stream_sink; IMFActivate *activate; DWORD flags, count; IMFGetService *gs; IUnknown *unk; UINT64 value; HRESULT hr; + GUID guid; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -3267,6 +3270,23 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + /* Primary stream type handler. */ + hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + + IMFStreamSink_Release(stream_sink); + IMFMediaTypeHandler_Release(type_handler); + hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags);

1 0