Anton Baskanov : amstream: Move initialization calls from *_stream_create into AMMultiMediaStream::AddMediaStream.
Alexandre Julliard
julliard at winehq.org
Mon Jun 1 15:14:54 CDT 2020
Module: wine
Branch: master
Commit: 5eb568354cc6eddc6653cbf7ed53606ae8b488fb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb568354cc6eddc6653cbf7ed53606ae8b488fb
Author: Anton Baskanov <baskanov at gmail.com>
Date: Thu May 28 02:05:50 2020 +0700
amstream: Move initialization calls from *_stream_create into AMMultiMediaStream::AddMediaStream.
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/amstream/amstream_private.h | 6 ++----
dlls/amstream/audiostream.c | 23 +++++------------------
dlls/amstream/ddrawstream.c | 23 +++++------------------
dlls/amstream/multimedia.c | 18 +++++++++++++-----
dlls/amstream/tests/amstream.c | 2 +-
5 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h
index bec107f819..e71563cb11 100644
--- a/dlls/amstream/amstream_private.h
+++ b/dlls/amstream/amstream_private.h
@@ -37,9 +37,7 @@
HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT filter_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
-HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
- IUnknown *stream_object, STREAM_TYPE type, IAMMediaStream **stream) DECLSPEC_HIDDEN;
-HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
- IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN;
+HRESULT ddraw_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
+HRESULT audio_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
#endif /* __AMSTREAM_PRIVATE_INCLUDED__ */
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c
index a38cbc5f63..f9470fa5f9 100644
--- a/dlls/amstream/audiostream.c
+++ b/dlls/amstream/audiostream.c
@@ -1273,13 +1273,12 @@ static const IMemInputPinVtbl audio_meminput_vtbl =
audio_meminput_ReceiveCanBlock,
};
-HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
- IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream)
+HRESULT audio_stream_create(IUnknown *outer, void **out)
{
struct audio_stream *object;
- HRESULT hr;
- TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream);
+ if (outer)
+ return CLASS_E_NOAGGREGATION;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
@@ -1295,21 +1294,9 @@ HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
list_init(&object->receive_queue);
list_init(&object->update_queue);
- hr = IAMMediaStream_Initialize(&object->IAMMediaStream_iface, stream_object, 0, purpose_id, stream_type);
- if (FAILED(hr))
- {
- IAMMediaStream_Release(&object->IAMMediaStream_iface);
- return hr;
- }
-
- hr = IAMMediaStream_JoinAMMultiMediaStream(&object->IAMMediaStream_iface, (IAMMultiMediaStream *)parent);
- if (FAILED(hr))
- {
- IAMMediaStream_Release(&object->IAMMediaStream_iface);
- return hr;
- }
+ TRACE("Created audio stream %p.\n", object);
- *media_stream = &object->IAMMediaStream_iface;
+ *out = &object->IAMMediaStream_iface;
return S_OK;
}
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 8e99ea3bf5..1c924e40a2 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -926,13 +926,12 @@ static const IMemInputPinVtbl ddraw_meminput_vtbl =
ddraw_meminput_ReceiveCanBlock,
};
-HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
- IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream)
+HRESULT ddraw_stream_create(IUnknown *outer, void **out)
{
struct ddraw_stream *object;
- HRESULT hr;
- TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream);
+ if (outer)
+ return CLASS_E_NOAGGREGATION;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
@@ -946,21 +945,9 @@ HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
InitializeCriticalSection(&object->cs);
- hr = IAMMediaStream_Initialize(&object->IAMMediaStream_iface, stream_object, 0, purpose_id, stream_type);
- if (FAILED(hr))
- {
- IAMMediaStream_Release(&object->IAMMediaStream_iface);
- return hr;
- }
-
- hr = IAMMediaStream_JoinAMMultiMediaStream(&object->IAMMediaStream_iface, (IAMMultiMediaStream *)parent);
- if (FAILED(hr))
- {
- IAMMediaStream_Release(&object->IAMMediaStream_iface);
- return hr;
- }
+ TRACE("Created ddraw stream %p.\n", object);
- *media_stream = &object->IAMMediaStream_iface;
+ *out = &object->IAMMediaStream_iface;
return S_OK;
}
diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c
index be8fd4ecbf..e77392e483 100644
--- a/dlls/amstream/multimedia.c
+++ b/dlls/amstream/multimedia.c
@@ -301,6 +301,7 @@ static HRESULT WINAPI multimedia_stream_GetFilter(IAMMultiMediaStream *iface,
static void add_stream(struct multimedia_stream *mmstream, IAMMediaStream *stream, IMediaStream **ret_stream)
{
IMediaStreamFilter_AddMediaStream(mmstream->filter, stream);
+ IAMMediaStream_JoinAMMultiMediaStream(stream, &mmstream->IAMMultiMediaStream_iface);
if (ret_stream)
{
*ret_stream = (IMediaStream *)stream;
@@ -377,19 +378,26 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac
}
if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo))
- hr = ddraw_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream);
+ hr = ddraw_stream_create(NULL, (void **)&pStream);
else if (IsEqualGUID(PurposeId, &MSPID_PrimaryAudio))
- hr = audio_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream);
+ hr = audio_stream_create(NULL, (void **)&pStream);
else
return MS_E_PURPOSEID;
- if (SUCCEEDED(hr))
+ if (FAILED(hr))
+ return hr;
+
+ hr = IAMMediaStream_Initialize(pStream, stream_object, dwFlags, PurposeId, This->type);
+ if (FAILED(hr))
{
- add_stream(This, pStream, ret_stream);
IAMMediaStream_Release(pStream);
+ return hr;
}
- return hr;
+ add_stream(This, pStream, ret_stream);
+ IAMMediaStream_Release(pStream);
+
+ return S_OK;
}
static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface,
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 073e372c94..13c00aac25 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -730,7 +730,7 @@ static void test_add_stream(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n");
if (hr == S_OK) IMediaStream_Release(stream);
- todo_wine ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n");
+ ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n");
ok(teststream.filter == stream_filter, "IMediaStreamFilter objects didn't match.\n");
todo_wine ok(!!teststream.graph, "Expected a non-NULL graph.\n");
More information about the wine-cvs
mailing list