Reece H. Dunn : user32: Make the clipboard tests pass on Vista.
Alexandre Julliard
julliard at winehq.org
Fri Jan 25 07:06:05 CST 2008
Module: wine
Branch: master
Commit: ad89ff0abf5e2b6aff6ccd6023ac30af2978c2f0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad89ff0abf5e2b6aff6ccd6023ac30af2978c2f0
Author: Reece H. Dunn <msclrhd at gmail.com>
Date: Wed Jan 23 23:32:52 2008 +0000
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());
More information about the wine-cvs
mailing list