Michael Stefaniuc : ddraw/tests: Simplify some equality comparisons between bools.

Alexandre Julliard julliard at winehq.org
Wed Feb 20 14:01:14 CST 2013


Module: wine
Branch: master
Commit: 54a1504c57c032274e0e2f134751570513edd9de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=54a1504c57c032274e0e2f134751570513edd9de

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Wed Feb 20 00:11:36 2013 +0100

ddraw/tests: Simplify some equality comparisons between bools.

---

 dlls/ddraw/tests/dsurface.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index 4e08224..eb39801 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -4724,7 +4724,7 @@ static void partial_block_lock_test(void)
             {
                 SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height);
                 hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)),
+                ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)),
                         "Partial block lock %s, expected %s, format %s, pool %s\n",
                         SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure",
                         formats[i].name, pools[j].name);
@@ -4736,7 +4736,7 @@ static void partial_block_lock_test(void)
 
                 SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height);
                 hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)),
+                ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)),
                         "Partial block lock %s, expected %s, format %s, pool %s\n",
                         SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure",
                         formats[i].name, pools[j].name);
@@ -4751,7 +4751,7 @@ static void partial_block_lock_test(void)
             {
                 SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height);
                 hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)),
+                ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)),
                         "Partial block lock %s, expected %s, format %s, pool %s\n",
                         SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure",
                         formats[i].name, pools[j].name);
@@ -4763,7 +4763,7 @@ static void partial_block_lock_test(void)
 
                 SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1);
                 hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL);
-                ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)),
+                ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)),
                         "Partial block lock %s, expected %s, format %s, pool %s\n",
                         SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure",
                         formats[i].name, pools[j].name);




More information about the wine-cvs mailing list