[PATCH 2/2] d3d8: Removed superflous NULL checks (Coverity)
Marcus Meissner
meissner at suse.de
Sun Nov 8 02:16:22 CST 2009
We can only get there if object->WineD3DDevice is not NULL,
so object and object->WineD3DDevice NULL checks are superflous.
Ciao, Marcus
---
dlls/d3d8/directx.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index efcdbd6..e5ecc75 100644
--- 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;
}
--
1.6.4.2
More information about the wine-patches
mailing list