kernel32: Fix/change tests for systems with no ServicePack.
This commit is contained in:
parent
da03fc5574
commit
4ca754d9a9
|
@ -101,6 +101,7 @@ static void test_VerifyVersionInfo(void)
|
||||||
{
|
{
|
||||||
OSVERSIONINFOEX info = { sizeof(info) };
|
OSVERSIONINFOEX info = { sizeof(info) };
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
|
DWORD servicepack;
|
||||||
|
|
||||||
if(!pVerifyVersionInfoA || !pVerSetConditionMask)
|
if(!pVerifyVersionInfoA || !pVerSetConditionMask)
|
||||||
{
|
{
|
||||||
|
@ -108,6 +109,14 @@ static void test_VerifyVersionInfo(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Before we start doing some tests we should check what the version of
|
||||||
|
* the ServicePack is. Tests on a box with no ServicePack will fail otherwise.
|
||||||
|
*/
|
||||||
|
GetVersionEx((OSVERSIONINFO *)&info);
|
||||||
|
servicepack = info.wServicePackMajor;
|
||||||
|
memset(&info, 0, sizeof(info));
|
||||||
|
info.dwOSVersionInfoSize = sizeof(info);
|
||||||
|
|
||||||
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION,
|
ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION,
|
||||||
pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
|
pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));
|
||||||
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
||||||
|
@ -152,7 +161,11 @@ static void test_VerifyVersionInfo(void)
|
||||||
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
||||||
pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL),
|
pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL),
|
||||||
VER_MAJORVERSION, VER_GREATER_EQUAL));
|
VER_MAJORVERSION, VER_GREATER_EQUAL));
|
||||||
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
if (servicepack == 0)
|
||||||
|
ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
|
||||||
|
"VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
|
||||||
|
else
|
||||||
|
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
||||||
|
|
||||||
GetVersionEx((OSVERSIONINFO *)&info);
|
GetVersionEx((OSVERSIONINFO *)&info);
|
||||||
info.wServicePackMinor++;
|
info.wServicePackMinor++;
|
||||||
|
@ -161,17 +174,24 @@ static void test_VerifyVersionInfo(void)
|
||||||
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 %d\n", GetLastError());
|
"VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
|
||||||
|
|
||||||
GetVersionEx((OSVERSIONINFO *)&info);
|
if (servicepack == 0)
|
||||||
info.wServicePackMajor--;
|
{
|
||||||
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
skip("There is no ServicePack on this system\n");
|
||||||
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER));
|
}
|
||||||
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
else
|
||||||
|
{
|
||||||
|
GetVersionEx((OSVERSIONINFO *)&info);
|
||||||
|
info.wServicePackMajor--;
|
||||||
|
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
||||||
|
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER));
|
||||||
|
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
||||||
|
|
||||||
GetVersionEx((OSVERSIONINFO *)&info);
|
GetVersionEx((OSVERSIONINFO *)&info);
|
||||||
info.wServicePackMajor--;
|
info.wServicePackMajor--;
|
||||||
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
||||||
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
|
pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL));
|
||||||
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
|
||||||
|
}
|
||||||
|
|
||||||
GetVersionEx((OSVERSIONINFO *)&info);
|
GetVersionEx((OSVERSIONINFO *)&info);
|
||||||
info.wServicePackMajor++;
|
info.wServicePackMajor++;
|
||||||
|
|
Loading…
Reference in New Issue