marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

oldstable
Robert Shearman 2006-07-17 12:12:36 +01:00 committed by Alexandre Julliard
parent 1aabfabf65
commit 4a95b6ae0a
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/kernel/tests/version.c
View File

@ -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,

12
dlls/ntdll/version.c
View File

@ -581,7 +581,7 @@ static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR con
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( const RTL_OSVERSIONINFOEXW *info,
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;