Zebediah Figura : msi: Don' t assume that WoW64 redirection is enabled in custom_start_server().
Alexandre Julliard
julliard at winehq.org
Mon Aug 20 13:26:11 CDT 2018
Module: wine
Branch: master
Commit: 51ad009bacd297c0607bc6de4d5dae18afe6ea98
URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ad009bacd297c0607bc6de4d5dae18afe6ea98
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sat Aug 18 22:19:40 2018 -0500
msi: Don't assume that WoW64 redirection is enabled in custom_start_server().
As of 3a884c2ef the server is started on the main thread, so this is no
longer a valid assumption. In particular, we disable WoW64 redirection while
running standard actions, including the top-level INSTALL action.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45663
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 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index cd37a56..ee259e8 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -601,14 +601,17 @@ 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 (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY)
+ if (!IsWow64Process(GetCurrentProcess(), &wow64))
+ wow64 = FALSE;
+
+ if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY)
GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));
else
GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));
strcatW(path, msiexecW);
sprintfW(cmdline, argsW, path, GetCurrentProcessId());
- if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY)
+ if (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