Module: wine Branch: master Commit: c6b437284554a77c9510873c90cd1c7055e845f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b437284554a77c9510873c9...
Author: Gijs Vermeulen gijsvrm@gmail.com Date: Mon Jul 13 19:08:45 2020 +0200
amstream: Implement AMMediaStream::JoinFilterGraph.
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
---
dlls/amstream/audiostream.c | 6 +++--- dlls/amstream/ddrawstream.c | 6 +++--- dlls/amstream/tests/amstream.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 60a2572b3b..112891eeb7 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -593,11 +593,11 @@ static HRESULT WINAPI audio_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe
static HRESULT WINAPI audio_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph);
- return S_FALSE; + return S_OK; }
static const struct IAMMediaStreamVtbl audio_IAMMediaStream_vtbl = diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5530603f7a..9f74eaf91a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -261,11 +261,11 @@ static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe
static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface);
- FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph);
- return S_FALSE; + return S_OK; }
static const struct IAMMediaStreamVtbl ddraw_IAMMediaStream_vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a0876d6242..a81cdba3f3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4371,7 +4371,7 @@ static void check_ammediastream_join_filter_graph(const MSPID *id) }
hr = IAMMediaStream_JoinFilterGraph(stream, graph); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); EXPECT_REF(builder, 4); EXPECT_REF(graph, 1);