dmscript: Remove superfluous pointer casts.
Michael Stefaniuc
mstefani at redhat.de
Tue Jan 13 03:56:48 CST 2009
---
dlls/dmscript/dmscript_main.c | 20 ++++++++++----------
dlls/dmscript/script.c | 10 +++++-----
dlls/dmscript/scripttrack.c | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c
index ae1cdbc..bbecb7b 100644
--- a/dlls/dmscript/dmscript_main.c
+++ b/dlls/dmscript/dmscript_main.c
@@ -582,43 +582,43 @@ 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_DirectMusicScriptAutoImpSegment) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptAutoImplSegment_CF;
+ *ppv = &ScriptAutoImplSegment_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptTrack_CF;
+ *ppv = &ScriptTrack_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_AudioVBScript) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &AudioVBScript_CF;
+ *ppv = &AudioVBScript_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScript) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &Script_CF;
+ *ppv = &Script_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpPerformance) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptAutoImplPerformance_CF;
+ *ppv = &ScriptAutoImplPerformance_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptSourceCodeLoader) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptSourceCodeLoader_CF;
+ *ppv = &ScriptSourceCodeLoader_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSegmentState) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptAutoImplSegmentState_CF;
+ *ppv = &ScriptAutoImplSegmentState_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpAudioPathConfig) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptAutoImplAudioPathConfig_CF;
+ *ppv = &ScriptAutoImplAudioPathConfig_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpAudioPath) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptAutoImplAudioPath_CF;
+ *ppv = &ScriptAutoImplAudioPath_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSong) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = (LPVOID) &ScriptAutoImplSong_CF;
+ *ppv = &ScriptAutoImplSong_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
}
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 3d9ae42..d7c696b 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -45,19 +45,19 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown)) {
- *ppobj = (LPVOID)&This->UnknownVtbl;
+ *ppobj = &This->UnknownVtbl;
IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicScript)) {
- *ppobj = (LPVOID)&This->ScriptVtbl;
+ *ppobj = &This->ScriptVtbl;
IDirectMusicScriptImpl_IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicObject)) {
- *ppobj = (LPVOID)&This->ObjectVtbl;
+ *ppobj = &This->ObjectVtbl;
IDirectMusicScriptImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
- *ppobj = (LPVOID)&This->PersistStreamVtbl;
+ *ppobj = &This->PersistStreamVtbl;
IDirectMusicScriptImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
return S_OK;
}
@@ -524,7 +524,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREA
IDirectMusicObject* pObject = NULL;
DMUS_OBJECTDESC desc;
- ZeroMemory ((LPVOID)&desc, sizeof(DMUS_OBJECTDESC));
+ ZeroMemory (&desc, sizeof(DMUS_OBJECTDESC));
desc.dwSize = sizeof(DMUS_OBJECTDESC);
desc.dwValidData = DMUS_OBJ_STREAM | DMUS_OBJ_CLASS;
desc.guidClass = CLSID_DirectMusicContainer;
diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c
index 4c3aca8..7ff8ef8 100644
--- a/dlls/dmscript/scripttrack.c
+++ b/dlls/dmscript/scripttrack.c
@@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicScriptTrack_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;
IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
@@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN
IDirectMusicScriptTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
- *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl;
+ *ppobj = &This->PersistStreamVtbl;
IDirectMusicScriptTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
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/03311cd9/attachment-0001.pgp
More information about the wine-patches
mailing list