From a9506bf952d5c76c90eb0aeed71727cdcafb4ef2 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 11 Mar 2016 16:01:42 +0100 Subject: [PATCH] d3dx9/tests: Get rid of some redundant NULL checks in D3DXCreateTextTest(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3dx9_36/tests/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1afba18e48d..d193d1bbb9b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4401,7 +4401,7 @@ static void D3DXCreateTextTest(void) ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); number_of_vertices = d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh); number_of_faces = d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh); - if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh->lpVtbl->Release(d3dxmesh); hr = D3DXCreateTextA(device, hdc, "wine", 0.0f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); @@ -4411,7 +4411,7 @@ static void D3DXCreateTextTest(void) ok(number_of_faces == d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh), "Got %d faces, expected %d\n", d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); - if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh->lpVtbl->Release(d3dxmesh); if (0) {