dmloader: Do not cast NULL.

Michael Stefaniuc mstefani at redhat.de
Sat Nov 1 18:23:39 CDT 2008


---
 dlls/dmloader/classfactory.c |    4 ++--
 dlls/dmloader/loader.c       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dmloader/classfactory.c b/dlls/dmloader/classfactory.c
index 9c7c68a..266e713 100644
--- a/dlls/dmloader/classfactory.c
+++ b/dlls/dmloader/classfactory.c
@@ -98,7 +98,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj,
 	TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter);
 	obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderCF));
 	if (NULL == obj) {
-		*ppobj = (LPCLASSFACTORY)NULL;
+		*ppobj = NULL;
 		return E_OUTOFMEMORY;
 	}
 	obj->lpVtbl = &DirectMusicLoaderCF_Vtbl;
@@ -187,7 +187,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppo
 	TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter);
 	obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerCF));
 	if (NULL == obj) {
-		*ppobj = (LPCLASSFACTORY)NULL;
+		*ppobj = NULL;
 		return E_OUTOFMEMORY;
 	}
 	obj->lpVtbl = &DirectMusicContainerCF_Vtbl;
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 8f1f2c2..1a6d095 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -798,7 +798,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob
 	TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter);
 	obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderImpl));
 	if (NULL == obj) {
-		*ppobj = (LPDIRECTMUSICLOADER8)NULL;
+		*ppobj = NULL;
 		return E_OUTOFMEMORY;
 	}
 	obj->LoaderVtbl = &DirectMusicLoader_Loader_Vtbl;
-- 
1.6.0.3
-------------- 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/20081102/ab10b101/attachment.pgp 


More information about the wine-patches mailing list