Zebediah Figura : quartz: Return void from basic_video_init().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a17d43d67d523121993746ef1f303af1ef81b03d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a17d43d67d523121993746ef1...

Author: Zebediah Figura 
Date:   Thu Apr  2 23:20:44 2020 -0500

quartz: Return void from basic_video_init().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/quartz/quartz_private.h | 2 +-
 dlls/quartz/video.c          | 4 +---
 dlls/quartz/videorenderer.c  | 4 +---
 dlls/quartz/vmr9.c           | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 946daeb484..8563edeaae 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -214,7 +214,7 @@ typedef struct BaseControlVideoFuncTable
     BaseControlVideo_SetTargetRect pfnSetTargetRect;
 } BaseControlVideoFuncTable;

-HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
+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;

diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c
index f59c2dee0c..0f400df481 100644
--- a/dlls/quartz/video.c
+++ b/dlls/quartz/video.c
@@ -647,13 +647,11 @@ static const IBasicVideoVtbl basic_video_vtbl =
     basic_video_IsUsingDefaultDestination
 };

-HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
+void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
         struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
 {
     video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl;
     video->pFilter = filter;
     video->pPin = pin;
     video->pFuncsTable = func_table;
-
-    return S_OK;
 }
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 73c23603f8..cdb496ba29 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -716,10 +716,8 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out)
     if (FAILED(hr))
         goto fail;

-    hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter,
+    basic_video_init(&object->baseControlVideo, &object->renderer.filter,
             &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
-    if (FAILED(hr))
-        goto fail;

if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
         goto fail;
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 07a3dbc241..bdf709cafc 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -2326,10 +2326,8 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid)
     if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
         goto fail;

-    hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter,
+    basic_video_init(&object->baseControlVideo, &object->renderer.filter,
             &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
-    if (FAILED(hr))
-        goto fail;

object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL);