[PATCH] dmloader: removed useless NULL ptr checks (Coverity)

[Marcus Meissner]

Hi,

CID 358, pObject cannot be NULL anymore at these places,
remove those checks.
But check HeapAlloc return results for pObjectEntry.

Ciao, Marcus
---
 dlls/dmloader/loader.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 8a31b62..53defda 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -332,19 +332,16 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR
 	if (bCache) {
 		if (!pObjectEntry) {
 			pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY));
+			if (!pObjectEntry) return E_OUTOFMEMORY;
 			DM_STRUCT_INIT(&pObjectEntry->Desc);
-			if (pObject) {
-				DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
-				pObjectEntry->pObject = pObject;
-				pObjectEntry->bInvalidDefaultDLS = FALSE;
-			}
+			DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
+			pObjectEntry->pObject = pObject;
+			pObjectEntry->bInvalidDefaultDLS = FALSE;
 			list_add_head (This->pObjects, &pObjectEntry->entry);
 		} else {
-			if (pObject) {
-				DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
-				pObjectEntry->pObject = pObject;
-				pObjectEntry->bInvalidDefaultDLS = FALSE;
-			}		
+			DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
+			pObjectEntry->pObject = pObject;
+			pObjectEntry->bInvalidDefaultDLS = FALSE;
 		}
 		TRACE(": filled in cache entry\n");
 	} else TRACE(": caching disabled\n");
-- 
1.5.6