Gijs Vermeulen : amstream: Return E_INVALIDARG when a rect but no surface is passed in IDirectDrawMediaStream::CreateSample().
Alexandre Julliard
julliard at winehq.org
Wed Aug 5 16:05:00 CDT 2020
Module: wine
Branch: master
Commit: a4ddb5a1e6c0c94b344f5cf6d52b103538c378f0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ddb5a1e6c0c94b344f5cf6d52b103538c378f0
Author: Gijs Vermeulen <gijsvrm at gmail.com>
Date: Wed Aug 5 16:31:26 2020 +0200
amstream: Return E_INVALIDARG when a rect but no surface is passed in IDirectDrawMediaStream::CreateSample().
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/amstream/ddrawstream.c | 3 +++
dlls/amstream/tests/amstream.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 4c94bacf52..917fcad9c9 100644
--- 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);
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 1310e42cf2..383ea7e936 100644
--- 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);
More information about the wine-cvs
mailing list