Zebediah Figura : strmbase: Return void from renderer_disconnect.
Alexandre Julliard
julliard at winehq.org
Fri Mar 12 14:36:15 CST 2021
Module: wine
Branch: master
Commit: 26476fcf483b9c7513644506f5f8bb834e3a90b0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=26476fcf483b9c7513644506f5f8bb834e3a90b0
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Mar 11 17:21:59 2021 -0600
strmbase: Return void from renderer_disconnect.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/vmr9.c | 9 ++-------
include/wine/strmbase.h | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 6ac01c3b8ae..2562b74932a 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -512,16 +512,12 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE
return hr;
}
-static HRESULT vmr_disconnect(struct strmbase_renderer *This)
+static void vmr_disconnect(struct strmbase_renderer *This)
{
struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface);
- HRESULT hr = S_OK;
DWORD i;
- if (!filter->mode)
- return S_FALSE;
-
- if (filter->allocator && filter->presenter)
+ if (filter->mode && filter->allocator && filter->presenter)
{
for (i = 0; i < filter->num_surfaces; ++i)
IDirect3DSurface9_Release(filter->surfaces[i]);
@@ -530,7 +526,6 @@ static HRESULT vmr_disconnect(struct strmbase_renderer *This)
IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie);
filter->num_surfaces = 0;
}
- return hr;
}
static void vmr_free(struct quartz_vmr *filter)
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index dcb9b1bf3d9..9906a9ffd74 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -313,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);
- HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface);
+ void (*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);
More information about the wine-cvs
mailing list