[PATCH] 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 --- 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 950681e..4502ca6 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); -- 2.7.4
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> On 18/08/18 22:19, Zebediah Figura wrote:
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 --- 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 950681e..4502ca6 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);
participants (2)
-
Hans Leidekker -
Zebediah Figura