May 2019 - Wine-commits - list.winehq.org

Andrew Eikum : winebus.sys: Add missing padding between hatswitch and constant.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: f8ebb3ac3754fbdd47201328cced0b156a1b820f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ebb3ac3754fbdd47201328… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 10:31:06 2019 -0500 winebus.sys: Add missing padding between hatswitch and constant. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d79c200..2b367e5 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -548,19 +548,23 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) BYTE *report_ptr; INT i, descript_size; + static const int BUTTON_BIT_COUNT = CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4; + descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); descript_size += sizeof(CONTROLLER_AXIS); descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += sizeof(CONTROLLER_BUTTONS); descript_size += sizeof(REPORT_HATSWITCH); descript_size += sizeof(REPORT_PADDING); + if (BUTTON_BIT_COUNT % 8 != 0) + descript_size += sizeof(REPORT_PADDING); descript_size += test_haptic(ext); ext->axis_start = 0; ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; - ext->buffer_length = (CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4 + 7) / 8 + ext->buffer_length = (BUTTON_BIT_COUNT + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD) + 2/* unknown constant*/; @@ -586,6 +590,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); report_ptr += sizeof(CONTROLLER_BUTTONS); report_ptr = add_hatswitch(report_ptr, 1); + if (BUTTON_BIT_COUNT % 8 != 0) + report_ptr = add_padding_block(report_ptr, 8 - (BUTTON_BIT_COUNT % 8));/* unused bits between hatswitch and following constant */ report_ptr = add_padding_block(report_ptr, 16);/* unknown constant */ report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -606,8 +612,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); /* unknown constant */ - ext->report_buffer[12] = 0x89; - ext->report_buffer[13] = 0xc5; + ext->report_buffer[14] = 0x89; + ext->report_buffer[15] = 0xc5; return TRUE; }

1 0

Zebediah Figura : mshtml: Fix a copy-paste error.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: f8fffe9e86fbadb4af7185297052f9937322a550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8fffe9e86fbadb4af718529… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 10:33:24 2019 -0500 mshtml: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e637f13..2033e90 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -299,7 +299,7 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(!info->arg_types) return; info->arg_info = heap_alloc_zero(sizeof(*info->arg_info) * info->argc); - if(!info->arg_types) + if(!info->arg_info) return; for(i=0; i < info->argc; i++)

1 0

Zebediah Figura : mshtml: Avoid passing invalid memory to DispCallFunc().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 23e0d22b7c8c350b47e76c611218a4e7ff5ac570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23e0d22b7c8c350b47e76c61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 10:33:25 2019 -0500 mshtml: Avoid passing invalid memory to DispCallFunc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47222 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 2033e90..4363067 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -295,22 +295,28 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, assert(info->argc < MAX_ARGS); assert(desc->funckind == FUNC_DISPATCH); - info->arg_types = heap_alloc(sizeof(*info->arg_types) * info->argc); - if(!info->arg_types) - return; info->arg_info = heap_alloc_zero(sizeof(*info->arg_info) * info->argc); if(!info->arg_info) return; - for(i=0; i < info->argc; i++) - info->arg_types[i] = desc->lprgelemdescParam[i].tdesc.vt; - info->prop_vt = desc->elemdescFunc.tdesc.vt; if(info->prop_vt != VT_VOID && info->prop_vt != VT_PTR && !is_arg_type_supported(info->prop_vt)) { TRACE("%s: return type %d\n", debugstr_w(info->name), info->prop_vt); return; /* Fallback to ITypeInfo::Invoke */ } + info->arg_types = heap_alloc(sizeof(*info->arg_types) * (info->argc + (info->prop_vt == VT_VOID ? 0 : 1))); + if(!info->arg_types) + return; + + for(i=0; i < info->argc; i++) + info->arg_types[i] = desc->lprgelemdescParam[i].tdesc.vt; + + if(info->prop_vt == VT_PTR) + info->arg_types[info->argc] = VT_BYREF | VT_DISPATCH; + else if(info->prop_vt != VT_VOID) + info->arg_types[info->argc] = VT_BYREF | info->prop_vt; + if(desc->cParamsOpt) { TRACE("%s: optional params\n", debugstr_w(info->name)); return; /* Fallback to ITypeInfo::Invoke */

1 0

Nikolay Sivov : kernelbase: Add remaining string handling functions from shlwapi.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 4960e415e2c60a7c2a5c041ef3e7e1332d59b9d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4960e415e2c60a7c2a5c041e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 16:40:29 2019 +0300 kernelbase: Add remaining string handling functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 34 ++--- dlls/kernelbase/string.c | 306 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 323 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4960e415e2c60a7c2a5c…

1 0

Huw Davies : explorer: Set the default driver to mac, x11 in all cases.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: e73d824121e5e3dcac3a734d4f2913c5ff43c5d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73d824121e5e3dcac3a734d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 20 14:43:59 2019 +0100 explorer: Set the default driver to mac,x11 in all cases. The host specific options won't work with the PE build anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 2857fcf..d4925f7 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -37,11 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff -#ifdef __APPLE__ static const WCHAR default_driver[] = {'m','a','c',',','x','1','1',0}; -#else -static const WCHAR default_driver[] = {'x','1','1',0}; -#endif static BOOL using_root;

1 0

Nikolay Sivov : mf: Add sample grabber sink stub.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: dfd8457fd5686b105d9356a38e5aff8243de89fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfd8457fd5686b105d9356a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:28 2019 +0300 mf: Add sample grabber sink stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 2 +- dlls/mf/samplegrabber.c | 422 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 139 +++++++++++++++- include/mferror.h | 14 ++ include/mfidl.idl | 32 ++++ 5 files changed, 602 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dfd8457fd5686b105d93…

1 0

Nikolay Sivov : mf: Add IMFMediaTypeHandler stub for grabber stream.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: a2c8658bd2683e97226d26dea2717e6dcef0da39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c8658bd2683e97226d26de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:29 2019 +0300 mf: Add IMFMediaTypeHandler stub for grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 37 ++++++++----------- 2 files changed, 112 insertions(+), 23 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 997c9db..a6a18dd 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct sample_grabber_stream { IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; IMFMediaSink *sink; }; @@ -69,6 +70,11 @@ static struct sample_grabber_stream *impl_from_IMFStreamSink(IMFStreamSink *ifac return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFStreamSink_iface); } +static struct sample_grabber_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFMediaTypeHandler_iface); +} + static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); @@ -80,6 +86,10 @@ static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, { *obj = &stream->IMFStreamSink_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &stream->IMFMediaTypeHandler_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -172,9 +182,14 @@ static HRESULT WINAPI sample_grabber_stream_GetIdentifier(IMFStreamSink *iface, static HRESULT WINAPI sample_grabber_stream_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + *handler = &stream->IMFMediaTypeHandler_iface; + IMFMediaTypeHandler_AddRef(*handler); + + return S_OK; } static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -216,6 +231,84 @@ static const IMFStreamSinkVtbl sample_grabber_stream_vtbl = sample_grabber_stream_Flush, }; +static HRESULT WINAPI sample_grabber_stream_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, + void **obj) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_stream_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_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 sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType **type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = +{ + sample_grabber_stream_type_handler_QueryInterface, + sample_grabber_stream_type_handler_AddRef, + sample_grabber_stream_type_handler_Release, + sample_grabber_stream_type_handler_IsMediaTypeSupported, + sample_grabber_stream_type_handler_GetMediaTypeCount, + sample_grabber_stream_type_handler_GetMediaTypeByIndex, + sample_grabber_stream_type_handler_SetCurrentMediaType, + sample_grabber_stream_type_handler_GetCurrentMediaType, + sample_grabber_stream_type_handler_GetMajorType, +}; + static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -424,6 +517,7 @@ static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink ** return E_OUTOFMEMORY; object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; + object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->refcount = 1; object->sink = sink; IMFMediaSink_AddRef(object->sink); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2987e86..b37fdba 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1724,22 +1724,19 @@ todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); hr = IMFStreamSink_QueryInterface(stream, &IID_IMFMediaTypeHandler, (void **)&handler2); -todo_wine ok(hr == S_OK, "Failed to get handler interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); - ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); - ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); - ok(count == 0, "Unexpected count %u.\n", count); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); +todo_wine { + ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); + ok(count == 0, "Unexpected count %u.\n", count); +} + ok(handler == handler2, "Unexpected handler.\n"); - ok(handler == handler2, "Unexpected handler.\n"); - - IMFMediaTypeHandler_Release(handler); - IMFMediaTypeHandler_Release(handler2); - } + IMFMediaTypeHandler_Release(handler); + IMFMediaTypeHandler_Release(handler2); hr = IMFActivate_ShutdownObject(activate); todo_wine @@ -1773,16 +1770,14 @@ todo_wine ok(id == 0, "Unexpected id %#x.\n", id); hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); -todo_wine ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); - ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); - ok(count == 0, "Unexpected count %u.\n", count); - IMFMediaTypeHandler_Release(handler); - } + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); +todo_wine { + ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); + ok(count == 0, "Unexpected count %u.\n", count); +} + IMFMediaTypeHandler_Release(handler); IMFMediaSink_Release(sink); IMFStreamSink_Release(stream);

1 0

Nikolay Sivov : mf: Add clock state sink stub for grabber.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: e6c488de36a968e6338579fa9691169f301969d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c488de36a968e6338579fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:30 2019 +0300 mf: Add clock state sink stub for grabber. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 4 +-- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index a6a18dd..f0b2324 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -38,6 +38,7 @@ struct sample_grabber_stream struct sample_grabber { IMFMediaSink IMFMediaSink_iface; + IMFClockStateSink IMFClockStateSink_iface; LONG refcount; IMFSampleGrabberSinkCallback *callback; IMFMediaType *media_type; @@ -65,6 +66,11 @@ static struct sample_grabber *impl_from_IMFMediaSink(IMFMediaSink *iface) return CONTAINING_RECORD(iface, struct sample_grabber, IMFMediaSink_iface); } +static struct sample_grabber *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFClockStateSink_iface); +} + static struct sample_grabber_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFStreamSink_iface); @@ -320,6 +326,10 @@ static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &grabber->IMFMediaSink_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &grabber->IMFClockStateSink_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -508,6 +518,71 @@ static const IMFMediaSinkVtbl sample_grabber_sink_vtbl = sample_grabber_sink_Shutdown, }; +static HRESULT WINAPI sample_grabber_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_clock_sink_Release(IMFClockStateSink *iface) +{ + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = +{ + sample_grabber_clock_sink_QueryInterface, + sample_grabber_clock_sink_AddRef, + sample_grabber_clock_sink_Release, + sample_grabber_clock_sink_OnClockStart, + sample_grabber_clock_sink_OnClockStop, + sample_grabber_clock_sink_OnClockPause, + sample_grabber_clock_sink_OnClockRestart, + sample_grabber_clock_sink_OnClockSetRate, +}; + static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink **stream) { struct sample_grabber_stream *object; @@ -540,6 +615,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &sample_grabber_clock_sink_vtbl; object->refcount = 1; object->callback = context->callback; IMFSampleGrabberSinkCallback_AddRef(object->callback); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b37fdba..43d2690 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1709,10 +1709,8 @@ static void test_sample_grabber(void) ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clocksink); -todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFClockStateSink_Release(clocksink); + IMFClockStateSink_Release(clocksink); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); todo_wine

1 0

Nikolay Sivov : mf: Add events support for grabber stream.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 2045afe45087f2fe2896d7c37c4ed2d7143a6df7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2045afe45087f2fe2896d7c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:31 2019 +0300 mf: Add events support for grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f0b2324..a94b825 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include "mfapi.h" #include "mfidl.h" #include "mferror.h" #include "mf_private.h" @@ -33,6 +34,7 @@ struct sample_grabber_stream IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; IMFMediaSink *sink; + IMFMediaEventQueue *event_queue; }; struct sample_grabber @@ -128,6 +130,8 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) if (!refcount) { IMFMediaSink_Release(stream->sink); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFMediaEventQueue_Release(stream->event_queue); heap_free(stream); } @@ -136,33 +140,41 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) static HRESULT WINAPI sample_grabber_stream_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("%p, %#x, %p.\n", iface, flags, event); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } static HRESULT WINAPI sample_grabber_stream_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } static HRESULT WINAPI sample_grabber_stream_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("%p, %p, %p.\n", iface, result, event); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } static HRESULT WINAPI sample_grabber_stream_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI sample_grabber_stream_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) @@ -586,6 +598,7 @@ static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink **stream) { struct sample_grabber_stream *object; + HRESULT hr; object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -597,9 +610,17 @@ static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink ** object->sink = sink; IMFMediaSink_AddRef(object->sink); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; + *stream = &object->IMFStreamSink_iface; return S_OK; + +failed: + IMFStreamSink_Release(&object->IMFStreamSink_iface); + + return hr; } static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj)

1 0

Nikolay Sivov : mf: Add events support for grabber sink.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: c742a4e18dc7b8d82aa9dc3ba1880dc5d53ab209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c742a4e18dc7b8d82aa9dc3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:32 2019 +0300 mf: Add events support for grabber sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 107 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/mf/tests/mf.c | 4 +- 2 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index a94b825..b62502f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -41,11 +41,13 @@ struct sample_grabber { IMFMediaSink IMFMediaSink_iface; IMFClockStateSink IMFClockStateSink_iface; + IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; IMFSampleGrabberSinkCallback *callback; IMFMediaType *media_type; BOOL is_shut_down; IMFStreamSink *stream; + IMFMediaEventQueue *event_queue; CRITICAL_SECTION cs; }; @@ -73,6 +75,11 @@ static struct sample_grabber *impl_from_IMFClockStateSink(IMFClockStateSink *ifa return CONTAINING_RECORD(iface, struct sample_grabber, IMFClockStateSink_iface); } +static struct sample_grabber *impl_from_IMFMediaEventGenerator(IMFMediaEventGenerator *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFMediaEventGenerator_iface); +} + static struct sample_grabber_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFStreamSink_iface); @@ -130,8 +137,11 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) if (!refcount) { IMFMediaSink_Release(stream->sink); - IMFMediaEventQueue_Shutdown(stream->event_queue); - IMFMediaEventQueue_Release(stream->event_queue); + if (stream->event_queue) + { + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFMediaEventQueue_Release(stream->event_queue); + } heap_free(stream); } @@ -342,6 +352,10 @@ static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &grabber->IMFClockStateSink_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaEventGenerator)) + { + *obj = &grabber->IMFMediaEventGenerator_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -375,6 +389,11 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) { IMFSampleGrabberSinkCallback_Release(grabber->callback); IMFMediaType_Release(grabber->media_type); + if (grabber->event_queue) + { + IMFMediaEventQueue_Shutdown(grabber->event_queue); + IMFMediaEventQueue_Release(grabber->event_queue); + } DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -583,6 +602,74 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink return E_NOTIMPL; } +static HRESULT WINAPI sample_grabber_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_events_AddRef(IMFMediaEventGenerator *iface) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_events_Release(IMFMediaEventGenerator *iface) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_events_GetEvent(IMFMediaEventGenerator *iface, DWORD flags, IMFMediaEvent **event) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(grabber->event_queue, flags, event); +} + +static HRESULT WINAPI sample_grabber_events_BeginGetEvent(IMFMediaEventGenerator *iface, IMFAsyncCallback *callback, + IUnknown *state) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(grabber->event_queue, callback, state); +} + +static HRESULT WINAPI sample_grabber_events_EndGetEvent(IMFMediaEventGenerator *iface, IMFAsyncResult *result, + IMFMediaEvent **event) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(grabber->event_queue, result, event); +} + +static HRESULT WINAPI sample_grabber_events_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType event_type, + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(grabber->event_queue, event_type, ext_type, hr, value); +} + +static const IMFMediaEventGeneratorVtbl sample_grabber_sink_events_vtbl = +{ + sample_grabber_events_QueryInterface, + sample_grabber_events_AddRef, + sample_grabber_events_Release, + sample_grabber_events_GetEvent, + sample_grabber_events_BeginGetEvent, + sample_grabber_events_EndGetEvent, + sample_grabber_events_QueueEvent, +}; + static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = { sample_grabber_clock_sink_QueryInterface, @@ -637,23 +724,31 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; object->IMFClockStateSink_iface.lpVtbl = &sample_grabber_clock_sink_vtbl; + object->IMFMediaEventGenerator_iface.lpVtbl = &sample_grabber_sink_events_vtbl; object->refcount = 1; object->callback = context->callback; IMFSampleGrabberSinkCallback_AddRef(object->callback); object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); InitializeCriticalSection(&object->cs); + if (FAILED(hr = sample_grabber_create_stream(&object->IMFMediaSink_iface, &object->stream))) - { - IMFMediaSink_Release(&object->IMFMediaSink_iface); - return hr; - } + goto failed; + + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; *obj = (IUnknown *)&object->IMFMediaSink_iface; TRACE("Created %p.\n", *obj); return S_OK; + +failed: + + IMFMediaSink_Release(&object->IMFMediaSink_iface); + + return hr; } static const struct activate_funcs sample_grabber_activate_funcs = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 43d2690..317d611 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1713,10 +1713,8 @@ static void test_sample_grabber(void) IMFClockStateSink_Release(clocksink); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); -todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFMediaEventGenerator_Release(eg); + IMFMediaEventGenerator_Release(eg); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);

1 0