combase: Don't start dllhost if the CLSID key doesn't exist.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

combase: Don't start dllhost if the CLSID key doesn't exist.
2192f2de · Huw Davies · Alexandre Julliard · 60e10a05 · 2192f2de
Commit 2192f2de authored Apr 06, 2022 by Huw Davies Committed by Alexandre Julliard Apr 06, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

rpc.c dlls/combase/rpc.c +6 -0

No files found.
--- a/dlls/combase/rpc.c
+++ b/dlls/combase/rpc.c
@@ -538,6 +538,12 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process)

    TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid));

+    hr = open_key_for_clsid(rclsid, NULL, KEY_READ, &key);
+    if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
+        hr = open_key_for_clsid(rclsid, NULL, opposite | KEY_READ, &key);
+    if (FAILED(hr)) return hr;
+    RegCloseKey(key);
+
    hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key);
    if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
    {