Zebediah Figura : msi: Use the global is_wow64 variable in custom_start_server().
Alexandre Julliard
julliard at winehq.org
Mon Nov 16 15:28:56 CST 2020
Module: wine
Branch: master
Commit: 12ae1f8528b18d0df018680747429be29fca7ea4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ae1f8528b18d0df018680747429be29fca7ea4
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sun Nov 15 18:28:13 2020 -0600
msi: Use the global is_wow64 variable in custom_start_server().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/custom.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 508d2edb5cf..b3ac7327d94 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -582,7 +582,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))
@@ -595,17 +594,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);
More information about the wine-cvs
mailing list