Module: wine Branch: master Commit: cd2904fa1af81f112e8a6509b99a9eccf98dfb2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2904fa1af81f112e8a6509b... Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 16 13:14:41 2022 +0300 combase: Make ProgIDFromCLSID() work in WoW64 setup. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index de2375fba78..8133408559f 100644 --- 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;