d3d8: Removed superflous NULL checks (Coverity).

6bb2d5d2 · Marcus Meissner · Alexandre Julliard · b49a9cbf · 6bb2d5d2
Commit 6bb2d5d2 authored Nov 08, 2009 by Marcus Meissner Committed by Alexandre Julliard Nov 09, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

directx.c dlls/d3d8/directx.c +4 -8

No files found.
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -450,16 +450,12 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte
 err:
    *ppReturnedDeviceInterface = NULL;

-    if(!object) return hr;
    HeapFree(GetProcessHeap(), 0, object->decls);
-    if(object->WineD3DDevice) {
-        wined3d_mutex_lock();
-        IWineD3DDevice_Uninit3D(object->WineD3DDevice, D3D8CB_DestroySwapChain);
-        IWineD3DDevice_Release(object->WineD3DDevice);
-        wined3d_mutex_unlock();
-    }
+    wined3d_mutex_lock();
+    IWineD3DDevice_Uninit3D(object->WineD3DDevice, D3D8CB_DestroySwapChain);
+    IWineD3DDevice_Release(object->WineD3DDevice);
+    wined3d_mutex_unlock();
    HeapFree(GetProcessHeap(), 0, object);
-
    return hr;
 }