Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-14 05:08:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[APPHELP_APITEST] Addendum to r74986, make the test work on win7. CORE-13284

Browse source 
svn path=/trunk/; revision=75004
This commit is contained in:
Mark Jansen 2017-06-11 13:09:43 +00:00
parent 3d3581bab1
commit 3a302c5330
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rostests/apitests/apphelp/env.c
View file

@ -1111,7 +1111,7 @@ static void Test_ApphelpCheckRunApp(WCHAR szApphelp[256])
ok_hex(Reason, CHECKREASON(ExpectedReason, (1 << n))); ok_hex(Reason, CHECKREASON(ExpectedReason, (1 << n)));
if (AppCompatData && AppCompatDataSize == sizeof(SDBQUERYRESULT_VISTA)) 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); expect_layeronly(AppCompatData, "256Color", expect_flags);
else else
ok(!memcmp(AppCompatData, &empty_result, sizeof(empty_result)), "Expected result to be empty\n"); ok(!memcmp(AppCompatData, &empty_result, sizeof(empty_result)), "Expected result to be empty\n");
@ -1234,10 +1234,10 @@ START_TEST(env)
DWORD ShimDataType; DWORD ShimDataType;
NTSTATUS ExceptionStatus = STATUS_SUCCESS; NTSTATUS ExceptionStatus = STATUS_SUCCESS;
SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "127"); //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "127");
SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "127"); //SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "127");
//silence_debug_output(); silence_debug_output();
hdll = LoadLibraryA("apphelp.dll"); hdll = LoadLibraryA("apphelp.dll");
@ -1299,6 +1299,7 @@ START_TEST(env)
return; return;
} }
/* New version of Win10.. */
if (g_WinVersion == WINVER_WIN10 && ShimDataType == 3) if (g_WinVersion == WINVER_WIN10 && ShimDataType == 3)
g_ShimDataSize = 4096; g_ShimDataSize = 4096;