wineboot: Fix PROCESSOR_ARCHITECTURE reg value.

On my Windows machine, PROCESSOR_ARCHITECTURE has the value "AMD64", but under wine (since 4.1) the value is "Intel64". Signed-off-by: Brendan McGrath <brendan@redmandi.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wineboot: Fix PROCESSOR_ARCHITECTURE reg value.
4cd78c35 · Brendan McGrath · Alexandre Julliard · 4ac31569 · 4cd78c35
Commit 4cd78c35 authored Feb 09, 2019 by Brendan McGrath Committed by Alexandre Julliard Feb 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

wineboot.c programs/wineboot/wineboot.c +5 -4

No files found.
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -422,7 +422,7 @@ static void create_environment_registry_keys( void )
    HKEY env_key;
    SYSTEM_CPU_INFORMATION sci;
    WCHAR buffer[60], vendorid[13];
-    const WCHAR *arch;
+    const WCHAR *arch, *parch;

    if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return;

@@ -435,12 +435,13 @@ static void create_environment_registry_keys( void )
    switch (sci.Architecture)
    {
    case PROCESSOR_ARCHITECTURE_AMD64:
-        arch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W;
+        arch = amd64W;
+        parch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W;
        break;

    case PROCESSOR_ARCHITECTURE_INTEL:
    default:
-        arch = x86W;
+        arch = parch = x86W;
        break;
    }
    set_reg_value( env_key, ProcArchW, arch );
@@ -455,7 +456,7 @@ static void create_environment_registry_keys( void )
    case PROCESSOR_ARCHITECTURE_AMD64:
    case PROCESSOR_ARCHITECTURE_INTEL:
    default:
-        get_identifier( buffer, arch );
+        get_identifier( buffer, parch );
        strcatW( buffer, commaW );
        strcatW( buffer, vendorid );
        break;