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

Józef Kucia : vkd3d-shader: Assign unique locations for patch constants.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: vkd3d Branch: master Commit: a81729cf88bda71f80020ff8eb221621926ee290 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a81729cf88bda71f80020ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 12 14:08:02 2019 +0200 vkd3d-shader: Assign unique locations for patch constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e308ef3..a559da1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3937,10 +3937,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } else { + unsigned int location = reg_idx; + + if (reg->type == VKD3DSPR_PATCHCONST) + location += compiler->input_signature->element_count; + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, input_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, location); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); @@ -4301,6 +4306,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { + unsigned int location = reg->idx[0].offset; + + if (is_patch_constant) + location += compiler->output_signature->element_count; + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, id); @@ -4312,7 +4322,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, location); } if (component_idx)

1 0

Zebediah Figura : quartz/filtergraph: Use the type info cache for IBasicAudio.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 014012ddf3298ce117c9a54f681c7ee7e58c2230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=014012ddf3298ce117c9a54f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:13 2019 -0400 quartz/filtergraph: Use the type info cache for IBasicAudio. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 95 ++++++++++++----------------------------- dlls/quartz/tests/filtergraph.c | 5 +++ 2 files changed, 33 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9606a49..45da4f2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3058,90 +3058,51 @@ static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) return IUnknown_Release(This->outer_unk); } -/*** IDispatch methods ***/ -static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) +static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *count) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - IBasicAudio* pBasicAudio; - HRESULT hr; - - TRACE("(%p/%p)->(%p)\n", This, iface, pctinfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio); - - if (hr == S_OK) - hr = IBasicAudio_GetTypeInfoCount(pBasicAudio, pctinfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) +static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - IBasicAudio* pBasicAudio; - HRESULT hr; - - TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio); - - if (hr == S_OK) - hr = IBasicAudio_GetTypeInfo(pBasicAudio, iTInfo, lcid, ppTInfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IBasicAudio_tid, typeinfo); } -static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, - UINT cNames, LCID lcid, DISPID *rgDispId) +static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - IBasicAudio* pBasicAudio; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio); - - if (hr == S_OK) - hr = IBasicAudio_GetIDsOfNames(pBasicAudio, riid, rgszNames, cNames, lcid, rgDispId); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } return hr; } -static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, - UINT *puArgErr) +static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - IBasicAudio* pBasicAudio; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, - debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio); - - if (hr == S_OK) - hr = IBasicAudio_Invoke(pBasicAudio, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e6f2afa..adad45a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2495,6 +2495,7 @@ static void test_control_delegation(void) IBaseFilter *renderer; IVideoWindow *window; IBasicVideo *video; + ULONG count; HRESULT hr; LONG val; @@ -2503,6 +2504,10 @@ static void test_control_delegation(void) hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); ok(hr == S_OK, "got %#x\n", hr); + hr = IBasicAudio_GetTypeInfoCount(audio, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + hr = IBasicAudio_put_Volume(audio, -10); ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Volume(audio, &val);

1 0

Zebediah Figura : quartz/filtergraph: Use the type info cache for IVideoWindow.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 245649f87adec84fcc29bca94bafa00fadef0e4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=245649f87adec84fcc29bca9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:14 2019 -0400 quartz/filtergraph: Use the type info cache for IVideoWindow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 96 ++++++++++++----------------------------- dlls/quartz/tests/filtergraph.c | 5 +++ 2 files changed, 33 insertions(+), 68 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 45da4f2..046a0a1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4066,94 +4066,54 @@ static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) return IUnknown_Release(This->outer_unk); } -/*** IDispatch methods ***/ -static HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *pctinfo) +HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - IVideoWindow *pVideoWindow; - HRESULT hr; - - TRACE("(%p/%p)->(%p)\n", This, iface, pctinfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); - - if (hr == S_OK) - hr = IVideoWindow_GetTypeInfoCount(pVideoWindow, pctinfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -static HRESULT WINAPI VideoWindow_GetTypeInfo(IVideoWindow *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) +HRESULT WINAPI VideoWindow_GetTypeInfo(IVideoWindow *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - IVideoWindow *pVideoWindow; - HRESULT hr; - - TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); - - if (hr == S_OK) - hr = IVideoWindow_GetTypeInfo(pVideoWindow, iTInfo, lcid, ppTInfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IVideoWindow_tid, typeinfo); } -static HRESULT WINAPI VideoWindow_GetIDsOfNames(IVideoWindow *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT WINAPI VideoWindow_GetIDsOfNames(IVideoWindow *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - IVideoWindow *pVideoWindow; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); - - if (hr == S_OK) - hr = IVideoWindow_GetIDsOfNames(pVideoWindow, riid, rgszNames, cNames, lcid, rgDispId); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } return hr; } -static HRESULT WINAPI VideoWindow_Invoke(IVideoWindow *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, - UINT*puArgErr) +static HRESULT WINAPI VideoWindow_Invoke(IVideoWindow *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - IVideoWindow *pVideoWindow; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, - debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); - - if (hr == S_OK) - hr = IVideoWindow_Invoke(pVideoWindow, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } return hr; } - /*** IVideoWindow methods ***/ static HRESULT WINAPI VideoWindow_put_Caption(IVideoWindow *iface, BSTR strCaption) { diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index adad45a..976617e 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2572,9 +2572,14 @@ static void test_control_delegation(void) /* Unlike IBasicAudio, these return E_NOINTERFACE. */ hr = IBasicVideo_get_BitRate(video, &val); ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_GetTypeInfoCount(window, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); ok(hr == S_OK, "got %#x\n", hr);

1 0

Zebediah Figura : quartz/filtergraph: Use the type info cache for IBasicVideo.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 6edee72560651f45c01dd05385c95633f377bc8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edee72560651f45c01dd053… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:15 2019 -0400 quartz/filtergraph: Use the type info cache for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 95 ++++++++++++----------------------------- dlls/quartz/tests/filtergraph.c | 27 +++++++++--- 2 files changed, 49 insertions(+), 73 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 046a0a1..c9710f1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3234,90 +3234,51 @@ static ULONG WINAPI BasicVideo_Release(IBasicVideo2 *iface) return IUnknown_Release(This->outer_unk); } -/*** IDispatch methods ***/ -static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *pctinfo) +static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *count) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; - HRESULT hr; - - TRACE("(%p/%p)->(%p)\n", This, iface, pctinfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_GetTypeInfoCount(pBasicVideo, pctinfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo2 *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) +static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo2 *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; - HRESULT hr; - - TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_GetTypeInfo(pBasicVideo, iTInfo, lcid, ppTInfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo); } -static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo2 *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_GetIDsOfNames(pBasicVideo, riid, rgszNames, cNames, lcid, rgDispId); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } return hr; } -static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo2 *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, - UINT *puArgErr) +static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo2 *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, - debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_Invoke(pBasicVideo, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 976617e..d89c9e2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2494,7 +2494,9 @@ static void test_control_delegation(void) IBasicAudio *audio, *filter_audio; IBaseFilter *renderer; IVideoWindow *window; - IBasicVideo *video; + IBasicVideo2 *video; + ITypeInfo *typeinfo; + TYPEATTR *typeattr; ULONG count; HRESULT hr; LONG val; @@ -2564,15 +2566,28 @@ static void test_control_delegation(void) /* IBasicVideo and IVideoWindow */ - hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo, (void **)&video); + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo2, (void **)&video); ok(hr == S_OK, "got %#x\n", hr); hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "got %#x\n", hr); /* Unlike IBasicAudio, these return E_NOINTERFACE. */ - hr = IBasicVideo_get_BitRate(video, &val); + hr = IBasicVideo2_get_BitRate(video, &val); ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IBasicVideo2_GetTypeInfoCount(video, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + + hr = IBasicVideo2_GetTypeInfo(video, 0, 0, &typeinfo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(typeattr->typekind == TKIND_DISPATCH, "Got kind %u.\n", typeattr->typekind); + ok(IsEqualGUID(&typeattr->guid, &IID_IBasicVideo), "Got IID %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == E_NOINTERFACE, "got %#x\n", hr); @@ -2586,7 +2601,7 @@ static void test_control_delegation(void) hr = IFilterGraph2_AddFilter(graph, renderer, NULL); ok(hr == S_OK, "got %#x\n", hr); - hr = IBasicVideo_get_BitRate(video, &val); + hr = IBasicVideo2_get_BitRate(video, &val); ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); @@ -2594,13 +2609,13 @@ static void test_control_delegation(void) hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "got %#x\n", hr); - hr = IBasicVideo_get_BitRate(video, &val); + hr = IBasicVideo2_get_BitRate(video, &val); ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == E_NOINTERFACE, "got %#x\n", hr); IBaseFilter_Release(renderer); - IBasicVideo_Release(video); + IBasicVideo2_Release(video); IVideoWindow_Release(window); IFilterGraph2_Release(graph); }

1 0

Zebediah Figura : strmbase: Don' t increment the pin reference count in filter_get_pin().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 690838a0e01368d475ab3cd1dd1910309edb606f URL: https://source.winehq.org/git/wine.git/?a=commit;h=690838a0e01368d475ab3cd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:16 2019 -0400 strmbase: Don't increment the pin reference count in filter_get_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 13 ++++--------- dlls/qcap/avimux.c | 15 ++++----------- dlls/qcap/smartteefilter.c | 15 +++++---------- dlls/qcap/vfwcapture.c | 1 - dlls/qedit/samplegrabber.c | 13 ++++--------- dlls/quartz/filesource.c | 10 ++++------ dlls/quartz/parser.c | 8 +++----- dlls/strmbase/enumpins.c | 24 ++++++++---------------- dlls/strmbase/filter.c | 8 ++------ dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 1 - dlls/winegstreamer/gstdemux.c | 16 +++++----------- dlls/wineqtdecoder/qtsplitter.c | 12 ------------ 13 files changed, 39 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690838a0e01368d475ab…

1 0

Andrew Eikum : winebus.sys: Close SDL handles when a device is removed.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: f8a04c7f2e2c77eef663c5bb2109e3dbd51b22e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8a04c7f2e2c77eef663c5bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 11 10:29:14 2019 -0500 winebus.sys: Close SDL handles when a device is removed. This fixes opening SDL haptic handles after a device is removed and re-added. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1a938aa..d24e21c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -75,6 +75,7 @@ static void *sdl_handle = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); MAKE_FUNCPTR(SDL_Init); +MAKE_FUNCPTR(SDL_JoystickClose); MAKE_FUNCPTR(SDL_JoystickEventState); MAKE_FUNCPTR(SDL_JoystickGetGUID); MAKE_FUNCPTR(SDL_JoystickGetGUIDString); @@ -89,6 +90,7 @@ MAKE_FUNCPTR(SDL_JoystickNumHats); MAKE_FUNCPTR(SDL_JoystickGetAxis); MAKE_FUNCPTR(SDL_JoystickGetHat); MAKE_FUNCPTR(SDL_IsGameController); +MAKE_FUNCPTR(SDL_GameControllerClose); MAKE_FUNCPTR(SDL_GameControllerGetAxis); MAKE_FUNCPTR(SDL_GameControllerGetButton); MAKE_FUNCPTR(SDL_GameControllerName); @@ -879,13 +881,28 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) static void try_remove_device(SDL_JoystickID index) { DEVICE_OBJECT *device = NULL; + struct platform_private *private; + SDL_Joystick *sdl_joystick; + SDL_GameController *sdl_controller; + SDL_Haptic *sdl_haptic; device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); if (!device) return; + private = impl_from_DEVICE_OBJECT(device); + sdl_joystick = private->sdl_joystick; + sdl_controller = private->sdl_controller; + sdl_haptic = private->sdl_haptic; + IoInvalidateDeviceRelations(device, RemovalRelations); bus_remove_hid_device(device); + + pSDL_JoystickClose(sdl_joystick); + if (sdl_controller) + pSDL_GameControllerClose(sdl_controller); + if (sdl_haptic) + pSDL_HapticClose(sdl_haptic); } static void try_add_device(SDL_JoystickID index) @@ -1085,6 +1102,7 @@ NTSTATUS sdl_driver_init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(sdl_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(SDL_GetError); LOAD_FUNCPTR(SDL_Init); + LOAD_FUNCPTR(SDL_JoystickClose); LOAD_FUNCPTR(SDL_JoystickEventState); LOAD_FUNCPTR(SDL_JoystickGetGUID); LOAD_FUNCPTR(SDL_JoystickGetGUIDString); @@ -1099,6 +1117,7 @@ NTSTATUS sdl_driver_init(void) LOAD_FUNCPTR(SDL_JoystickGetAxis); LOAD_FUNCPTR(SDL_JoystickGetHat); LOAD_FUNCPTR(SDL_IsGameController); + LOAD_FUNCPTR(SDL_GameControllerClose); LOAD_FUNCPTR(SDL_GameControllerGetAxis); LOAD_FUNCPTR(SDL_GameControllerGetButton); LOAD_FUNCPTR(SDL_GameControllerName);

1 0

Nikolay Sivov : mfplat: Add MFRegisterLocalByteStreamHandler().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: c7b956f8fcf18c0b66271c22a8d82369bb0788f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7b956f8fcf18c0b66271c22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:01 2019 +0300 mfplat: Add MFRegisterLocalByteStreamHandler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 75 +++++++++++++++++++++++++++++++++++++--------- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 15 ++++++++++ 3 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c0866f7..f759b5c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -47,13 +47,22 @@ static LONG platform_lock; struct local_handler { struct list entry; - WCHAR *scheme; + union + { + WCHAR *scheme; + struct + { + WCHAR *extension; + WCHAR *mime; + } bytestream; + } u; IMFActivate *activate; }; static CRITICAL_SECTION local_handlers_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_scheme_handlers = LIST_INIT(local_scheme_handlers); +static struct list local_bytestream_handlers = LIST_INIT(local_bytestream_handlers); struct system_clock { @@ -7153,21 +7162,25 @@ static const IMFAsyncCallbackVtbl async_create_file_callback_vtbl = async_create_file_callback_Invoke, }; -static WCHAR *heap_strdupW(const WCHAR *str) +static HRESULT heap_strdupW(const WCHAR *str, WCHAR **dest) { - WCHAR *ret = NULL; + HRESULT hr = S_OK; if (str) { unsigned int size; size = (lstrlenW(str) + 1) * sizeof(WCHAR); - ret = heap_alloc(size); - if (ret) - memcpy(ret, str, size); + *dest = heap_alloc(size); + if (*dest) + memcpy(*dest, str, size); + else + hr = E_OUTOFMEMORY; } + else + *dest = NULL; - return ret; + return hr; } /*********************************************************************** @@ -7201,12 +7214,8 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD async->access_mode = access_mode; async->open_mode = open_mode; async->flags = flags; - async->path = heap_strdupW(path); - if (!async->path) - { - hr = E_OUTOFMEMORY; + if (FAILED(hr = heap_strdupW(path, &async->path))) goto failed; - } hr = MFCreateAsyncResult(NULL, &async->IMFAsyncCallback_iface, (IUnknown *)caller, &item); if (FAILED(hr)) @@ -7300,6 +7309,7 @@ HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie) HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *activate) { struct local_handler *handler; + HRESULT hr; TRACE("%s, %p.\n", debugstr_w(scheme), activate); @@ -7309,10 +7319,10 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac if (!(handler = heap_alloc(sizeof(*handler)))) return E_OUTOFMEMORY; - if (!(handler->scheme = heap_strdupW(scheme))) + if (FAILED(hr = heap_strdupW(scheme, &handler->u.scheme))) { heap_free(handler); - return E_OUTOFMEMORY; + return hr; } handler->activate = activate; IMFActivate_AddRef(handler->activate); @@ -7323,3 +7333,40 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac return S_OK; } + +/*********************************************************************** + * MFRegisterLocalByteStreamHandler (mfplat.@) + */ +HRESULT WINAPI MFRegisterLocalByteStreamHandler(const WCHAR *extension, const WCHAR *mime, IMFActivate *activate) +{ + struct local_handler *handler; + HRESULT hr; + + TRACE("%s, %s, %p.\n", debugstr_w(extension), debugstr_w(mime), activate); + + if ((!extension && !mime) || !activate) + return E_INVALIDARG; + + if (!(handler = heap_alloc_zero(sizeof(*handler)))) + return E_OUTOFMEMORY; + + hr = heap_strdupW(extension, &handler->u.bytestream.extension); + if (SUCCEEDED(hr)) + hr = heap_strdupW(mime, &handler->u.bytestream.mime); + + if (FAILED(hr)) + goto failed; + + EnterCriticalSection(&local_handlers_section); + list_add_head(&local_bytestream_handlers, &handler->entry); + LeaveCriticalSection(&local_handlers_section); + + return hr; + +failed: + heap_free(handler->u.bytestream.extension); + heap_free(handler->u.bytestream.mime); + heap_free(handler); + + return hr; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2dfa92f..1ae0927 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -128,6 +128,7 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stdcall MFPutWorkItemEx2(long long ptr) @ stub MFRecordError +@ stdcall MFRegisterLocalByteStreamHandler(wstr wstr ptr) @ stdcall MFRegisterLocalSchemeHandler(wstr ptr) @ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ab651c5..e63efc1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3591,6 +3591,21 @@ static void test_local_handlers(void) hr = pMFRegisterLocalSchemeHandler(localW, &local_activate); ok(hr == S_OK, "Failed to register scheme handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, NULL, &local_activate); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, localW, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(localW, NULL, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(localW, localW, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); } START_TEST(mfplat)

1 0

Nikolay Sivov : mfplat: Give priority to local scheme handlers.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 5f4cf1363096e53057242581954eef8af5c6271d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f4cf1363096e53057242581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:02 2019 +0300 mfplat: Give priority to local scheme handlers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f759b5c..c24407f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5092,12 +5092,34 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, { static const char schemehandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + HRESULT hr = MF_E_UNSUPPORTED_SCHEME; unsigned int i; - HRESULT hr; TRACE("%s, %#x, %p.\n", debugstr_w(scheme), flags, handler); - /* FIXME: check local handlers first */ + *handler = NULL; + + if (!(flags & MF_RESOLUTION_DISABLE_LOCAL_PLUGINS)) + { + struct local_handler *local_handler; + + EnterCriticalSection(&local_handlers_section); + + LIST_FOR_EACH_ENTRY(local_handler, &local_scheme_handlers, struct local_handler, entry) + { + if (!lstrcmpiW(scheme, local_handler->u.scheme)) + { + if (SUCCEEDED(hr = IMFActivate_ActivateObject(local_handler->activate, &IID_IMFSchemeHandler, + (void **)handler))) + break; + } + } + + LeaveCriticalSection(&local_handlers_section); + + if (*handler) + return hr; + } for (i = 0; i < ARRAY_SIZE(hkey_roots); ++i) {

1 0

Nikolay Sivov : mfplat: Give priority to local bytestream handlers.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 1cc06fb257fb7728604c826a753239b2085845b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc06fb257fb7728604c826a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:03 2019 +0300 mfplat: Give priority to local bytestream handlers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c24407f..78ae417 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5031,9 +5031,9 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA IMFAttributes *attributes; const WCHAR *url_ext; WCHAR *mimeW = NULL; + HRESULT hr = E_FAIL; unsigned int i, j; UINT32 length; - HRESULT hr; *handler = NULL; @@ -5053,7 +5053,28 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; } - /* FIXME: check local handlers first */ + if (!(flags & MF_RESOLUTION_DISABLE_LOCAL_PLUGINS)) + { + struct local_handler *local_handler; + + EnterCriticalSection(&local_handlers_section); + + LIST_FOR_EACH_ENTRY(local_handler, &local_bytestream_handlers, struct local_handler, entry) + { + if ((mimeW && !lstrcmpiW(mimeW, local_handler->u.bytestream.mime)) + || (url_ext && !lstrcmpiW(url_ext, local_handler->u.bytestream.extension))) + { + if (SUCCEEDED(hr = IMFActivate_ActivateObject(local_handler->activate, &IID_IMFByteStreamHandler, + (void **)handler))) + break; + } + } + + LeaveCriticalSection(&local_handlers_section); + + if (*handler) + return hr; + } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) {

1 0

Nikolay Sivov : mf: Add support for IMFSampleGrabberSinkCallback2.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 2d4387c1f5ce12010cea48402a7a26bfab55fb5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4387c1f5ce12010cea4840… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:04 2019 +0300 mf: Add support for IMFSampleGrabberSinkCallback2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 42 +++++++++++++++++++++++++++++++++++------- include/mfidl.idl | 17 +++++++++++++++++ 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 9cf9465..7bc566f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -66,6 +66,7 @@ struct sample_grabber_stream LONG refcount; struct sample_grabber *sink; IMFMediaEventQueue *event_queue; + IMFAttributes *sample_attributes; enum sink_state state; struct list items; IUnknown *cancel_key; @@ -79,6 +80,7 @@ struct sample_grabber IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; IMFSampleGrabberSinkCallback *callback; + IMFSampleGrabberSinkCallback2 *callback2; IMFMediaType *media_type; BOOL is_shut_down; struct sample_grabber_stream *stream; @@ -90,6 +92,11 @@ struct sample_grabber CRITICAL_SECTION cs; }; +static IMFSampleGrabberSinkCallback *sample_grabber_get_callback(const struct sample_grabber *sink) +{ + return sink->callback2 ? (IMFSampleGrabberSinkCallback *)sink->callback2 : sink->callback; +} + struct sample_grabber_activate_context { IMFMediaType *media_type; @@ -209,6 +216,8 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) IMFMediaEventQueue_Shutdown(stream->event_queue); IMFMediaEventQueue_Release(stream->event_queue); } + if (stream->sample_attributes) + IMFAttributes_Release(stream->sample_attributes); LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &stream->items, struct scheduled_item, entry) { stream_release_pending_item(item); @@ -333,8 +342,16 @@ static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFS if (SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &size))) { - hr = IMFSampleGrabberSinkCallback_OnProcessSample(grabber->callback, &major_type, flags, sample_time, - sample_duration, data, size); + if (grabber->callback2) + { + hr = IMFSample_CopyAllItems(sample, grabber->stream->sample_attributes); + if (SUCCEEDED(hr)) + hr = IMFSampleGrabberSinkCallback2_OnProcessSampleEx(grabber->callback2, &major_type, flags, + sample_time, sample_duration, data, size, grabber->stream->sample_attributes); + } + else + hr = IMFSampleGrabberSinkCallback_OnProcessSample(grabber->callback, &major_type, flags, sample_time, + sample_duration, data, size); IMFMediaBuffer_Unlock(buffer); } @@ -814,7 +831,10 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) if (!refcount) { - IMFSampleGrabberSinkCallback_Release(grabber->callback); + if (grabber->callback) + IMFSampleGrabberSinkCallback_Release(grabber->callback); + if (grabber->callback2) + IMFSampleGrabberSinkCallback2_Release(grabber->callback2); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) { @@ -941,7 +961,8 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&grabber->cs); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(grabber->callback, clock))) + if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), + clock))) { if (grabber->clock) { @@ -1008,7 +1029,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) EnterCriticalSection(&grabber->cs); grabber->is_shut_down = TRUE; - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(grabber->callback))) + if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); @@ -1246,6 +1267,9 @@ static HRESULT sample_grabber_create_stream(struct sample_grabber *sink, struct if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto failed; + if (FAILED(hr = MFCreateAttributes(&object->sample_attributes, 0))) + goto failed; + *stream = object; return S_OK; @@ -1277,8 +1301,12 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use 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); + if (FAILED(IMFSampleGrabberSinkCallback_QueryInterface(context->callback, &IID_IMFSampleGrabberSinkCallback2, + (void **)&object->callback2))) + { + object->callback = context->callback; + IMFSampleGrabberSinkCallback_AddRef(object->callback); + } object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); diff --git a/include/mfidl.idl b/include/mfidl.idl index 4968bf9..66a8477 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -549,6 +549,23 @@ interface IMFSampleGrabberSinkCallback : IMFClockStateSink HRESULT OnShutdown(); } +[ + object, + uuid(ca86aa50-c46e-429e-ab27-16d6ac6844cb), + local +] +interface IMFSampleGrabberSinkCallback2 : IMFSampleGrabberSinkCallback +{ + HRESULT OnProcessSampleEx( + [in] REFGUID major_type, + [in] DWORD sample_flags, + [in] LONGLONG sample_time, + [in] LONGLONG sample_duration, + [in] const BYTE *buffer, + [in] DWORD sample_size, + [in] IMFAttributes *attributes); +} + cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);")

1 0