From 8e1f3429905776f604162c93eb92f0b31ff4516f Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sat, 10 Feb 2018 15:31:06 +0100 Subject: [PATCH] [APPSHIM_APITEST] Add Win8 and Win81 versionlie tests --- modules/rostests/apitests/appshim/versionlie.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/appshim/versionlie.c b/modules/rostests/apitests/appshim/versionlie.c index 5848f98aaf9..43c9dc665c3 100644 --- a/modules/rostests/apitests/appshim/versionlie.c +++ b/modules/rostests/apitests/appshim/versionlie.c @@ -196,7 +196,7 @@ static void verify_shim_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shi return; } ver = ((GETVERSIONPROC)hook->ReplacementFunction)(); - winetest_ok(info->FullVersion == ver, "Expected GetVersion to return %u, was: %u for %s\n", info->FullVersion, ver, shim); + winetest_ok(info->FullVersion == ver, "Expected GetVersion to return 0x%x, was: 0x%x for %s\n", info->FullVersion, ver, shim); } @@ -282,6 +282,10 @@ VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win8RTM = { 0x23f00206, 6, 2, 9200, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win81RTM = { 0x25800306, 6, 3, 9600, VER_PLATFORM_WIN32_NT, 0, 0 }; + + DWORD get_host_winver(void) { RTL_OSVERSIONINFOEXW rtlinfo = {0}; @@ -396,4 +400,6 @@ START_TEST(versionlie) run_test("VistaSP1VersionLie", &g_WinVistaSP1); run_test("VistaSP2VersionLie", &g_WinVistaSP2); run_test("Win7RTMVersionLie", &g_Win7RTM); + run_test("Win8RTMVersionLie", &g_Win8RTM); + run_test("Win81RTMVersionLie", &g_Win81RTM); }