dmime: Remove superfluous pointer casts.
Michael Stefaniuc
mstefani at redhat.de
Tue Jan 13 03:56:24 CST 2009
---
dlls/dmime/audiopath.c | 8 ++++----
dlls/dmime/dmime_main.c | 28 ++++++++++++++--------------
dlls/dmime/graph.c | 8 ++++----
dlls/dmime/lyricstrack.c | 4 ++--
dlls/dmime/markertrack.c | 4 ++--
dlls/dmime/paramcontroltrack.c | 4 ++--
dlls/dmime/performance.c | 2 +-
dlls/dmime/segment.c | 8 ++++----
dlls/dmime/segtriggertrack.c | 4 ++--
dlls/dmime/seqtrack.c | 4 ++--
dlls/dmime/sysextrack.c | 4 ++--
dlls/dmime/tempotrack.c | 4 ++--
dlls/dmime/timesigtrack.c | 4 ++--
dlls/dmime/wavetrack.c | 4 ++--
14 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
index 301ace9..08c961d 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 77c010d..f4abddd 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 79ff823..6f9f705 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 edfe31a..4d657cf 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 939e829..4fc5b5c 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 84ce0ea..9d0203e 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 d8d2462..850d834 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 4b543c4..64cb10a 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 ba36626..1f9e784 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 6ac390a..48b658d 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 43d8d41..36db186 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 4b43023..21a4685 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 1787db0..0c34857 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 3f0d752..26f2a4e 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;
}
--
1.6.0.6
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20090113/b85ae3eb/attachment-0001.pgp
More information about the wine-patches
mailing list