Re: [PATCH 1/7] amstream: Rename ddraw_stream_create and audio_stream_create functions.

[Zebediah Figura]

On 5/22/20 10:40 AM, Anton Baskanov wrote:
> Signed-off-by: Anton Baskanov
>
> dlls/amstream/amstream_private.h | 4 ++--
>  dlls/amstream/audiostream.c      | 2 +-
>  dlls/amstream/ddrawstream.c      | 2 +-
>  dlls/amstream/multimedia.c       | 4 ++--
>  4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h
> index bec107f819..96b933f5bc 100644
> --- a/dlls/amstream/amstream_private.h
> +++ b/dlls/amstream/amstream_private.h
> @@ -37,9 +37,9 @@
>  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,
> +HRESULT ddraw_stream_create_and_initialize(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,
> +HRESULT audio_stream_create_and_initialize(IMultiMediaStream *parent, const MSPID *purpose_id,
>          IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN;
>
> #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */
> diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c
> index 68b8b84f50..349e657405 100644
> --- a/dlls/amstream/audiostream.c
> +++ b/dlls/amstream/audiostream.c
> @@ -1292,7 +1292,7 @@ static const IMemInputPinVtbl audio_meminput_vtbl =
>      audio_meminput_ReceiveCanBlock,
>  };
>
> -HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
> +HRESULT audio_stream_create_and_initialize(IMultiMediaStream *parent, const MSPID *purpose_id,
>          IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream)
>  {
>      struct audio_stream *object;
> diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
> index 9c552f1a03..d21bf207ef 100644
> --- a/dlls/amstream/ddrawstream.c
> +++ b/dlls/amstream/ddrawstream.c
> @@ -940,7 +940,7 @@ static const IMemInputPinVtbl ddraw_meminput_vtbl =
>      ddraw_meminput_ReceiveCanBlock,
>  };
>
> -HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
> +HRESULT ddraw_stream_create_and_initialize(IMultiMediaStream *parent, const MSPID *purpose_id,
>          IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream)
>  {
>      struct ddraw_stream *object;
> diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c
> index be8fd4ecbf..7e2ae9c9b2 100644
> --- a/dlls/amstream/multimedia.c
> +++ b/dlls/amstream/multimedia.c
> @@ -377,9 +377,9 @@ 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_and_initialize((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream);
> else if (IsEqualGUID(PurposeId, &MSPID_PrimaryAudio))
> -
>    hr = audio_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream);
> -
>    hr = audio_stream_create_and_initialize((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream);
> else
>        return MS_E_PURPOSEID;

Sorry for the late review.

This function, and the duplicates essentially introduced in 2/7, seem
awkward. While they're temporary, I think we can easily get around that
awkwardness by just reordering the patches. I'd first move
initialization out of _create() and into ::Initialize() and
::JoinAMMultiMediaStream(), then hook up the class vending.