combase: Make ProgIDFromCLSID() work in 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: Make ProgIDFromCLSID() work in WoW64 setup.
cd2904fa · Dmitry Timoshkov · Alexandre Julliard · f0461bb1 · cd2904fa
Commit cd2904fa authored Mar 16, 2022 by Dmitry Timoshkov Committed by Alexandre Julliard Mar 16, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

combase.c dlls/combase/combase.c +8 -2

No files found.
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -1249,6 +1249,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi
    ACTCTX_SECTION_KEYED_DATA data;
    LONG progidlen = 0;
    HKEY hkey;
+    REGSAM opposite = (sizeof(void *) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
+    BOOL is_wow64;
    HRESULT hr;

    if (!progid)
@@ -1277,8 +1279,12 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi
    }

    hr = open_key_for_clsid(clsid, L"ProgID", KEY_READ, &hkey);
-    if (FAILED(hr))
-        return hr;
+    if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
+    {
+        hr = open_key_for_clsid(clsid, L"ProgID", opposite | KEY_READ, &hkey);
+        if (FAILED(hr))
+            return hr;
+    }

    if (RegQueryValueW(hkey, NULL, NULL, &progidlen))
        hr = REGDB_E_CLASSNOTREG;