André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().

Alexandre Julliard julliard at winehq.org
Wed Jan 5 12:40:29 CST 2011


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

Author: André Hentschel <nerv at dawncrow.de>
Date:   Tue Jan  4 22:58:35 2011 +0100

user32/tests: Don't test function directly when reporting GetLastError().

---

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

diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c
index a0d0fe9..5b0f17e 100644
--- a/dlls/user32/tests/clipboard.c
+++ b/dlls/user32/tests/clipboard.c
@@ -68,8 +68,8 @@ static void test_ClipboardOwner(void)
     ok(OpenClipboard(hWnd1), "OpenClipboard failed\n");
 
     SetLastError(0xdeadbeef);
-    ok(!OpenClipboard(hWnd2) &&
-       (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED),
+    ret = OpenClipboard(hWnd2);
+    ok(!ret && (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED),
        "OpenClipboard should fail without setting last error value, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError());
 
     SetLastError(0xdeadbeef);
@@ -79,8 +79,8 @@ static void test_ClipboardOwner(void)
     ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner());
 
     SetLastError(0xdeadbeef);
-    ok(!OpenClipboard(hWnd2) &&
-       (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED),
+    ret = OpenClipboard(hWnd2);
+    ok(!ret && (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED),
        "OpenClipboard should fail without setting last error valuei, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError());
 
     ret = CloseClipboard();




More information about the wine-cvs mailing list