Robert Shearman : ntdll: Fix a return code from RtlVerifyVersionInfo and change the FIXME to a TRACE now that all of the tests pass .

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 4a95b6ae0a3f72513b2a307da7cc967fcd62c29a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=4a95b6ae0a3f72513b2a307d...

Author: Robert Shearman 
Date:   Mon Jul 17 12:12:36 2006 +0100

ntdll: Fix a return code from RtlVerifyVersionInfo and change the FIXME to a TRACE now that all of the tests pass.

---

dlls/kernel/tests/version.c |    6 +++---
 dlls/ntdll/version.c        |   12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/dlls/kernel/tests/version.c b/dlls/kernel/tests/version.c
index d02069c..c4ac6ea 100644
--- a/dlls/kernel/tests/version.c
+++ b/dlls/kernel/tests/version.c
@@ -59,7 +59,7 @@ START_TEST(version)
         VER_MINORVERSION/* | VER_PLATFORMID | VER_SERVICEPACKMAJOR |
         VER_SERVICEPACKMINOR | VER_SUITENAME | VER_PRODUCT_TYPE */,
         pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
-    todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
+    ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
         "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());

/* tests special handling of VER_SUITENAME */
@@ -155,7 +155,7 @@ START_TEST(version)
     info.dwMajorVersion++;
     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),
+    ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
         "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());

ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
@@ -167,7 +167,7 @@ START_TEST(version)
     info.dwBuildNumber++;
     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),
+    ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
         "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError());

ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 340ae8b..81127f8 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -581,7 +581,7 @@ static inline NTSTATUS version_compare_v
             if (left > right) return STATUS_REVISION_MISMATCH;
             break;
         default:
-            return STATUS_INVALID_PARAMETER;
+            return STATUS_REVISION_MISMATCH;
     }
     return STATUS_SUCCESS;
 }
@@ -595,15 +595,7 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co
     RTL_OSVERSIONINFOEXW ver;
     NTSTATUS status;

-    FIXME("(%p,%lu,%llx): Not all cases correctly implemented yet\n",
-          info, dwTypeMask, dwlConditionMask);
-
-    /* FIXME:
-        - Check the following special case on Windows (various versions):
-          o lp->wSuiteMask == 0 and ver.wSuiteMask != 0 and VER_AND/VER_OR
-          o lp->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)
-        - MSDN talks about some tests being impossible. Check what really happens.
-     */
+    TRACE("(%p,0x%lx,0x%llx)\n", info, dwTypeMask, dwlConditionMask);

ver.dwOSVersionInfoSize = sizeof(ver);
     if ((status = RtlGetVersion( &ver )) != STATUS_SUCCESS) return status;