Module: wine Branch: master Commit: fd0546bb0a15a1139d4eed6fe49b975ca18dc503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0546bb0a15a1139d4eed6fe4...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jan 8 00:38:54 2009 +0100
dmcompos: Remove superfluous casts.
---
dlls/dmcompos/chordmap.c | 8 ++++---- dlls/dmcompos/chordmaptrack.c | 4 ++-- dlls/dmcompos/dmcompos_main.c | 10 +++++----- dlls/dmcompos/signposttrack.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index fae1771..7529df6 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -36,19 +36,19 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IUnknown_QueryInterface (LPUNKNOW TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicChordMap)) { - *ppobj = (LPVOID)&This->ChordMapVtbl; + *ppobj = &This->ChordMapVtbl; IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef ((LPDIRECTMUSICCHORDMAP)&This->ChordMapVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicChordMapImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicChordMapImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 5fa462d..c7d2307 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNO TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicChordMapTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNO IDirectMusicChordMapTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicChordMapTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index dec8a81..74b1ab4 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -318,23 +318,23 @@ HRESULT WINAPI DllCanUnloadNow(void) { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordMap) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ChordMap_CF; + *ppv = &ChordMap_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicComposer) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Composer_CF; + *ppv = &Composer_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordMapTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ChordMapTrack_CF; + *ppv = &ChordMapTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicTemplate) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Template_CF; + *ppv = &Template_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSignPostTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SignPostTrack_CF; + *ppv = &SignPostTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index bcea894..a913d6f 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNO TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNO IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicSignPostTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }