From 1c4bc193eb2136e05a39f2ee21c40f76f3b6971f Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 9 Jan 2017 07:11:25 +0100 Subject: [PATCH] amstream-GetMultiMediaStream: Remove some todo_wine's. --- ...nt-IAMMediaStream-GetMultiMediaStrea.patch | 57 +++++++++++++++++-- patches/patchinstall.sh | 2 +- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch b/patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch index b16998e0..4a0d18b7 100644 --- a/patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch +++ b/patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch @@ -1,14 +1,15 @@ -From 4bec6ad3640799a4b8bdb1d1987d8e65e15c0355 Mon Sep 17 00:00:00 2001 +From 7e2bb678c70a7a5c3ba3d06e413b4446e6bcf02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 28 Jul 2015 18:21:20 +0200 Subject: amstream: Implement IAMMediaStream::GetMultiMediaStream. --- - dlls/amstream/mediastream.c | 30 ++++++++++++++++++++++++------ - 1 file changed, 24 insertions(+), 6 deletions(-) + dlls/amstream/mediastream.c | 30 ++++++++++++++++++++++++------ + dlls/amstream/tests/amstream.c | 12 ++++++------ + 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c -index 51349ab..98fca62 100644 +index 51349abb8ea..98fca62e449 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -110,9 +110,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre @@ -65,6 +66,52 @@ index 51349ab..98fca62 100644 } static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, +diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c +index eb9c5f962ce..4afa3e0489d 100644 +--- a/dlls/amstream/tests/amstream.c ++++ b/dlls/amstream/tests/amstream.c +@@ -263,11 +263,11 @@ static void test_media_streams(void) + ok((void*)am_media_stream == (void*)video_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); +- todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); ++ ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); +- todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); ++ ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); +@@ -376,11 +376,11 @@ static void test_media_streams(void) + ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, audio_stream); + + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); +- todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); ++ ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); +- todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); ++ ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); +@@ -414,11 +414,11 @@ static void test_media_streams(void) + ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + + hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); +- todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); ++ ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, &multi_media_stream); +- todo_wine ok(hr == S_OK, "IAudioMediaStream_GetMultiMediaStream returned: %x\n", hr); ++ ok(hr == S_OK, "IAudioMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); -- -2.9.0 +2.11.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f106546e..d51fcc57 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2251,7 +2251,7 @@ fi # | * [#37090] Implement AMStream GetMultiMediaStream functions # | # | Modified files: -# | * dlls/amstream/mediastream.c +# | * dlls/amstream/mediastream.c, dlls/amstream/tests/amstream.c # | if test "$enable_amstream_GetMultiMediaStream" -eq 1; then patch_apply amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch