ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Use the global is_wow64 variable in custom_start_server(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-11-15 18:28:13 -06:00 committed by Alexandre Julliard
parent ca5bc488d9
commit 12ae1f8528
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msi/custom.c
View File

@ -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);