ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmstyle: The Chord track doesn't support the BandParam type. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2019-11-19 21:02:51 +01:00 committed by Alexandre Julliard
parent cec8d5c968
commit f5ad835ec3
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/dmstyle/chordtrack.c
View File

@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg
return S_OK; return S_OK;
} }
static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType));
if (!rguidType) TRACE("(%p, %s)\n", This, debugstr_dmguid(type));
return E_POINTER;
if (IsEqualGUID (rguidType, &GUID_BandParam) if (!type)
|| IsEqualGUID (rguidType, &GUID_ChordParam) return E_POINTER;
|| IsEqualGUID (rguidType, &GUID_RhythmParam)) {
TRACE("param supported\n"); if (IsEqualGUID(type, &GUID_ChordParam) || IsEqualGUID(type, &GUID_RhythmParam))
return S_OK; return S_OK;
}
TRACE("param unsupported\n"); TRACE("param unsupported\n");
return DMUS_E_TYPE_UNSUPPORTED; return DMUS_E_TYPE_UNSUPPORTED;
} }
static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface, static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface,

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

@ -291,7 +291,7 @@ static void test_track(void)
unsigned int todo_params; unsigned int todo_params;
} class[] = { } class[] = {
{ X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 },
{ X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 },
{ X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 },
{ X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 },
{ X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 },
@ -333,10 +333,9 @@ static void test_track(void)
ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n",
param_types[j].name, hr); param_types[j].name, hr);
else else
todo_wine_if(class[i].todo_params & (1 << j)) ok(hr == DMUS_E_TYPE_UNSUPPORTED,
ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr);
param_types[j].name, hr);
} }
if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {