combase: Use file system redirection path only for an opposite architecture in a WoW64 setup.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

combase: Use file system redirection path only for an opposite architecture in a WoW64 setup.
9ba69dce · Dmitry Timoshkov · Alexandre Julliard · be94570d · 9ba69dce
Commit 9ba69dce authored Jun 27, 2022 by Dmitry Timoshkov Committed by Alexandre Julliard Jul 04, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

rpc.c dlls/combase/rpc.c +3 -2

No files found.
--- a/dlls/combase/rpc.c
+++ b/dlls/combase/rpc.c
@@ -527,7 +527,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process)
    HKEY key;
    int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32;
    REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
-    BOOL is_wow64 = FALSE;
+    BOOL is_wow64 = FALSE, is_opposite = FALSE;
    HRESULT hr;
    WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID];
    DWORD size;
@@ -548,6 +548,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process)
    {
        hr = open_appidkey_from_clsid(rclsid, opposite | KEY_READ, &key);
        if (FAILED(hr)) return hr;
+        is_opposite = TRUE;
    }

    size = (MAX_PATH + 1) * sizeof(WCHAR);
@@ -574,7 +575,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process)

    TRACE("Activating surrogate local server %s\n", debugstr_w(command));

-    if (is_wow64 && arch == 64)
+    if (is_opposite)
    {
        void *cookie;
        Wow64DisableWow64FsRedirection(&cookie);