amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream().

Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com> Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream().
a2fe0d57 · Gijs Vermeulen · Alexandre Julliard · 5042687d · a2fe0d57 · a2fe0d57
Commit a2fe0d57 authored Jul 03, 2020 by Gijs Vermeulen Committed by Alexandre Julliard Jul 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

filter.c dlls/amstream/filter.c +3 -0

amstream.c dlls/amstream/tests/amstream.c +6 -2

No files found.
--- a/dlls/amstream/filter.c
+++ b/dlls/amstream/filter.c
@@ -513,6 +513,9 @@ static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID 

    TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(idPurpose), ppMediaStream);

+    if (!ppMediaStream)
+        return E_POINTER;
+
    for (i = 0; i < This->nb_streams; i++)
    {
        IAMMediaStream_GetInformation(This->streams[i], &purpose_id, NULL);

--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -701,9 +701,13 @@ static void test_add_stream(void)
    ok(hr == S_FALSE, "Got hr %#x.\n", hr);

    hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryAudio, NULL);
-    todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+    ok(hr == E_POINTER, "Got hr %#x.\n", hr);
    hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryAudio, NULL);
-    todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+    ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+    hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, NULL);
+    ok(hr == E_POINTER, "Got hr %#x.\n", hr);
+    hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryVideo, NULL);
+    ok(hr == E_POINTER, "Got hr %#x.\n", hr);

    check_enum_stream(mmstream, stream_filter, 0, NULL);