Qian Hong : user32/tests: Skip winstation tests on NT4.
Alexandre Julliard
julliard at winehq.org
Tue Oct 15 13:27:12 CDT 2013
Module: wine
Branch: master
Commit: 00c9c6fde360d7f938a987ed066794eed36af73b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c9c6fde360d7f938a987ed066794eed36af73b
Author: Qian Hong <qhong at codeweavers.com>
Date: Tue Oct 15 17:01:50 2013 +0800
user32/tests: Skip winstation tests on NT4.
---
dlls/user32/tests/winstation.c | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index fd6bcc0..0bc9966 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -822,6 +822,21 @@ static void test_foregroundwindow(void)
return;
}
+ ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout_old, 0);
+ if(!ret)
+ {
+ win_skip("Skip tests on NT4\n");
+ CloseDesktop(hdesks[1]);
+ return;
+ }
+ trace("old timeout %d\n", timeout_old);
+ timeout = 0;
+ ret = SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+ ok(ret, "set foreground lock timeout failed!\n");
+ ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0);
+ ok(ret, "get foreground lock timeout failed!\n");
+ ok(timeout == 0, "unexpected timeout %d\n", timeout);
+
for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++)
{
param.hdesk = hdesks[thread_desk_id];
@@ -844,16 +859,6 @@ static void test_foregroundwindow(void)
trace("hwnd0 %p hwnd1 %p partner0 %p partner1 %p\n", hwnds[0], hwnds[1], partners[0], partners[1]);
- ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout_old, 0);
- ok(ret, "get foreground lock timeout failed!\n");
- trace("old timeout %d\n", timeout_old);
- timeout = 0;
- ret = SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
- ok(ret, "set foreground lock timeout failed!\n");
- ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0);
- ok(ret, "get foreground lock timeout failed!\n");
- ok(timeout == 0, "unexpected timeout %d\n", timeout);
-
for (hwnd_id = 0; hwnd_id < DESKTOPS; hwnd_id++)
for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++)
for (input_desk_id = 0; input_desk_id < DESKTOPS; input_desk_id++)
More information about the wine-cvs
mailing list