dmstyle: Remove superfluous pointer casts.
This commit is contained in:
parent
d62a0eec7b
commit
2b9c8433b2
|
@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicAuditionTrack_IUnknown_QueryInterface (LPUNKNO
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPUNKNOWN)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicAuditionTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicAuditionTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
||||||
|
@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicAuditionTrack_IUnknown_QueryInterface (LPUNKNO
|
||||||
IDirectMusicAuditionTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
IDirectMusicAuditionTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicAuditionTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicAuditionTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ static HRESULT WINAPI IDirectMusicChordTrack_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPUNKNOWN)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicChordTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicChordTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
||||||
|
@ -45,7 +45,7 @@ static HRESULT WINAPI IDirectMusicChordTrack_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
IDirectMusicChordTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
IDirectMusicChordTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicChordTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicChordTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IUnknown_QueryInterface (LPUNKNOW
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPUNKNOWN)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicCommandTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicCommandTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
||||||
|
@ -44,7 +44,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IUnknown_QueryInterface (LPUNKNOW
|
||||||
IDirectMusicCommandTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
IDirectMusicCommandTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicCommandTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicCommandTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -466,35 +466,35 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {
|
||||||
TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
|
TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
|
||||||
|
|
||||||
if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSection) && IsEqualIID (riid, &IID_IClassFactory)) {
|
if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSection) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &Section_CF;
|
*ppv = &Section_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicStyle) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicStyle) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &Style_CF;
|
*ppv = &Style_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &ChordTrack_CF;
|
*ppv = &ChordTrack_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicCommandTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicCommandTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &CommandTrack_CF;
|
*ppv = &CommandTrack_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicStyleTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicStyleTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &StyleTrack_CF;
|
*ppv = &StyleTrack_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicMotifTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicMotifTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &MotifTrack_CF;
|
*ppv = &MotifTrack_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAuditionTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAuditionTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &AuditionTrack_CF;
|
*ppv = &AuditionTrack_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicMuteTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicMuteTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
|
||||||
*ppv = (LPVOID) &MuteTrack_CF;
|
*ppv = &MuteTrack_CF;
|
||||||
IClassFactory_AddRef((IClassFactory*)*ppv);
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPUNKNOWN)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicMotifTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicMotifTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
||||||
|
@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
IDirectMusicMotifTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
IDirectMusicMotifTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicMotifTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicMotifTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicMuteTrack_IUnknown_QueryInterface (LPUNKNOWN i
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPUNKNOWN)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicMuteTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicMuteTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
||||||
|
@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicMuteTrack_IUnknown_QueryInterface (LPUNKNOWN i
|
||||||
IDirectMusicMuteTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
IDirectMusicMuteTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicMuteTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicMuteTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,23 +37,23 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPVOID)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicStyle)) {
|
} else if (IsEqualIID (riid, &IID_IDirectMusicStyle)) {
|
||||||
*ppobj = (LPVOID)&This->StyleVtbl;
|
*ppobj = &This->StyleVtbl;
|
||||||
IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
|
IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicStyle8)) {
|
} else if (IsEqualIID (riid, &IID_IDirectMusicStyle8)) {
|
||||||
*ppobj = (LPVOID)&This->StyleVtbl;
|
*ppobj = &This->StyleVtbl;
|
||||||
IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
|
IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicObject)) {
|
} else if (IsEqualIID (riid, &IID_IDirectMusicObject)) {
|
||||||
*ppobj = (LPVOID)&This->ObjectVtbl;
|
*ppobj = &This->ObjectVtbl;
|
||||||
IDirectMusicStyle8Impl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl);
|
IDirectMusicStyle8Impl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPVOID)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicStyle8Impl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicStyle8Impl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,7 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
|
||||||
|
|
||||||
if (IsEqualIID (riid, &IID_IUnknown)) {
|
if (IsEqualIID (riid, &IID_IUnknown)) {
|
||||||
*ppobj = (LPUNKNOWN)&This->UnknownVtbl;
|
*ppobj = &This->UnknownVtbl;
|
||||||
IDirectMusicStyleTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
IDirectMusicStyleTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
|
||||||
|
@ -44,7 +44,7 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IUnknown_QueryInterface (LPUNKNOWN
|
||||||
IDirectMusicStyleTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
IDirectMusicStyleTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
|
||||||
*ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
|
*ppobj = &This->PersistStreamVtbl;
|
||||||
IDirectMusicStyleTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
IDirectMusicStyleTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue