September 2019 - Wine-commits

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantF().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 7033bca45c474d81d3e0e4cd4d7894e5cafd39cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7033bca45c474d81d3e0e4cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:43 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantF(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3e3d5c7050..8436967ddd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3471,8 +3471,13 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, - reg_idx, count, (const struct wined3d_vec4 *)data); + hr = wined3d_stateblock_set_vs_consts_f(device->update_state, reg_idx, + count, (const struct wined3d_vec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + { + hr = wined3d_device_set_vs_consts_f(device->wined3d_device, + reg_idx, count, (const struct wined3d_vec4 *)data); + } wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetVertexShaderConstant().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 79cf8dfcfd156003c8d03c485ca27ebfef86ea73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79cf8dfcfd156003c8d03c48… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:44 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetVertexShaderConstant(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index aac6c9e2f6..be43314d3c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2910,7 +2910,9 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac } wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); + hr = wined3d_stateblock_set_vs_consts_f(device->update_state, start_register, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Nikolay Sivov : wined3d: Fail SRV creation for resources without corresponding bind flag.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 76d3f0431af819d322dfe93dd3809eed6523dc6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76d3f0431af819d322dfe93d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 26 10:02:35 2019 +0300 wined3d: Fail SRV creation for resources without corresponding bind flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 3 --- dlls/d3d10core/tests/d3d10core.c | 3 --- dlls/d3d11/tests/d3d11.c | 3 --- dlls/wined3d/view.c | 2 ++ 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 9c468c13a2..51da614d9d 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -410,10 +410,7 @@ static void test_create_shader_resource_view(void) ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index cc6b39ccd1..d291c881e3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3582,10 +3582,7 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, 0, 1024, NULL); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 97ab9b4487..d58319df58 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4260,10 +4260,7 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, 0, 1024, NULL); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f7bb18934f..f1c99a3b6a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -767,6 +767,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; + if (!(resource->bind_flags & WINED3D_BIND_SHADER_RESOURCE)) + return E_INVALIDARG; if (!(view->format = validate_resource_view(desc, resource, FALSE, FALSE))) return E_INVALIDARG; view->desc = *desc;

1 0

Alexandre Julliard : make_specfiles: Don't add forwards to the api-ms-* dlls.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: d8bb3030d8f7832fa6c8ed7ef83062b6d2a11252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8bb3030d8f7832fa6c8ed7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 19:39:08 2019 +0200 make_specfiles: Don't add forwards to the api-ms-* dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec | 2 +- dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec | 2 +- tools/make_specfiles | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec index b835f4e7c7..fe546fff4c 100644 --- a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec +++ b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap +@ stdcall GetProcessHeap() kernel32.GetProcessHeap @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc @ stdcall HeapCompact(long long) kernel32.HeapCompact diff --git a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec index fc4d357b39..88bb720301 100644 --- a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec +++ b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap +@ stdcall GetProcessHeap() kernel32.GetProcessHeap @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc @ stdcall HeapCompact(long long) kernel32.HeapCompact diff --git a/tools/make_specfiles b/tools/make_specfiles index 5c30ce5003..7fef3a6821 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -575,7 +575,7 @@ sub update_spec_file($) my $func = $descr{name}; if (!defined $funcs{$func}) { - $funcs{$func} = \%descr unless $commented_out; + $funcs{$func} = \%descr unless $commented_out || $name =~ /-/; goto done; }

1 0

Jacek Caban : scrobj: Use ReadValueChunk to read script body.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: a8af3543745010dd3ff41a16fee0212d571d3118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8af3543745010dd3ff41a16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 13:57:38 2019 +0200 scrobj: Use ReadValueChunk to read script body. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index e9262c53dc..944bff0de9 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1583,8 +1583,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct scriptlet_script *script) { XmlNodeType node_type; + size_t buf_size, size; + WCHAR *new_body; + DWORD read; HRESULT hres; + TRACE("\n"); + for (;;) { hres = IXmlReader_MoveToNextAttribute(factory->xml_reader); @@ -1621,9 +1626,26 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - hres = read_xml_value(factory, &script->body); - if (FAILED(hres)) return hres; + if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + size = 0; + + for (;;) + { + read = 0; + hres = IXmlReader_ReadValueChunk(factory->xml_reader, script->body + size, buf_size - size - 1, &read); + if (FAILED(hres)) return hres; + size += read; + if (hres == S_FALSE) break; + if (size + 1 == buf_size) + { + if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + script->body = new_body; + } + } + script->body[size++] = 0; + if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); }

1 0

Zebediah Figura : strmbase: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 8601e2243f2f1d837a809add6b51a08b4c767470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8601e2243f2f1d837a809add… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 22:36:23 2019 -0500 strmbase: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 2 +- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr7.c | 6 ++--- dlls/quartz/tests/vmr9.c | 6 ++--- dlls/strmbase/pin.c | 4 +-- dlls/strmbase/renderer.c | 16 +++++++++++- dlls/strmbase/transform.c | 55 +++++++++++++++++++++++---------------- 8 files changed, 58 insertions(+), 35 deletions(-) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 45a0af1618..ab4cf54fa5 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -88,7 +88,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index ecf4a46fac..8b7a1a5236 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -161,7 +161,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IAsyncReader, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); IBaseFilter_Release(filter); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 9e5c8eb281..985154f238 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -93,7 +93,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IAsyncReader, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); IBaseFilter_Release(filter); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 81b42243b8..f9ca8930f3 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -239,7 +239,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); @@ -269,7 +269,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); @@ -298,7 +298,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 8d07522ab0..f4a3017d3f 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -232,7 +232,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); @@ -262,7 +262,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); @@ -291,7 +291,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IKsPropertySet, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); - todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d85d767bf5..1dbfee07a6 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -157,7 +157,7 @@ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int ind return VFW_S_NO_MORE_ITEMS; } -HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface) +HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface, REFIID iid, void **out) { struct strmbase_pin *pin = impl_from_IPin(iface); HRESULT hr; @@ -167,7 +167,7 @@ HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface) *out = NULL; if (pin->pFuncsTable->pin_query_interface - && SUCCEEDED(hr = pin->pFuncsTable->pin_query_interface(filter, iid, out))) + && SUCCEEDED(hr = pin->pFuncsTable->pin_query_interface(pin, iid, out))) return hr; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPin)) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c8a6249227..5634ab1905 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -147,7 +147,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) static const IPinVtbl BaseRenderer_InputPin_Vtbl = { - BaseInputPinImpl_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, @@ -217,6 +217,19 @@ static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE * return filter->pFuncsTable->pfnCheckMediaType(filter, mt); } +static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + BaseRenderer *filter = impl_from_IPin(&iface->IPin_iface); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample *sample) { BaseRenderer *filter = impl_from_IPin(&pin->pin.IPin_iface); @@ -226,6 +239,7 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample *samp static const BaseInputPinFuncTable input_BaseInputFuncTable = { .base.pin_query_accept = sink_query_accept, + .base.pin_query_interface = sink_query_interface, .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = BaseRenderer_Receive, }; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index fa041b66bd..04acf63c9a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -161,17 +161,47 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = transform_destroy, }; +static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + TransformFilter *filter = impl_from_sink_IPin(&iface->IPin_iface); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_interface = sink_query_interface, .pfnReceive = TransformFilter_Input_Receive, }; +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + TransformFilter *filter = impl_from_source_IPin(&iface->IPin_iface); + + if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &filter->qcimpl->IQualityControl_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, + .base.pin_query_interface = source_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = TransformFilter_Output_DecideBufferSize, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, @@ -439,7 +469,7 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC static const IPinVtbl TransformFilter_InputPin_Vtbl = { - BaseInputPinImpl_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, @@ -459,30 +489,9 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl = TransformFilter_InputPin_NewSegment }; -static HRESULT WINAPI transform_source_QueryInterface(IPin *iface, REFIID iid, void **out) -{ - TransformFilter *filter = impl_from_source_IPin(iface); - - if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IPin)) - *out = iface; - else if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; - else if (IsEqualGUID(iid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); - else - { - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; -} - static const IPinVtbl TransformFilter_OutputPin_Vtbl = { - transform_source_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect,

1 0

Zebediah Figura : strmbase: Introduce BasePinImpl_QueryInterface().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: fa280172e893f4146f725f6e7a4f6bb8cf3476eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa280172e893f4146f725f6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 22:36:22 2019 -0500 strmbase: Introduce BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 25 +++++++++++++++++++++++++ include/wine/strmbase.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2cc6ef5259..d85d767bf5 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -157,6 +157,31 @@ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int ind return VFW_S_NO_MORE_ITEMS; } +HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface) +{ + struct strmbase_pin *pin = impl_from_IPin(iface); + HRESULT hr; + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + *out = NULL; + + if (pin->pFuncsTable->pin_query_interface + && SUCCEEDED(hr = pin->pFuncsTable->pin_query_interface(filter, iid, out))) + return hr; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPin)) + *out = iface; + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + ULONG WINAPI BasePinImpl_AddRef(IPin *iface) { struct strmbase_pin *pin = impl_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 65ba180caa..5ee13c8892 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -47,6 +47,7 @@ typedef struct BasePinFuncTable { HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); /* Required for EnumMediaTypes(). */ HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); + HRESULT (*pin_query_interface)(struct strmbase_pin *pin, REFIID iid, void **out); } BasePinFuncTable; struct strmbase_source @@ -97,6 +98,7 @@ typedef struct BaseInputPinFuncTable { /* Base Pin */ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); LONG WINAPI BasePinImpl_GetMediaTypeVersion(struct strmbase_pin *pin); +HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface, REFIID iid, void **out); ULONG WINAPI BasePinImpl_AddRef(IPin *iface); ULONG WINAPI BasePinImpl_Release(IPin *iface); HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface);

1 0

Zebediah Figura : quartz: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: b89ad0a73a6f72f9bc8a1b36d5eb7a7724d9d9fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89ad0a73a6f72f9bc8a1b36… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 22:36:24 2019 -0500 quartz: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 160b814738..0c58ecaa2a 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -560,11 +560,6 @@ static const IFileSourceFilterVtbl FileSource_Vtbl = FileSource_GetCurFile }; -static inline AsyncReader *impl_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, AsyncReader, source.pin.IPin_iface); -} - static inline AsyncReader *impl_from_strmbase_pin(struct strmbase_pin *iface) { return CONTAINING_RECORD(iface, AsyncReader, source.pin); @@ -605,24 +600,14 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int in return S_OK; } -/* overridden pin functions */ - -static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin *iface, REFIID iid, void **out) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - AsyncReader *filter = impl_from_IPin(iface); - - TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + AsyncReader *filter = impl_from_strmbase_pin(iface); - if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IPin)) - *out = &filter->source.pin.IPin_iface; - else if (IsEqualIID(iid, &IID_IAsyncReader)) + if (IsEqualGUID(iid, &IID_IAsyncReader)) *out = &filter->IAsyncReader_iface; else - { - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; return E_NOINTERFACE; - } IUnknown_AddRef((IUnknown *)*out); return S_OK; @@ -630,7 +615,7 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin *iface, REFIID iid, static const IPinVtbl FileAsyncReaderPin_Vtbl = { - FileAsyncReaderPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect, @@ -703,6 +688,7 @@ static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, + .base.pin_query_interface = source_query_interface, .pfnAttemptConnection = FileAsyncReaderPin_AttemptConnection, .pfnDecideBufferSize = FileAsyncReaderPin_DecideBufferSize, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,

1 0

Zebediah Figura : qcap: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 71fdcf3ba8819a08e438c71aa10f155ec4515b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71fdcf3ba8819a08e438c71a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 22:36:25 2019 -0500 qcap: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 28 ++++++++++++---------- dlls/qcap/smartteefilter.c | 20 +++++++++++++--- dlls/qcap/vfwcapture.c | 47 +++++++++++++----------------------- dlls/strmbase/pin.c | 59 ---------------------------------------------- include/wine/strmbase.h | 2 -- 5 files changed, 50 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71fdcf3ba8819a08e438…

1 0

Zebediah Figura : quartz/tests: Alter test.mpg to avoid some failures.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 73ed539acd6cc1b2d3bbd3f8b279a86d3ba9bc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ed539acd6cc1b2d3bbd3f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 22:36:26 2019 -0500 quartz/tests: Alter test.mpg to avoid some failures. GStreamer's mpegpsdemux reports the duration as 0 otherwise; this isn't particularly correct, but it's also not particularly interesting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.mpg | Bin 6144 -> 12288 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 660ad476e1..753415cf8d 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -24,7 +24,7 @@ /* @makedep: test.avi */ test.avi RCDATA "test.avi" -/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.16 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" diff --git a/dlls/quartz/tests/test.mpg b/dlls/quartz/tests/test.mpg index 7fe379aa3f..97bb1abae1 100644 Binary files a/dlls/quartz/tests/test.mpg and b/dlls/quartz/tests/test.mpg differ

1 0