amstream: Return E_INVALIDARG when a rect but no surface is passed in…

amstream: Return E_INVALIDARG when a rect but no surface is passed in IDirectDrawMediaStream::CreateSample(). 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_INVALIDARG when a rect but no surface is passed in…
a4ddb5a1 · Gijs Vermeulen · Alexandre Julliard · 7bdb713b · a4ddb5a1 · a4ddb5a1
Commit a4ddb5a1 authored Aug 05, 2020 by Gijs Vermeulen Committed by Alexandre Julliard Aug 05, 2020
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

amstream.c dlls/amstream/tests/amstream.c +1 -1

No files found.
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -442,6 +442,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMedia
    TRACE("stream %p, surface %p, rect %s, flags %#x, sample %p.\n",
            stream, surface, wine_dbgstr_rect(rect), flags, sample);

+    if (!surface && rect)
+        return E_INVALIDARG;
+
    EnterCriticalSection(&stream->cs);
    hr = ddrawstreamsample_create(stream, surface, rect, sample);
    LeaveCriticalSection(&stream->cs);

--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -5665,7 +5665,7 @@ static void test_ddrawstream_create_sample(void)

    SetRectEmpty(&rect);
    hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample);
-    todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

    EXPECT_REF(stream, 3);
    hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample);