Michael Stefaniuc : d3d9/tests: Simplify some logic operations.
Alexandre Julliard
julliard at winehq.org
Fri Aug 17 10:37:47 CDT 2012
Module: wine
Branch: master
Commit: b410bc3a1abb5f5153f713b0c88fb362e2b5a789
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b410bc3a1abb5f5153f713b0c88fb362e2b5a789
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Aug 17 16:21:16 2012 +0200
d3d9/tests: Simplify some logic operations.
---
dlls/d3d9/tests/query.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c
index 97d3508..834f5b3 100644
--- a/dlls/d3d9/tests/query.c
+++ b/dlls/d3d9/tests/query.c
@@ -108,21 +108,21 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd)
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE,
"IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type));
- supported = (hr == D3D_OK ? TRUE : FALSE);
+ supported = hr == D3D_OK;
trace("query %s is %s\n", queryName(queries[i].type), supported ? "supported" : "not supported");
- ok(!(supported == TRUE && queries[i].foundSupported == FALSE),
+ ok(!supported || queries[i].foundSupported,
"Query %s is supported on this system, but was not found supported before\n",
queryName(queries[i].type));
- ok(!(supported == FALSE && queries[i].foundUnsupported == FALSE),
+ ok(supported || queries[i].foundUnsupported,
"Query %s is not supported on this system, but was found to be supported on all other systems tested before\n",
queryName(queries[i].type));
hr = IDirect3DDevice9_CreateQuery(pDevice, queries[i].type, &pQuery);
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE,
"IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type));
- ok(!(supported && !pQuery), "Query %s was claimed to be supported, but can't be created\n", queryName(queries[i].type));
- ok(!(!supported && pQuery), "Query %s was claimed not to be supported, but can be created\n", queryName(queries[i].type));
+ ok(!supported || pQuery, "Query %s was claimed to be supported, but can't be created\n", queryName(queries[i].type));
+ ok(supported || !pQuery, "Query %s was claimed not to be supported, but can be created\n", queryName(queries[i].type));
if(pQuery)
{
IDirect3DQuery9_Release(pQuery);
More information about the wine-cvs
mailing list