shell32/tests: Fix the ShellExecute() environment variable inheritance checks.

The child process does not inherit environment variables when the calling process does not have elevated privileges and specifies SEE_MASK_NOZONECHECKS. Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/tests: Fix the ShellExecute() environment variable inheritance checks.
bfc12443 · Francois Gouget · Alexandre Julliard · c1636cd2 · bfc12443
Commit bfc12443 authored Feb 08, 2016 by Francois Gouget Committed by Alexandre Julliard Feb 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

shlexec.c dlls/shell32/tests/shlexec.c +13 -2

No files found.
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -648,8 +648,19 @@ static INT_PTR shell_execute_ex_(const char* file, int line,
        c = GetPrivateProfileIntA("Child", "Failures", -1, child_file);
        if (c > 0)
            winetest_add_failures(c);
-        okChildInt_(file, line, "ShlexecVarLE", 0);
+        /* When NOZONECHECKS is specified the environment variables are not
-        okChildString_(file, line, "ShlexecVar", "Present", "Present");
+         * inherited if the process does not have elevated privileges.
+         */
+        if ((mask & SEE_MASK_NOZONECHECKS) && skip_shlexec_tests)
+        {
+            okChildInt_(file, line, "ShlexecVarLE", 203);
+            okChildString_(file, line, "ShlexecVar", "", "");
+        }
+        else
+        {
+            okChildInt_(file, line, "ShlexecVarLE", 0);
+            okChildString_(file, line, "ShlexecVar", "Present", "Present");
+        }
    }
    return rc;