Module: wine Branch: master Commit: 25240a210cc9ac001c880015a0be13676169dda3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25240a210cc9ac001c880015a...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Apr 2 23:20:45 2020 -0500
quartz: Get rid of BaseControlVideo_Destroy().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/quartz_private.h | 1 - dlls/quartz/video.c | 5 ----- dlls/quartz/videorenderer.c | 1 - 3 files changed, 7 deletions(-)
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 8563edeaae..c108e5e4e6 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -216,6 +216,5 @@ typedef struct BaseControlVideoFuncTable
void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN; -HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN;
#endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 0f400df481..11baee261d 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -27,11 +27,6 @@ static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface) return CONTAINING_RECORD(iface, BaseControlVideo, IBasicVideo_iface); }
-HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) -{ - return S_OK; -} - static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) { LONG VideoWidth, VideoHeight; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index cdb496ba29..0b4db6eaec 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -244,7 +244,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) struct video_renderer *filter = impl_from_strmbase_renderer(iface);
BaseControlWindow_Destroy(&filter->baseControlWindow); - BaseControlVideo_Destroy(&filter->baseControlVideo); CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter);