[PATCH] d3d9: remove useless NULL check in stateblock test (coverity)

Marcus Meissner marcus at jet.franken.de
Wed Jan 28 02:43:43 CST 2009


Hi,

Coverity spotted that this NULL ptr check is not useful,
device_ptr is dereferenced before already and also cannot
be NULL due to return value handling by init_d3d.

Ciao, Marcus
---
 dlls/d3d9/tests/stateblock.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c
index 42e3bdf..a10ac5b 100644
--- a/dlls/d3d9/tests/stateblock.c
+++ b/dlls/d3d9/tests/stateblock.c
@@ -1569,6 +1569,7 @@ START_TEST(stateblock)
     IDirect3DDevice9 *device_ptr = NULL;
     D3DPRESENT_PARAMETERS device_pparams;
     HRESULT hret;
+    ULONG refcount;
 
     d3d9_handle = LoadLibraryA("d3d9.dll");
     if (!d3d9_handle)
@@ -1584,9 +1585,6 @@ START_TEST(stateblock)
     test_state_management(device_ptr, &device_pparams);
     test_shader_constant_apply(device_ptr);
 
-    if (device_ptr)
-    {
-        ULONG refcount = IDirect3DDevice9_Release(device_ptr);
-        ok(!refcount, "Device has %u references left\n", refcount);
-    }
+    refcount = IDirect3DDevice9_Release(device_ptr);
+    ok(!refcount, "Device has %u references left\n", refcount);
 }
-- 
1.5.6



More information about the wine-patches mailing list