From b609a5c037025a6383f09575566784735e18f45d Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Sun, 2 Nov 2008 00:23:39 +0100 Subject: [PATCH] dmloader: Do not cast NULL. --- 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 9c7c68a8b77..266e7134548 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 8f1f2c22193..1a6d0950f94 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; -- 2.11.4.GIT