From 3a302c5330a3c2b804548b0c358a5aefa65ba4da Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sun, 11 Jun 2017 13:09:43 +0000 Subject: [PATCH] [APPHELP_APITEST] Addendum to r74986, make the test work on win7. CORE-13284 svn path=/trunk/; revision=75004 --- rostests/apitests/apphelp/env.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rostests/apitests/apphelp/env.c b/rostests/apitests/apphelp/env.c index c244dd0888d..996188a8b9f 100644 --- a/rostests/apitests/apphelp/env.c +++ b/rostests/apitests/apphelp/env.c @@ -1111,7 +1111,7 @@ static void Test_ApphelpCheckRunApp(WCHAR szApphelp[256]) ok_hex(Reason, CHECKREASON(ExpectedReason, (1 << n))); if (AppCompatData && AppCompatDataSize == sizeof(SDBQUERYRESULT_VISTA)) { - if (ExpectedReason != 0x400 && g_ModuleVersion < WINVER_WIN10) + if (ExpectedReason != 0x400 && g_ModuleVersion < WINVER_WIN7) expect_layeronly(AppCompatData, "256Color", expect_flags); else ok(!memcmp(AppCompatData, &empty_result, sizeof(empty_result)), "Expected result to be empty\n"); @@ -1234,10 +1234,10 @@ START_TEST(env) DWORD ShimDataType; NTSTATUS ExceptionStatus = STATUS_SUCCESS; - SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "127"); - SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "127"); + //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "127"); + //SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "127"); - //silence_debug_output(); + silence_debug_output(); hdll = LoadLibraryA("apphelp.dll"); @@ -1299,6 +1299,7 @@ START_TEST(env) return; } + /* New version of Win10.. */ if (g_WinVersion == WINVER_WIN10 && ShimDataType == 3) g_ShimDataSize = 4096; -- 2.17.1