marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmstyle: Partially implement Audition track GetParam/SetParam methods. 

Temporary drop a todo_wine test until all dmstyle tracks have their
SetParam() method implemented.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Michael Stefaniuc 2020-01-22 22:24:28 +01:00 committed by Alexandre Julliard
parent b2c26f28f0
commit 62ff6ee754
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/dmstyle/auditiontrack.c
View File

@ -117,24 +117,49 @@ static HRESULT WINAPI audition_track_Play(IDirectMusicTrack8 *iface, void *pStat
return S_OK;
}
static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type,
MUSIC_TIME time, MUSIC_TIME *next, void *param)
{
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
if (!rguidType)
TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
if (!type)
return E_POINTER;
return S_OK;
if (IsEqualGUID(type, &GUID_Valid_Start_Time)) {
FIXME("GUID_Valid_Start_Time not handled yet\n");
return S_OK;
} else if (IsEqualGUID(type, &GUID_Variations)) {
FIXME("GUID_Variations not handled yet\n");
return S_OK;
}
return DMUS_E_GET_UNSUPPORTED;
}
static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, void *pParam)
static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type,
MUSIC_TIME time, void *param)
{
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam);
return S_OK;
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
if (!type)
return E_POINTER;
if (IsEqualGUID(type, &GUID_DisableTimeSig)) {
FIXME("GUID_DisableTimeSig not handled yet\n");
return S_OK;
} else if (IsEqualGUID(type, &GUID_EnableTimeSig)) {
FIXME("GUID_EnableTimeSig not handled yet\n");
return S_OK;
} else if (IsEqualGUID(type, &GUID_SeedVariations)) {
FIXME("GUID_SeedVariations not handled yet\n");
return S_OK;
}
return DMUS_E_SET_UNSUPPORTED;
}
static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)

2
dlls/dmstyle/tests/dmstyle.c
View File

@ -320,8 +320,6 @@ static void test_track(void)
hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr);
hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL);
todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr);
hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL);
ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr);