Michael Stefaniuc : dmloader: Remove superfluous pointer casts.

Alexandre Julliard julliard at winehq.org
Tue Jan 13 10:56:26 CST 2009


Module: wine
Branch: master
Commit: 4b50a4c6703dcfd44eaa3e9b51644946e8b37c33
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4b50a4c6703dcfd44eaa3e9b51644946e8b37c33

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jan 13 10:56:36 2009 +0100

dmloader: Remove superfluous pointer casts.

---

 dlls/dmloader/container.c    |    6 +++---
 dlls/dmloader/loaderstream.c |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index 09e9b0d..081fcce 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -81,15 +81,15 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_QueryInter
 	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
 	if (IsEqualIID (riid, &IID_IUnknown) ||
 		IsEqualIID (riid, &IID_IDirectMusicContainer)) {
-		*ppobj = (LPVOID)&This->ContainerVtbl;
+		*ppobj = &This->ContainerVtbl;
 		IDirectMusicContainerImpl_IDirectMusicContainer_AddRef ((LPDIRECTMUSICCONTAINER)&This->ContainerVtbl);
 		return S_OK;
 	} else if (IsEqualIID (riid, &IID_IDirectMusicObject)) {
-		*ppobj = (LPVOID)&This->ObjectVtbl;
+		*ppobj = &This->ObjectVtbl;
 		IDirectMusicContainerImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl);		
 		return S_OK;
 	} else if (IsEqualIID (riid, &IID_IPersistStream)) {
-		*ppobj = (LPVOID)&This->PersistStreamVtbl;
+		*ppobj = &This->PersistStreamVtbl;
 		IDirectMusicContainerImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);		
 		return S_OK;
 	}
diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c
index da87403..b565292 100644
--- a/dlls/dmloader/loaderstream.c
+++ b/dlls/dmloader/loaderstream.c
@@ -96,11 +96,11 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_QueryInterface (LPSTR
 	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
 	if (IsEqualIID (riid, &IID_IUnknown) ||
 		IsEqualIID (riid, &IID_IStream)) {
-		*ppobj = (LPVOID)&This->StreamVtbl;
+		*ppobj = &This->StreamVtbl;
 		IDirectMusicLoaderFileStream_IStream_AddRef ((LPSTREAM)&This->StreamVtbl);
 		return S_OK;
 	} else if (IsEqualIID (riid, &IID_IDirectMusicGetLoader)) {
-		*ppobj = (LPVOID)&This->GetLoaderVtbl;
+		*ppobj = &This->GetLoaderVtbl;
 		IDirectMusicLoaderFileStream_IDirectMusicGetLoader_AddRef ((LPDIRECTMUSICGETLOADER)&This->GetLoaderVtbl);		
 		return S_OK;
 	}
@@ -344,11 +344,11 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_QueryInterface (L
 	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
 	if (IsEqualIID (riid, &IID_IUnknown) ||
 		IsEqualIID (riid, &IID_IStream)) {
-		*ppobj = (LPVOID)&This->StreamVtbl;
+		*ppobj = &This->StreamVtbl;
 		IDirectMusicLoaderResourceStream_IStream_AddRef ((LPSTREAM)&This->StreamVtbl);
 		return S_OK;
 	} else if (IsEqualIID (riid, &IID_IDirectMusicGetLoader)) {
-		*ppobj = (LPVOID)&This->GetLoaderVtbl;
+		*ppobj = &This->GetLoaderVtbl;
 		IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_AddRef ((LPDIRECTMUSICGETLOADER)&This->GetLoaderVtbl);		
 		return S_OK;
 	}
@@ -604,11 +604,11 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_QueryInterface (LP
 	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
 	if (IsEqualIID (riid, &IID_IUnknown) ||
 		IsEqualIID (riid, &IID_IStream)) {
-		*ppobj = (LPVOID)&This->StreamVtbl;
+		*ppobj = &This->StreamVtbl;
 		IDirectMusicLoaderGenericStream_IStream_AddRef ((LPSTREAM)&This->StreamVtbl);
 		return S_OK;
 	} else if (IsEqualIID (riid, &IID_IDirectMusicGetLoader)) {
-		*ppobj = (LPVOID)&This->GetLoaderVtbl;
+		*ppobj = &This->GetLoaderVtbl;
 		IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_AddRef ((LPDIRECTMUSICGETLOADER)&This->GetLoaderVtbl);		
 		return S_OK;
 	}




More information about the wine-cvs mailing list