Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b5344207398..6ac01c3b8ae 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -512,7 +512,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE return hr; }
-static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) +static HRESULT vmr_disconnect(struct strmbase_renderer *This) { struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; @@ -638,7 +638,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, .renderer_connect = vmr_connect, - .pfnBreakConnect = VMR9_BreakConnect, + .renderer_disconnect = vmr_disconnect, .renderer_destroy = vmr_destroy, .renderer_query_interface = vmr_query_interface, .renderer_pin_query_interface = vmr_pin_query_interface, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index e6adf41add9..47be6e0fd30 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -427,8 +427,8 @@ static void sink_disconnect(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface);
- if (filter->pFuncsTable->pfnBreakConnect) - filter->pFuncsTable->pfnBreakConnect(filter); + if (filter->pFuncsTable->renderer_disconnect) + filter->pFuncsTable->renderer_disconnect(filter); }
static HRESULT sink_eos(struct strmbase_sink *iface) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 347482b1eb9..dcb9b1bf3d9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,8 +305,6 @@ struct strmbase_renderer BOOL eos; };
-typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); - struct strmbase_renderer_ops { HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); @@ -315,7 +313,7 @@ struct strmbase_renderer_ops void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - BaseRenderer_BreakConnect pfnBreakConnect; + HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface); void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);