[PATCH] dmband: Rename IDirectMusicTrack8Impl to band_track.

[Alistair Leslie-Hughes]

Fixed subjet.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/dmband/bandtrack.c | 72 ++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index eb62ec11ce..290b35c5f3 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr
     return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface);
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
+static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
         void **ret_iface)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *
     return S_OK;
 }
 
-static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
+static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
@@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
     return ref;
 }
 
-static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
+static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
@@ -88,7 +88,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
     return ref;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface,
         IDirectMusicSegment *pSegment)
 {
   IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface,
         IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance,
         void **state_data, DWORD virtual_track8id, DWORD flags)
 {
@@ -107,14 +107,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
     return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
+static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
 {
   IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
   FIXME("(%p, %p): stub\n", This, pStateData);
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data,
+static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data,
         MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags,
         IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
         DWORD virtual_id)
@@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi
     return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
+static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
         MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
 {
   IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -141,7 +141,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface,
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
+static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
         MUSIC_TIME mtTime, void *pParam)
 {
   IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -149,7 +149,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface,
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface,
         REFGUID rguidType)
 {
   IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
   return DMUS_E_TYPE_UNSUPPORTED;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface,
         REFGUID notiftype)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface,
         REFGUID notiftype)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -196,7 +196,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
+static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
   IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
+static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
         REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags,
         IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
         DWORD virtual_id)
@@ -217,7 +217,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v
     return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface,
         REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param,
         void *state_data, DWORD flags)
 {
@@ -229,7 +229,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac
     return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface,
         REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -240,7 +240,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
     return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
+static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
         DWORD trackgroup, IDirectMusicTrack **track)
 {
     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -249,7 +249,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface,
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface,
         IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup,
         IDirectMusicTrack **ppResultTrack)
 {
@@ -259,24 +259,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
+    band_track_QueryInterface,
+    band_track_AddRef,
+    band_track_Release,
+    band_track_Init,
+    band_track_InitPlay,
+    band_track_EndPlay,
+    band_track_Play,
+    band_track_GetParam,
+    band_track_SetParam,
+    band_track_IsParamSupported,
+    band_track_AddNotificationType,
+    band_track_RemoveNotificationType,
+    band_track_Clone,
+    band_track_PlayEx,
+    band_track_GetParamEx,
+    band_track_SetParamEx,
+    band_track_Compose,
+    band_track_Join
 };
 
 /* IDirectMusicBandTrack IPersistStream part: */
-- 
2.17.1

[Michael Stefaniuc]

Hello Alistair,

do you plan to do more work on this or is this just for more clarity in
the FIXME / TRACE output?
The patch is fine in principle but please reformat the parameter list to
make use of the 100 char line limit.

bye
	michael


On 11/8/19 3:34 AM, Alistair Leslie-Hughes wrote:
> Fixed subjet.
>
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  dlls/dmband/bandtrack.c | 72 ++++++++++++++++++++---------------------
>  1 file changed, 36 insertions(+), 36 deletions(-)
>
> diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
> index eb62ec11ce..290b35c5f3 100644
> --- a/dlls/dmband/bandtrack.c
> +++ b/dlls/dmband/bandtrack.c
> @@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr
>      return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface);
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
> +static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
>          void **ret_iface)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *
>      return S_OK;
>  }
>
> -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
> +static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
>      LONG ref = InterlockedIncrement(&This->ref);
> @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
>      return ref;
>  }
>
> -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
> +static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
>      LONG ref = InterlockedDecrement(&This->ref);
> @@ -88,7 +88,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
>      return ref;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface,
>          IDirectMusicSegment *pSegment)
>  {
>    IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface,
>          IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance,
>          void **state_data, DWORD virtual_track8id, DWORD flags)
>  {
> @@ -107,14 +107,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
>      return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
> +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
>  {
>    IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
>    FIXME("(%p, %p): stub\n", This, pStateData);
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data,
> +static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data,
>          MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags,
>          IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
>          DWORD virtual_id)
> @@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi
>      return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
>          MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
>  {
>    IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -141,7 +141,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface,
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
>          MUSIC_TIME mtTime, void *pParam)
>  {
>    IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -149,7 +149,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface,
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface,
>          REFGUID rguidType)
>  {
>    IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
>    return DMUS_E_TYPE_UNSUPPORTED;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface,
>          REFGUID notiftype)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra
>      return E_NOTIMPL;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface,
>          REFGUID notiftype)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -196,7 +196,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
>      return E_NOTIMPL;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
> +static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
>          MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
>  {
>    IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU
>    return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
> +static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
>          REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags,
>          IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
>          DWORD virtual_id)
> @@ -217,7 +217,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v
>      return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface,
>          REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param,
>          void *state_data, DWORD flags)
>  {
> @@ -229,7 +229,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac
>      return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface,
>          REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -240,7 +240,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
>      return S_OK;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
> +static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
>          DWORD trackgroup, IDirectMusicTrack **track)
>  {
>      IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> @@ -249,7 +249,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface,
>      return E_NOTIMPL;
>  }
>
> -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
> +static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface,
>          IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup,
>          IDirectMusicTrack **ppResultTrack)
>  {
> @@ -259,24 +259,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
> +    band_track_QueryInterface,
> +    band_track_AddRef,
> +    band_track_Release,
> +    band_track_Init,
> +    band_track_InitPlay,
> +    band_track_EndPlay,
> +    band_track_Play,
> +    band_track_GetParam,
> +    band_track_SetParam,
> +    band_track_IsParamSupported,
> +    band_track_AddNotificationType,
> +    band_track_RemoveNotificationType,
> +    band_track_Clone,
> +    band_track_PlayEx,
> +    band_track_GetParamEx,
> +    band_track_SetParamEx,
> +    band_track_Compose,
> +    band_track_Join
>  };
>
> /* IDirectMusicBandTrack IPersistStream part: */

[Alistair Leslie-Hughes]

On 9/11/19 7:55 am, Michael Stefaniuc wrote:
> Hello Alistair,
>
> do you plan to do more work on this or is this just for more clarity in
> the FIXME / TRACE output?

Both. This was a just a try patch before upstreaming the rest.

Currently there are 17 places which use the same function names, making

it near impossible to workout which one is being called.
> The patch is fine in principle but please reformat the parameter list to
> make use of the 100 char line limit.

Sure.  I updated the patch.


Alistair.

[Alistair Leslie-Hughes]

Hi Michael,

I've just doubled checked this patch.  None of the functions renamed 
have the

parameter lists greater than 100 width.  There are a few FIXME that are 
but they

can be changed if/when they are implemented.

Regards

Alistair.


On 9/11/19 7:55 am, Michael Stefaniuc wrote:
> Hello Alistair,
>
> do you plan to do more work on this or is this just for more clarity in
> the FIXME / TRACE output?
> The patch is fine in principle but please reformat the parameter list to
> make use of the 100 char line limit.
>
> bye
>   michael
>
> On 11/8/19 3:34 AM, Alistair Leslie-Hughes wrote:
> > Fixed subjet.
> >
> > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> > ---
> >   dlls/dmband/bandtrack.c | 72 ++++++++++++++++++++---------------------
> >   1 file changed, 36 insertions(+), 36 deletions(-)
> >
> > diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
> > index eb62ec11ce..290b35c5f3 100644
> > --- a/dlls/dmband/bandtrack.c
> > +++ b/dlls/dmband/bandtrack.c
> > @@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr
> >       return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface);
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
> > +static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
> >           void **ret_iface)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *
> >       return S_OK;
> >   }
> >
> > -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
> > +static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> >       LONG ref = InterlockedIncrement(&This->ref);
> > @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
> >       return ref;
> >   }
> >
> > -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
> > +static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> >       LONG ref = InterlockedDecrement(&This->ref);
> > @@ -88,7 +88,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
> >       return ref;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface,
> >           IDirectMusicSegment *pSegment)
> >   {
> >     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
> >     return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface,
> >           IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance,
> >           void **state_data, DWORD virtual_track8id, DWORD flags)
> >   {
> > @@ -107,14 +107,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
> >       return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
> > +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
> >   {
> >     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> >     FIXME("(%p, %p): stub\n", This, pStateData);
> >     return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data,
> > +static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data,
> >           MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags,
> >           IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
> >           DWORD virtual_id)
> > @@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi
> >       return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> > +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> >           MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
> >   {
> >     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -141,7 +141,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface,
> >     return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> > +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
> >           MUSIC_TIME mtTime, void *pParam)
> >   {
> >     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -149,7 +149,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface,
> >     return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface,
> >           REFGUID rguidType)
> >   {
> >     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
> >     return DMUS_E_TYPE_UNSUPPORTED;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface,
> >           REFGUID notiftype)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra
> >       return E_NOTIMPL;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface,
> >           REFGUID notiftype)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -196,7 +196,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
> >       return E_NOTIMPL;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
> > +static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
> >           MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
> >   {
> >     IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU
> >     return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
> > +static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data,
> >           REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags,
> >           IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state,
> >           DWORD virtual_id)
> > @@ -217,7 +217,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v
> >       return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface,
> >           REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param,
> >           void *state_data, DWORD flags)
> >   {
> > @@ -229,7 +229,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac
> >       return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface,
> >           REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -240,7 +240,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
> >       return S_OK;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
> > +static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
> >           DWORD trackgroup, IDirectMusicTrack **track)
> >   {
> >       IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface);
> > @@ -249,7 +249,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface,
> >       return E_NOTIMPL;
> >   }
> >
> > -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
> > +static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface,
> >           IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup,
> >           IDirectMusicTrack **ppResultTrack)
> >   {
> > @@ -259,24 +259,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
> > +    band_track_QueryInterface,
> > +    band_track_AddRef,
> > +    band_track_Release,
> > +    band_track_Init,
> > +    band_track_InitPlay,
> > +    band_track_EndPlay,
> > +    band_track_Play,
> > +    band_track_GetParam,
> > +    band_track_SetParam,
> > +    band_track_IsParamSupported,
> > +    band_track_AddNotificationType,
> > +    band_track_RemoveNotificationType,
> > +    band_track_Clone,
> > +    band_track_PlayEx,
> > +    band_track_GetParamEx,
> > +    band_track_SetParamEx,
> > +    band_track_Compose,
> > +    band_track_Join
> >   };
> >
> > /* IDirectMusicBandTrack IPersistStream part: */

[Michael Stefaniuc]

Hello AListair,

On 11/10/19 4:03 AM, Alistair Leslie-Hughes wrote:
> I've just doubled checked this patch.  None of the functions renamed 
> have the
>
> parameter lists greater than 100 width.  There are a few FIXME that are 
> right, I took care of that during the COM cleanup.
> But the rename made the function names shorter thus freeing up space to
> move some parameters up.
> I've submitted v2 with those changes; easier to explain it that way.
> but they
>
> can be changed if/when they are implemented.Right, the Hungarian notation of the parameter names can be fixed then too.

bye
	michael