Re: [PATCH 1/6] dmstyle: Rename IDirectMusicTrack8Impl to track_mute

[Michael Stefaniuc]

Hello Alistair,

I have redone this patches as IMHO the name is backward.
As the prefix is basically only for the human reader I find the other
form easier to read. And that matches how MS refers to those
https://docs.microsoft.com/en-us/previous-versions/ms810875%28v%3dmsdn.10%29

To speed things up I've done all IDirectMusicTrack8Impl.

bye
    michael

On 11/12/19 3:49 AM, Alistair Leslie-Hughes wrote:
> Signed-off-by: Alistair Leslie-Hughes
>
> dlls/dmstyle/mutetrack.c | 86 +++++++++++++++++++---------------------
>  1 file changed, 41 insertions(+), 45 deletions(-)
>
> diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c
> index 5d85a1b61e..8ae485e935 100644
> --- a/dlls/dmstyle/mutetrack.c
> +++ b/dlls/dmstyle/mutetrack.c
> @@ -37,7 +37,7 @@ static inline IDirectMusicMuteTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr
>      return CONTAINING_RECORD(iface, IDirectMusicMuteTrack, IDirectMusicTrack8_iface);
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
> +static HRESULT WINAPI track_mute_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
>          void **ret_iface)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -60,7 +60,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *
>      return S_OK;
>  }
>
> -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
> +static ULONG WINAPI track_mute_AddRef(IDirectMusicTrack8 *iface)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>      LONG ref = InterlockedIncrement(&This->ref);
> @@ -70,7 +70,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
>      return ref;
>  }
>
> -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
> +static ULONG WINAPI track_mute_Release(IDirectMusicTrack8 *iface)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>      LONG ref = InterlockedDecrement(&This->ref);
> @@ -85,7 +85,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
>      return ref;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI track_mute_Init(IDirectMusicTrack8 *iface,
>          IDirectMusicSegment *pSegment)
>  {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -93,7 +93,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI track_mute_InitPlay(IDirectMusicTrack8 *iface,
>          IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance,
>          void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
>  {
> @@ -102,23 +102,23 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
> +static HRESULT WINAPI track_mute_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
>  {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>    FIXME("(%p, %p): stub\n", This, pStateData);
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData,
> -
>    MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags,
> -
>    IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
>
> +static HRESULT WINAPI track_mute_Play(IDirectMusicTrack8 *iface, void *pStateData, MUSIC_TIME mtStart,
> -
>    MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf,
> -
>    IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
>
> {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>    FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> +static HRESULT WINAPI track_mute_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
>          MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -130,7 +130,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface,
>      return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> +static HRESULT WINAPI track_mute_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
>          MUSIC_TIME mtTime, void *pParam)
>  {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -138,7 +138,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface,
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI track_mute_IsParamSupported(IDirectMusicTrack8 *iface,
>          REFGUID rguidType)
>  {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -156,8 +156,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
>    return DMUS_E_TYPE_UNSUPPORTED;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
> -
>    REFGUID notiftype)
>
> +static HRESULT WINAPI track_mute_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>
> @@ -165,8 +164,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra
>      return E_NOTIMPL;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
> -
>    REFGUID notiftype)
>
> +static HRESULT WINAPI track_mute_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>
> @@ -174,7 +172,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
>      return E_NOTIMPL;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
> +static HRESULT WINAPI track_mute_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
>          MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
>  {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -182,7 +180,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
> +static HRESULT WINAPI track_mute_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
>          REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags,
>          IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
>  {
> @@ -192,9 +190,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface,
> -
>    REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam,
> -
>    void *pStateData, DWORD dwFlags)
>
> +static HRESULT WINAPI track_mute_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
> -
>    REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, void *pStateData, DWORD dwFlags)
>
> {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>    FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
> @@ -202,8 +199,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface,
> -
>    REFGUID rguidType, REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
>
> +static HRESULT WINAPI track_mute_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
> -
>    REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
>
> {
>          IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>    FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
> @@ -211,7 +208,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
> +static HRESULT WINAPI track_mute_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
>          DWORD trackgroup, IDirectMusicTrack **track)
>  {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -220,9 +217,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface,
>      return E_NOTIMPL;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
> -
>    IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup,
> -
>    IDirectMusicTrack **resulttrack)
>
> +static HRESULT WINAPI track_mute_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *newtrack,
> -
>    MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
>
> {
>      IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
>      TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup,
> @@ -231,24 +227,24 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
>  }
>
> static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
> - IDirectMusicTrack8Impl_QueryInterface,
> - IDirectMusicTrack8Impl_AddRef,
> - IDirectMusicTrack8Impl_Release,
> - IDirectMusicTrack8Impl_Init,
> - IDirectMusicTrack8Impl_InitPlay,
> - IDirectMusicTrack8Impl_EndPlay,
> - IDirectMusicTrack8Impl_Play,
> - IDirectMusicTrack8Impl_GetParam,
> - IDirectMusicTrack8Impl_SetParam,
> - IDirectMusicTrack8Impl_IsParamSupported,
> - IDirectMusicTrack8Impl_AddNotificationType,
> - IDirectMusicTrack8Impl_RemoveNotificationType,
> - IDirectMusicTrack8Impl_Clone,
> - IDirectMusicTrack8Impl_PlayEx,
> - IDirectMusicTrack8Impl_GetParamEx,
> - IDirectMusicTrack8Impl_SetParamEx,
> - IDirectMusicTrack8Impl_Compose,
> - IDirectMusicTrack8Impl_Join
> - track_mute_QueryInterface,
> - track_mute_AddRef,
> - track_mute_Release,
> - track_mute_Init,
> - track_mute_InitPlay,
> - track_mute_EndPlay,
> - track_mute_Play,
> - track_mute_GetParam,
> - track_mute_SetParam,
> - track_mute_IsParamSupported,
> - track_mute_AddNotificationType,
> - track_mute_RemoveNotificationType,
> - track_mute_Clone,
> - track_mute_PlayEx,
> - track_mute_GetParamEx,
> - track_mute_SetParamEx,
> - track_mute_Compose,
> - track_mute_Join
>
> };
>
> static inline IDirectMusicMuteTrack * impl_from_IPersistStream(IPersistStream *iface)