[ros-diffs] [mjansen] 75004: [APPHELP_APITEST] Addendum to r74986, make the test work on win7. CORE-13284

Author: mjansen
Date: Sun Jun 11 13:09:43 2017
New Revision: 75004

URL: http://svn.reactos.org/svn/reactos?rev=75004&view=rev
Log:
[APPHELP_APITEST] Addendum to r74986, make the test work on win7. CORE-13284

Modified:
    trunk/rostests/apitests/apphelp/env.c

Modified: trunk/rostests/apitests/apphelp/env.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/env.c?re…
==============================================================================
--- trunk/rostests/apitests/apphelp/env.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/env.c	[iso-8859-1] Sun Jun 11 13:09:43 2017
@@ -1111,7 +1111,7 @@
         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 @@
     DWORD ShimDataType;
     NTSTATUS ExceptionStatus = STATUS_SUCCESS;
 
-    SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "127");
-    SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "127");
-
-    //silence_debug_output();
+    //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "127");
+    //SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "127");
+
+    silence_debug_output();
 
     hdll = LoadLibraryA("apphelp.dll");
 
@@ -1299,6 +1299,7 @@
         return;
     }
 
+    /* New version of Win10.. */
     if (g_WinVersion == WINVER_WIN10 && ShimDataType == 3)
         g_ShimDataSize = 4096;