September 2019 - Wine-Commits

Zebediah Figura : wined3d: Return a wined3d_stateblock from wined3d_device_begin_stateblock().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 7360e7d488b13f06b4c650ad66e9d2d0356fd875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7360e7d488b13f06b4c650ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:39 2019 -0500 wined3d: Return a wined3d_stateblock from wined3d_device_begin_stateblock(). And hold it locally in d3d[789]. 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/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 17 ++++++++++++----- dlls/d3d9/d3d9_private.h | 5 +++-- dlls/d3d9/device.c | 24 ++++++++++++++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 13 +++++++++---- dlls/ddraw/surface.c | 7 +++++++ dlls/wined3d/device.c | 32 ++++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 73 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7360e7d488b13f06b4c6…

1 0

Alexandre Julliard : kernel32: Move some handle functions to kernelbase.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 950773dc06adf58810945868a4ab4cf00fda67e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950773dc06adf58810945868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 10:32:55 2019 +0200 kernel32: Move some handle functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processenvironment-l1-1-0.spec | 2 +- .../api-ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 8 +- dlls/kernel32/process.c | 109 --------------------- dlls/kernelbase/console.c | 6 -- dlls/kernelbase/kernelbase.h | 6 ++ dlls/kernelbase/kernelbase.spec | 10 +- dlls/kernelbase/process.c | 90 +++++++++++++++++ 8 files changed, 107 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=950773dc06adf5881094…

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantF().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

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

Alexandre Julliard : oleaut32: Split DispCallFunc() into platform-specific functions.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 25d0c6623849794b64e2e279dc1c39c46c188469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d0c6623849794b64e2e279… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 19:19:58 2019 +0200 oleaut32: Split DispCallFunc() into platform-specific functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 619 +++++++++++++++++++++++------------------------- 1 file changed, 294 insertions(+), 325 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25d0c6623849794b64e2…

1 0

Alexandre Julliard : oleaut32: Implement DispCallFunc() for ARM64.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 71ab74a11fc847850eed5c898b916cf3736ffa10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ab74a11fc847850eed5c89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 19:25:33 2019 +0200 oleaut32: Implement DispCallFunc() for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 374eb5a38b..d40c0efb0f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6809,7 +6809,165 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART return S_OK; } -#else /* __arm__ */ +#elif defined(__aarch64__) + +extern DWORD_PTR CDECL call_method( void *func, int nb_stk_args, const DWORD_PTR *stk_args, const DWORD_PTR *reg_args ); +extern float CDECL call_float_method( void *func, int nb_stk_args, const DWORD_PTR *stk_args, const DWORD_PTR *reg_args ); +extern double CDECL call_double_method( void *func, int nb_stk_args, const DWORD_PTR *stk_args, const DWORD_PTR *reg_args ); +__ASM_GLOBAL_FUNC( call_method, + "stp x29, x30, [sp, #-16]!\n\t" + "mov x29, sp\n\t" + "sub sp, sp, x1, lsl #3\n\t" + "cbz x1, 2f\n" + "1:\tsub x1, x1, #1\n\t" + "ldr x4, [x2, x1, lsl #3]\n\t" + "str x4, [sp, x1, lsl #3]\n\t" + "cbnz x1, 1b\n" + "2:\tmov x8, x0\n\t" + "mov x9, x3\n\t" + "ldp d0, d1, [x9]\n\t" + "ldp d2, d3, [x9, #0x10]\n\t" + "ldp d4, d5, [x9, #0x20]\n\t" + "ldp d6, d7, [x9, #0x30]\n\t" + "ldp x0, x1, [x9, #0x40]\n\t" + "ldp x2, x3, [x9, #0x50]\n\t" + "ldp x4, x5, [x9, #0x60]\n\t" + "ldp x6, x7, [x9, #0x70]\n\t" + "blr x8\n\t" + "mov sp, x29\n\t" + "ldp x29, x30, [sp], #16\n\t" + "ret" ) +__ASM_GLOBAL_FUNC( call_float_method, + "b " __ASM_NAME("call_method") ) +__ASM_GLOBAL_FUNC( call_double_method, + "b " __ASM_NAME("call_method") ) + +HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VARTYPE ret_type, UINT count, + VARTYPE *types, VARIANTARG **vargs, VARIANT *result ) +{ + int argspos; + void *func; + UINT i; + DWORD_PTR *args; + struct + { + union + { + float f; + double d; + } fp[8]; + DWORD_PTR x[8]; + } regs; + int rcount; /* 64-bit register index count */ + int fpcount = 0; /* float register index count */ + + TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + instance, offset, cc, ret_type, count, types, vargs, result, V_VT(result)); + + if (cc != CC_STDCALL && cc != CC_CDECL) + { + FIXME("unsupported calling convention %d\n",cc); + return E_INVALIDARG; + } + + argspos = 0; + rcount = 0; + + if (instance) + { + const FARPROC *vtable = *(FARPROC **)instance; + func = vtable[offset/sizeof(void *)]; + regs.x[rcount++] = (DWORD_PTR)instance; /* the This pointer is always the first parameter */ + } + else func = (void *)offset; + + /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ + /* first as it will need to be in the 'x' registers: */ + switch (ret_type) + { + case VT_DECIMAL: + case VT_VARIANT: + regs.x[rcount++] = (DWORD_PTR)result; /* arg 0 is a pointer to the result */ + break; + case VT_HRESULT: + WARN("invalid return type %u\n", ret_type); + return E_INVALIDARG; + default: + break; + } + + /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ + args = heap_alloc( sizeof(VARIANT) * count + sizeof(DWORD_PTR) * 4 ); + + for (i = 0; i < count; i++) + { + VARIANT *arg = vargs[i]; + + switch (types[i]) + { + case VT_EMPTY: + break; + case VT_R4: + if (fpcount < 8) regs.fp[fpcount++].f = V_R4(arg); + else *(float *)&args[argspos++] = V_R4(arg); + break; + case VT_R8: + case VT_DATE: + if (fpcount < 8) regs.fp[fpcount++].d = V_R8(arg); + else *(double *)&args[argspos++] = V_R8(arg); + break; + case VT_DECIMAL: + case VT_VARIANT: + if (rcount < 7) + { + memcpy( &regs.x[rcount], arg, sizeof(*arg) ); + rcount += 2; + } + else + { + memcpy( &args[argspos], arg, sizeof(*arg) ); + argspos += 2; + } + break; + case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ + if (rcount < 8) regs.x[rcount++] = V_BOOL(arg); + else args[argspos++] = V_BOOL(arg); + break; + default: + if (rcount < 8) regs.x[rcount++] = V_UI8(arg); + else args[argspos++] = V_UI8(arg); + break; + } + TRACE("arg %u: type %s %s\n", i, debugstr_vt(types[i]), debugstr_variant(arg)); + } + + argspos += (argspos % 2); /* Make sure stack function alignment is 16-byte */ + + switch (ret_type) + { + case VT_EMPTY: /* EMPTY = no return value */ + case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ + case VT_VARIANT: + call_method( func, argspos, args, (DWORD_PTR *)&regs ); + break; + case VT_R4: + V_R4(result) = call_float_method( func, argspos, args, (DWORD_PTR *)&regs ); + break; + case VT_R8: + case VT_DATE: + V_R8(result) = call_double_method( func, argspos, args, (DWORD_PTR *)&regs ); + break; + default: + V_UI8(result) = call_method( func, argspos, args, (DWORD_PTR *)&regs ); + break; + } + heap_free( args ); + if (ret_type != VT_VARIANT) V_VT(result) = ret_type; + TRACE("retval: %s\n", debugstr_variant(result)); + return S_OK; +} + +#else /* __aarch64__ */ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult )

1 0

Zebediah Figura : quartz/tests: Alter test.mpg to avoid some failures.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

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

Zebediah Figura : qcap: Use BasePinImpl_QueryInterface().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

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 : strmbase: Use BasePinImpl_QueryInterface().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

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 : quartz: Use BasePinImpl_QueryInterface().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

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 : strmbase: Introduce BasePinImpl_QueryInterface().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

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