[PATCH 2/5] quartz: Get rid of BaseControlVideo_Destroy().

Zebediah Figura z.figura12 at gmail.com
Thu Apr 2 23:20:45 CDT 2020


From: Zebediah Figura <z.figura12 at gmail.com>

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 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 8563edeaae3..c108e5e4e66 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 0f400df4812..11baee261d5 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 cdb496ba298..0b4db6eaec0 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);
-- 
2.26.0




More information about the wine-devel mailing list