Robert Shearman : kernel: Fix an incorrect version test.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 17 08:14:57 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 1aabfabf65b601b2e65fbcf8aae7f22bc3164571
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1aabfabf65b601b2e65fbcf8aae7f22bc3164571
Author: Robert Shearman <rob at codeweavers.com>
Date: Mon Jul 17 12:11:44 2006 +0100
kernel: Fix an incorrect version test.
---
dlls/kernel/tests/version.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel/tests/version.c b/dlls/kernel/tests/version.c
index 96999e5..d02069c 100644
--- a/dlls/kernel/tests/version.c
+++ b/dlls/kernel/tests/version.c
@@ -163,7 +163,6 @@ START_TEST(version)
ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
- /* shows that build number fits into the hierarchy after major version, but before minor version */
GetVersionEx((OSVERSIONINFO *)&info);
info.dwBuildNumber++;
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
@@ -179,7 +178,6 @@ START_TEST(version)
GetVersionEx((OSVERSIONINFO *)&info);
info.dwOSVersionInfoSize = 0;
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
- pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
- todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
- "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());
+ pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
+ ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError());
}
More information about the wine-cvs
mailing list