From 9fb472fc2646c4eb2e6b1fddc7deeb0c6a4130a4 Mon Sep 17 00:00:00 2001 From: winesync Date: Sun, 13 Mar 2022 21:40:10 +0100 Subject: [PATCH] [WINESYNC] msi: Use the global is_wow64 variable in custom_start_server(). Signed-off-by: Zebediah Figura Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard wine commit id 12ae1f8528b18d0df018680747429be29fca7ea4 by Zebediah Figura --- dll/win32/msi/custom.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 9e9a13afa54..47d04a87ea0 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -603,7 +603,6 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) WCHAR buffer[24]; void *cookie; HANDLE pipe; - BOOL wow64; if ((arch == SCS_32BIT_BINARY && package->custom_server_32_process) || (arch == SCS_64BIT_BINARY && package->custom_server_64_process)) @@ -616,17 +615,14 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) if (pipe == INVALID_HANDLE_VALUE) ERR("Failed to create custom action client pipe: %u\n", GetLastError()); - if (!IsWow64Process(GetCurrentProcess(), &wow64)) - wow64 = FALSE; - - if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) + if ((sizeof(void *) == 8 || is_wow64) && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\\msiexec.exe")); else GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\\msiexec.exe")); lstrcatW(path, L"\\msiexec.exe"); swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId()); - if (wow64 && arch == SCS_64BIT_BINARY) + if (is_wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);