From d54c0df01ac70a53e4f5cceb4cb729042ee536a6 Mon Sep 17 00:00:00 2001 From: Reece H. Dunn Date: Wed, 23 Jan 2008 23:32:52 +0000 Subject: [PATCH] user32: make the clipboard tests pass on Vista. --- dlls/user32/tests/clipboard.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5624408..30b1707 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -66,8 +66,9 @@ static void test_ClipboardOwner(void) ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); SetLastError(0xdeadbeef); - ok(!OpenClipboard(hWnd2) && GetLastError() == 0xdeadbeef, - "OpenClipboard should fail without setting last error value\n"); + ok(!OpenClipboard(hWnd2) && + (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); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should still be not owned\n"); @@ -76,8 +77,9 @@ 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, - "OpenClipboard should fail without setting last error value\n"); + ok(!OpenClipboard(hWnd2) && + (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(); ok( ret, "CloseClipboard error %d\n", GetLastError()); -- 1.5.3.5