Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmime/lyricstrack.c | 84 +++++++++++++++++++---------------------
1 file changed, 40 insertions(+), 44 deletions(-)
diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c
index 08000274d6..7554356ba4 100644
--- a/dlls/dmime/lyricstrack.c
+++ b/dlls/dmime/lyricstrack.c
@@ -37,7 +37,7 @@ static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusic
return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, IDirectMusicTrack8_iface);
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
+static HRESULT WINAPI lyrics_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
void **ret_iface)
{
IDirectMusicLyricsTrack *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 lyrics_track_AddRef(IDirectMusicTrack8 *iface)
{
IDirectMusicLyricsTrack *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 lyrics_track_Release(IDirectMusicTrack8 *iface)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref);
@@ -85,15 +85,14 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
return ref;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
- IDirectMusicSegment *pSegment)
+static HRESULT WINAPI lyrics_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pSegment);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI lyrics_track_InitPlay(IDirectMusicTrack8 *iface,
IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{
@@ -102,14 +101,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
+static HRESULT WINAPI lyrics_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pStateData);
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData,
+static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateData,
MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags,
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{
@@ -118,7 +117,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
+static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -126,7 +125,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface,
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
+static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, void *pParam)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -134,8 +133,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface,
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface,
- REFGUID rguidType)
+static HRESULT WINAPI lyrics_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -145,8 +143,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
return DMUS_E_TYPE_UNSUPPORTED;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface,
- REFGUID notiftype)
+static HRESULT WINAPI lyrics_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -154,7 +151,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface,
+static HRESULT WINAPI lyrics_track_RemoveNotificationType(IDirectMusicTrack8 *iface,
REFGUID notiftype)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -163,7 +160,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
+static HRESULT WINAPI lyrics_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -171,7 +168,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
+static HRESULT WINAPI lyrics_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags,
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{
@@ -181,9 +178,9 @@ 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 lyrics_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
+ REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, void *pStateData,
+ DWORD dwFlags)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
@@ -191,8 +188,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 lyrics_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
+ REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
@@ -200,7 +197,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
return S_OK;
}
-static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
+static HRESULT WINAPI lyrics_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
DWORD trackgroup, IDirectMusicTrack **track)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
@@ -209,9 +206,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 lyrics_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *newtrack,
+ MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
{
IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context,
@@ -220,24 +216,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
+ lyrics_track_QueryInterface,
+ lyrics_track_AddRef,
+ lyrics_track_Release,
+ lyrics_track_Init,
+ lyrics_track_InitPlay,
+ lyrics_track_EndPlay,
+ lyrics_track_Play,
+ lyrics_track_GetParam,
+ lyrics_track_SetParam,
+ lyrics_track_IsParamSupported,
+ lyrics_track_AddNotificationType,
+ lyrics_track_RemoveNotificationType,
+ lyrics_track_Clone,
+ lyrics_track_PlayEx,
+ lyrics_track_GetParamEx,
+ lyrics_track_SetParamEx,
+ lyrics_track_Compose,
+ lyrics_track_Join
};
static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream)
--
2.20.1