Nikolay Sivov : mf/evr: Remove duplicated check in GetStreamSinkCount() (Coverity).
Alexandre Julliard
julliard at winehq.org
Thu Sep 16 15:34:31 CDT 2021
Module: wine
Branch: master
Commit: b14ba22a2c290c449d02f75415506221d7c09352
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14ba22a2c290c449d02f75415506221d7c09352
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Sep 16 12:58:49 2021 +0300
mf/evr: Remove duplicated check in GetStreamSinkCount() (Coverity).
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/evr.c | 3 ---
dlls/mf/tests/mf.c | 6 ++++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index a5545c157de..9552990006d 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -1291,9 +1291,6 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface
TRACE("%p, %p.\n", iface, count);
- if (!count)
- return E_POINTER;
-
EnterCriticalSection(&renderer->cs);
if (renderer->flags & EVR_SHUT_DOWN)
hr = MF_E_SHUTDOWN;
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 3dfd852643c..1740e4e36d9 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4559,6 +4559,12 @@ todo_wine
hr = IMFMediaSink_Shutdown(sink);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ hr = IMFMediaSink_GetStreamSinkCount(sink, NULL);
+ ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
+
+ hr = IMFMediaSink_GetStreamSinkCount(sink, &count);
+ ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
+
hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate);
ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
More information about the wine-cvs
mailing list