James Hawkins : kernel32: Factor out the VerifyVersionInfo tests into their own function.
Alexandre Julliard
julliard at winehq.org
Tue Feb 5 06:33:49 CST 2008
Module: wine
Branch: master
Commit: ea41e863ad0a943af15dc8a0ea86f728c8155e6b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea41e863ad0a943af15dc8a0ea86f728c8155e6b
Author: James Hawkins <truiken at gmail.com>
Date: Mon Feb 4 11:18:52 2008 -0600
kernel32: Factor out the VerifyVersionInfo tests into their own function.
---
dlls/kernel32/tests/version.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index ac4d814..8aec42a 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -89,18 +89,13 @@ static void test_GetVersionEx(void)
ok(ret, "Expected GetVersionExA to succeed\n");
ok(GetLastError() == 0xdeadbeef,
"Expected 0xdeadbeef, got %d\n", GetLastError());
-
}
-START_TEST(version)
+static void test_VerifyVersionInfo(void)
{
OSVERSIONINFOEX info = { sizeof(info) };
BOOL ret;
- init_function_pointers();
-
- test_GetVersionEx();
-
if(!pVerifyVersionInfoA || !pVerSetConditionMask)
{
skip("Needed functions not available\n");
@@ -237,3 +232,11 @@ START_TEST(version)
pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
}
+
+START_TEST(version)
+{
+ init_function_pointers();
+
+ test_GetVersionEx();
+ test_VerifyVersionInfo();
+}
More information about the wine-cvs
mailing list