userenv: Set the ProgramFiles(x86) and CommonProgramFiles(x86) environment variables.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

userenv: Set the ProgramFiles(x86) and CommonProgramFiles(x86) environment variables.
99dc0e0e · Zebediah Figura · Alexandre Julliard · 6a079faf · 99dc0e0e · 99dc0e0e
Commit 99dc0e0e authored Nov 05, 2019 by Zebediah Figura Committed by Alexandre Julliard Nov 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 8 deletions

userenv.c dlls/userenv/tests/userenv.c +2 -0

userenv_main.c dlls/userenv/userenv_main.c +26 -8

No files found.
--- a/dlls/userenv/tests/userenv.c
+++ b/dlls/userenv/tests/userenv.c
@@ -104,6 +104,8 @@ static void test_create_env(void)
        { "USERPROFILE" }
    };
    static const struct profile_item common_win64_vars[] = {
+        { "ProgramFiles(x86)" },
+        { "CommonProgramFiles(x86)" },
        { "ProgramW6432" },
        { "CommonProgramW6432" }
    };

--- a/dlls/userenv/userenv_main.c
+++ b/dlls/userenv/userenv_main.c
@@ -171,11 +171,20 @@ static void set_wow64_environment(WCHAR **env)
            RtlSetEnvironmentVariable(env, &nameW, &valueW);
        }
    }
-    if (is_wow64 && get_reg_value(*env, hkey, L"ProgramFilesDir (x86)", buf, sizeof(buf)))
+    if (get_reg_value(*env, hkey, L"ProgramFilesDir (x86)", buf, sizeof(buf)))
    {
-        RtlInitUnicodeString(&nameW, L"ProgramFiles");
-        RtlInitUnicodeString(&valueW, buf);
-        RtlSetEnvironmentVariable(env, &nameW, &valueW);
+        if (is_win64 || is_wow64)
+        {
+            RtlInitUnicodeString(&nameW, L"ProgramFiles(x86)");
+            RtlInitUnicodeString(&valueW, buf);
+            RtlSetEnvironmentVariable(env, &nameW, &valueW);
+        }
+        if (is_wow64)
+        {
+            RtlInitUnicodeString(&nameW, L"ProgramFiles");
+            RtlInitUnicodeString(&valueW, buf);
+            RtlSetEnvironmentVariable(env, &nameW, &valueW);
+        }
    }

    /* set the CommonProgramFiles variables */
@@ -195,11 +204,20 @@ static void set_wow64_environment(WCHAR **env)
            RtlSetEnvironmentVariable(env, &nameW, &valueW);
        }
    }
-    if (is_wow64 && get_reg_value(*env, hkey, L"CommonFilesDir (x86)", buf, sizeof(buf)))
+    if (get_reg_value(*env, hkey, L"CommonFilesDir (x86)", buf, sizeof(buf)))
    {
-        RtlInitUnicodeString(&nameW, L"CommonProgramFiles");
-        RtlInitUnicodeString(&valueW, buf);
-        RtlSetEnvironmentVariable(env, &nameW, &valueW);
+        if (is_win64 || is_wow64)
+        {
+            RtlInitUnicodeString(&nameW, L"CommonProgramFiles(x86)");
+            RtlInitUnicodeString(&valueW, buf);
+            RtlSetEnvironmentVariable(env, &nameW, &valueW);
+        }
+        if (is_wow64)
+        {
+            RtlInitUnicodeString(&nameW, L"CommonProgramFiles");
+            RtlInitUnicodeString(&valueW, buf);
+            RtlSetEnvironmentVariable(env, &nameW, &valueW);
+        }
    }

    RegCloseKey(hkey);