Zebediah Figura : strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().

Alexandre Julliard julliard at winehq.org
Mon Nov 18 16:19:17 CST 2019


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Sat Nov 16 11:20:13 2019 -0600

strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/videorenderer.c | 3 +--
 dlls/quartz/vmr9.c          | 3 +--
 dlls/strmbase/video.c       | 3 +--
 include/wine/strmbase.h     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index b21cc281b9..449bd31f68 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -771,8 +771,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out)
     if (FAILED(hr))
         goto fail;
 
-    hr = strmbase_video_init(&pVideoRenderer->baseControlVideo,
-            &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter,
+    hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter,
             &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
     if (FAILED(hr))
         goto fail;
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 1a4f85c87c..a2ed46d05d 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -2239,8 +2239,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid)
         goto fail;
 
     hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter,
-            &pVMR->renderer.filter.csFilter, &pVMR->renderer.sink.pin,
-            &renderer_BaseControlVideoFuncTable);
+            &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
     if (FAILED(hr))
         goto fail;
 
diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c
index d1ebbdf235..081794e9b3 100644
--- a/dlls/strmbase/video.c
+++ b/dlls/strmbase/video.c
@@ -648,11 +648,10 @@ static const IBasicVideoVtbl basic_video_vtbl =
 };
 
 HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
-        CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
+        struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
 {
     video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl;
     video->pFilter = filter;
-    video->pInterfaceLock = cs;
     video->pPin = pin;
     video->pFuncsTable = func_table;
 
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index f92a375a56..7f9d2cb64d 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -477,7 +477,6 @@ typedef struct tagBaseControlVideo
 	IBasicVideo IBasicVideo_iface;
 
 	struct strmbase_filter *pFilter;
-	CRITICAL_SECTION* pInterfaceLock;
 	struct strmbase_pin *pPin;
 
 	const struct BaseControlVideoFuncTable* pFuncsTable;
@@ -509,7 +508,7 @@ typedef struct BaseControlVideoFuncTable {
 } BaseControlVideoFuncTable;
 
 HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
-        CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table);
+        struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table);
 HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo);
 #endif
 #endif




More information about the wine-cvs mailing list