diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 301ace970d..08c961dabe 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -31,19 +31,19 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IUnknown_QueryInterface (LPUNKNO TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicAudioPath)) { - *ppobj = (LPVOID)&This->AudioPathVtbl; + *ppobj = &This->AudioPathVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 77c010dc92..f4abddd6b5 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -766,59 +766,59 @@ 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_DirectMusicPerformance) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Performance_CF; + *ppv = &Performance_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSegment) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Segment_CF; + *ppv = &Segment_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSegmentState) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SegmentState_CF; + *ppv = &SegmentState_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicGraph) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Graph_CF; + *ppv = &Graph_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicTempoTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &TempoTrack_CF; + *ppv = &TempoTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSeqTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SeqTrack_CF; + *ppv = &SeqTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSysExTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SysExTrack_CF; + *ppv = &SysExTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicTimeSigTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &TimeSigTrack_CF; + *ppv = &TimeSigTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicParamControlTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ParamControlTrack_CF; + *ppv = &ParamControlTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicMarkerTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &MarkerTrack_CF; + *ppv = &MarkerTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicLyricsTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &LyricsTrack_CF; + *ppv = &LyricsTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSegTriggerTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SegTriggerTrack_CF; + *ppv = &SegTriggerTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAudioPath) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &AudioPath_CF; + *ppv = &AudioPath_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicWaveTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &WaveTrack_CF; + *ppv = &WaveTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 79ff8235cb..6f9f70555b 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -31,19 +31,19 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IUnknown_QueryInterface (LPUNKNOWN i TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicGraph)) { - *ppobj = (LPVOID)&This->GraphVtbl; + *ppobj = &This->GraphVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index edfe31a9a5..4d657cf779 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicLyricsTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicLyricsTrack_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 939e829a82..4fc5b5c3f0 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 84ce0eac2f..9d0203ebb9 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicParamControlTrack_IUnknown_QueryInterface (LPU TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicParamControlTrack_IUnknown_QueryInterface (LPU IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d8d2462b08..850d834745 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -67,7 +67,7 @@ static DMUS_PMSGItem* ProceedMsg(IDirectMusicPerformance8Impl* This, DMUS_PMSGIt } static DWORD WINAPI ProcessMsgThread(LPVOID lpParam) { - IDirectMusicPerformance8Impl* This = (IDirectMusicPerformance8Impl*) lpParam; + IDirectMusicPerformance8Impl* This = lpParam; DWORD timeOut = INFINITE; MSG msg; HRESULT hr; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 4b543c4ef1..64cb10a03c 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -32,21 +32,21 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_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; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicSegment) || IsEqualIID (riid, &IID_IDirectMusicSegment2) || IsEqualIID (riid, &IID_IDirectMusicSegment8)) { - *ppobj = (LPVOID)&This->SegmentVtbl; + *ppobj = &This->SegmentVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index ba36626318..1f9e784331 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -32,7 +32,7 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IUnknown_QueryInterface (LPUNK TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -41,7 +41,7 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IUnknown_QueryInterface (LPUNK IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 6ac390ae72..48b658daea 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN if TRACE("(%p, %s,%p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN if IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 43d8d41f40..36db186e37 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef(iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef(iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef(iface); return S_OK; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 4b43023256..21a4685269 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -32,7 +32,7 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -41,7 +41,7 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 1787db049f..0c34857bc4 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOW TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOW IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 3f0d752573..26f2a4ead7 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -30,7 +30,7 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN i TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -39,7 +39,7 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN i IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; }