November 2019 - Wine-commits

Michael Stefaniuc : dmime: Rename IDirectMusicTrack8Impl to sysex_track.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 965d72dd88da82c90542c4275646984989e15511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=965d72dd88da82c90542c427… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 12 22:53:48 2019 +0100 dmime: Rename IDirectMusicTrack8Impl to sysex_track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/sysextrack.c | 82 +++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 3715fe3b05..81d60f2a29 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -37,7 +37,7 @@ static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicT return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI sysex_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { IDirectMusicSysExTrack *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 sysex_track_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicSysExTrack *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 sysex_track_Release(IDirectMusicTrack8 *iface) { IDirectMusicSysExTrack *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 sysex_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { IDirectMusicSysExTrack *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 sysex_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 sysex_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { IDirectMusicSysExTrack *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 sysex_track_Play(IDirectMusicTrack8 *iface, void *pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { @@ -118,8 +117,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type, - MUSIC_TIME time, MUSIC_TIME *next, void *param) +static HRESULT WINAPI sysex_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -128,8 +127,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID type, - MUSIC_TIME time, void *param) +static HRESULT WINAPI sysex_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -137,8 +136,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID type) +static HRESULT WINAPI sysex_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -146,8 +144,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID notiftype) +static HRESULT WINAPI sysex_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -155,7 +152,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI sysex_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -164,7 +161,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI sysex_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -172,7 +169,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, +static HRESULT WINAPI sysex_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { @@ -182,7 +179,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type, +static HRESULT WINAPI sysex_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type, REFERENCE_TIME time, REFERENCE_TIME *next, void *param, void *state, DWORD flags) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -192,7 +189,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type, +static HRESULT WINAPI sysex_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type, REFERENCE_TIME time, void *param, void *state, DWORD flags) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -202,7 +199,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, +static HRESULT WINAPI sysex_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **track) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -211,9 +208,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 sysex_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *newtrack, + MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, @@ -222,24 +218,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 + sysex_track_QueryInterface, + sysex_track_AddRef, + sysex_track_Release, + sysex_track_Init, + sysex_track_InitPlay, + sysex_track_EndPlay, + sysex_track_Play, + sysex_track_GetParam, + sysex_track_SetParam, + sysex_track_IsParamSupported, + sysex_track_AddNotificationType, + sysex_track_RemoveNotificationType, + sysex_track_Clone, + sysex_track_PlayEx, + sysex_track_GetParamEx, + sysex_track_SetParamEx, + sysex_track_Compose, + sysex_track_Join }; static HRESULT WINAPI sys_IPersistStream_Load(IPersistStream *iface, IStream *stream)

1 0

Michael Stefaniuc : dmime: Rename IDirectMusicTrack8Impl to tempo_track.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 1c877651fbb18f6eef3680199f9a864b9d8ea24f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c877651fbb18f6eef368019… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 12 22:53:49 2019 +0100 dmime: Rename IDirectMusicTrack8Impl to tempo_track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tempotrack.c | 83 ++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c877651fbb18f6eef36…

1 0

Michael Stefaniuc : dmime: Rename IDirectMusicTrack8Impl to wave_track.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: cd522af05bc9515ce32c9b0b0c8f7778c312643c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd522af05bc9515ce32c9b0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 12 22:53:50 2019 +0100 dmime: Rename IDirectMusicTrack8Impl to wave_track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/wavetrack.c | 84 ++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd522af05bc9515ce32c…

1 0

Michael Stefaniuc : dmscript: Rename IDirectMusicTrack8Impl to script_track.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 4af025a195e4e39fae1e93b5304900ee7e2a6ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4af025a195e4e39fae1e93b5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 12 22:53:51 2019 +0100 dmscript: Rename IDirectMusicTrack8Impl to script_track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 82 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 47fe3ef0d2..05c8f393a8 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -43,7 +43,7 @@ static inline DirectMusicScriptTrack *impl_from_IPersistStream(IPersistStream *i } /* DirectMusicScriptTrack IDirectMusicTrack8 part: */ -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI script_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -66,7 +66,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * return S_OK; } -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +static ULONG WINAPI script_track_AddRef(IDirectMusicTrack8 *iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -76,7 +76,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) return ref; } -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +static ULONG WINAPI script_track_Release(IDirectMusicTrack8 *iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -91,15 +91,14 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, - IDirectMusicSegment *pSegment) +static HRESULT WINAPI script_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { DirectMusicScriptTrack *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 script_track_InitPlay(IDirectMusicTrack8 *iface, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { @@ -108,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 script_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { DirectMusicScriptTrack *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 script_track_Play(IDirectMusicTrack8 *iface, void *pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { @@ -124,7 +123,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -132,7 +131,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -140,8 +139,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID rguidType) +static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -151,7 +149,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID rguidNotificationType) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -159,7 +157,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID rguidNotificationType) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -167,7 +165,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -175,7 +173,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, +static HRESULT WINAPI script_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { @@ -185,9 +183,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 script_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, void *pStateData, + DWORD dwFlags) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), @@ -195,8 +193,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 script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), @@ -204,7 +202,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext, +static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -212,8 +210,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, - IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, +static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, + MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -222,24 +220,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 + script_track_QueryInterface, + script_track_AddRef, + script_track_Release, + script_track_Init, + script_track_InitPlay, + script_track_EndPlay, + script_track_Play, + script_track_GetParam, + script_track_SetParam, + script_track_IsParamSupported, + script_track_AddNotificationType, + script_track_RemoveNotificationType, + script_track_Clone, + script_track_PlayEx, + script_track_GetParamEx, + script_track_SetParamEx, + script_track_Compose, + script_track_Join }; /* IDirectMusicScriptTrack IPersistStream part: */

1 0

Rémi Bernon : user32/tests: Increase test_timers count tolerance on Windows.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: b6f7c0a4929dafcd56cbc2cd07b391c01fae7f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6f7c0a4929dafcd56cbc2cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:54 2019 +0100 user32/tests: Increase test_timers count tolerance on Windows. Sometimes the tests fail on w1064v1809 with count equals to 54, or 53. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 193a20fd95..2b777e0c89 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10275,8 +10275,8 @@ static void test_timers(void) while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, + || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); @@ -10345,7 +10345,8 @@ static void test_timers_no_wnd(void) while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, + || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id);

1 0

Rémi Bernon : user32/tests: Tweak test result for w1064v1809.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 843cadb728e04ea9d464e703fe740b5cbac0649f URL: https://source.winehq.org/git/wine.git/?a=commit;h=843cadb728e04ea9d464e703… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:55 2019 +0100 user32/tests: Tweak test result for w1064v1809. Seems like the wparam is not always as expected. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2b777e0c89..26d3abee0f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9059,8 +9059,8 @@ static const struct message WmShiftMouseButton[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xc0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, VK_SHIFT, 0xc0000001 }, { WM_KEYUP, sent|wparam|lparam, VK_SHIFT, 0xc0000001 }, - { WM_LBUTTONUP, wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ - { WM_LBUTTONUP, sent|wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ + { WM_LBUTTONUP, optional, 0, 0 }, /* >= w1064v1809 */ + { WM_LBUTTONUP, sent|optional, 0, 0 }, /* >= w1064v1809 */ { 0 } }; static const struct message WmF1Seq[] = {

1 0

Rémi Bernon : user32/tests: Synchronize with the SendMessageTimeout thread.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 41094ed5ba91935345f9aeb435a7df09b17686d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41094ed5ba91935345f9aeb4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:56 2019 +0100 user32/tests: Synchronize with the SendMessageTimeout thread. We wait a bit after starting the thread, but sometimes the test fails because we didn't wait long enough. This synchronizes the Sleep and the SendMessageTimeout calls. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 26d3abee0f..f136ea1166 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11355,12 +11355,14 @@ struct sendmsg_info HWND hwnd; DWORD timeout; DWORD ret; + HANDLE ready; }; static DWORD CALLBACK send_msg_thread( LPVOID arg ) { struct sendmsg_info *info = arg; SetLastError( 0xdeadbeef ); + SetEvent( info->ready ); info->ret = SendMessageTimeoutA( info->hwnd, WM_USER, 0, 0, 0, info->timeout, NULL ); if (!info->ret) ok( GetLastError() == ERROR_TIMEOUT || broken(GetLastError() == 0), /* win9x */ @@ -11390,6 +11392,7 @@ static void test_SendMessageTimeout(void) DWORD tid; BOOL is_win9x; + info.ready = CreateEventA( NULL, 0, 0, NULL ); info.hwnd = CreateWindowA( "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); flush_events(); @@ -11397,7 +11400,9 @@ static void test_SendMessageTimeout(void) info.timeout = 1000; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); wait_for_thread( thread ); CloseHandle( thread ); ok( info.ret == 1, "SendMessageTimeout failed\n" ); @@ -11405,7 +11410,9 @@ static void test_SendMessageTimeout(void) info.timeout = 1; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); /* SendMessageTimeout should time out here */ wait_for_thread( thread ); CloseHandle( thread ); @@ -11415,7 +11422,9 @@ static void test_SendMessageTimeout(void) /* 0 means infinite timeout (but not on win9x) */ info.timeout = 0; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); wait_for_thread( thread ); CloseHandle( thread ); @@ -11426,7 +11435,9 @@ static void test_SendMessageTimeout(void) /* timeout is treated as signed despite the prototype (but not on win9x) */ info.timeout = 0x7fffffff; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); wait_for_thread( thread ); CloseHandle( thread ); @@ -11435,7 +11446,9 @@ static void test_SendMessageTimeout(void) info.timeout = 0x80000000; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); wait_for_thread( thread ); CloseHandle( thread ); @@ -11454,7 +11467,9 @@ static void test_SendMessageTimeout(void) SetWindowLongPtrA( info.hwnd, GWLP_WNDPROC, (LONG_PTR)send_msg_delay_proc ); info.timeout = 100; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); wait_for_thread( thread ); CloseHandle( thread ); /* we should time out but still get the message */ @@ -11462,6 +11477,7 @@ static void test_SendMessageTimeout(void) ok_sequence( WmUser, "WmUser", FALSE ); DestroyWindow( info.hwnd ); + CloseHandle( info.ready ); }

1 0

Rémi Bernon : user32/tests: Close event at the end of the test_WaitForInputIdle test.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 8134b8b6f50fb5528bcb1cbe316d29a3421b4baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8134b8b6f50fb5528bcb1cbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:58 2019 +0100 user32/tests: Close event at the end of the test_WaitForInputIdle test. There's some random timeout failures on Windows VMs in this test, this is probably not going to fix them, but cleaning up is not going to hurt. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f136ea1166..39d7e1a0a1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16315,6 +16315,7 @@ static void test_WaitForInputIdle( char *argv0 ) CloseHandle( pi.hThread ); } } + CloseHandle( end_event ); CloseHandle( start_event ); PostThreadMessageA( id, WM_QUIT, 0, 0 ); WaitForSingleObject( thread, 10000 );

1 0

Rémi Bernon : user32/tests: Ignore WM_WININICHANGE message in test sequences.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 1450924e5985c04692ca6eae8d3834f40bda5de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1450924e5985c04692ca6eae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:00 2019 +0100 user32/tests: Ignore WM_WININICHANGE message in test sequences. Tests sometimes fail because of an unexpected 0x001a message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 39d7e1a0a1..2226f4ff08 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2085,7 +2085,8 @@ static BOOL ignore_message( UINT message ) message == WM_TIMECHANGE || message == WM_DISPLAYCHANGE || message == WM_DEVICECHANGE || - message == WM_DWMNCRENDERINGCHANGED); + message == WM_DWMNCRENDERINGCHANGED || + message == WM_WININICHANGE); } static unsigned hash_Ly_W(const WCHAR *str)

1 0

Rémi Bernon : user32/tests: Make the test_PeekMessage3 timer fire less often.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 19c107335e9aa269bcbe282bee8b97575c7b0bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c107335e9aa269bcbe282b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:01 2019 +0100 user32/tests: Make the test_PeekMessage3 timer fire less often. On Windows it sometimes fires again before we get the expected WM_USER message and/or before the end of the test where we don't expect any more message. We cannot fire it only once because Wine doesn't pass the tests yet and it would block otherwise, but fire it less often helps the test to pass on Windows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2226f4ff08..ad4ff7d2a7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12420,7 +12420,7 @@ static void test_PeekMessage3(void) /* GetMessage() and PeekMessage(..., PM_REMOVE) should prefer messages which * were already seen. */ - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER, 0, 0); @@ -12436,7 +12436,7 @@ static void test_PeekMessage3(void) ret = PeekMessageA(&msg, NULL, 0, 0, 0); ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER, 0, 0); @@ -12451,7 +12451,7 @@ static void test_PeekMessage3(void) /* It doesn't matter if a message range is specified or not. */ - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER, 0, 0); @@ -12467,7 +12467,7 @@ static void test_PeekMessage3(void) /* But not if the post messages were added before the PeekMessage() call. */ PostMessageA(hwnd, WM_USER, 0, 0); - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); ret = GetMessageA(&msg, NULL, 0, 0); @@ -12480,7 +12480,7 @@ static void test_PeekMessage3(void) /* More complicated test with multiple messages. */ PostMessageA(hwnd, WM_USER, 0, 0); - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER + 1, 0, 0);

1 0