mscoree: Allow loading of registration free .NET COM objects.

Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/mscoree/corruntimehost.c

@@ -29,6 +29,7 @@
 #include "winreg.h"
 #include "ole2.h"
 #include "shellapi.h"
+#include "shlwapi.h"
 
 #include "cor.h"
 #include "mscoree.h"
@@ -40,6 +41,7 @@
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
@@ -68,6 +70,43 @@ struct dll_fixup
     void *tokens; /* pointer into process heap */
 };
 
+struct comclassredirect_data
+{
+    ULONG size;
+    BYTE  res;
+    BYTE  miscmask;
+    BYTE  res1[2];
+    DWORD model;
+    GUID  clsid;
+    GUID  alias;
+    GUID  clsid2;
+    GUID  tlbid;
+    ULONG name_len;
+    ULONG name_offset;
+    ULONG progid_len;
+    ULONG progid_offset;
+    ULONG clrdata_len;
+    ULONG clrdata_offset;
+    DWORD miscstatus;
+    DWORD miscstatuscontent;
+    DWORD miscstatusthumbnail;
+    DWORD miscstatusicon;
+    DWORD miscstatusdocprint;
+};
+
+struct clrclass_data
+{
+    ULONG size;
+    DWORD res[2];
+    ULONG module_len;
+    ULONG module_offset;
+    ULONG name_len;
+    ULONG name_offset;
+    ULONG version_len;
+    ULONG version_offset;
+    DWORD res2[2];
+};
+
 static MonoDomain* domain_attach(MonoDomain *domain)
 {
     MonoDomain *prev_domain = mono_domain_get();
@@ -1606,6 +1645,75 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid,
     return CLASS_E_CLASSNOTAVAILABLE;
 }
 
+static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UINT classname_size, WCHAR *filename, UINT filename_size)
+{
+    ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) };
+    ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info = NULL;
+    SIZE_T bytes_assembly_info;
+    struct comclassredirect_data *redirect_data;
+    struct clrclass_data *class_data;
+    void *ptr_name;
+    const WCHAR *ptr_path_start, *ptr_path_end;
+    WCHAR path[MAX_PATH] = {0};
+    WCHAR str_dll[] = {'.','d','l','l',0};
+    BOOL ret = FALSE;
+
+    if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))
+    {
+        DWORD error = GetLastError();
+        if (error != ERROR_SXS_KEY_NOT_FOUND)
+            ERR("Failed to find guid: %d\n", error);
+        goto end;
+    }
+
+    QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info);
+    assembly_info = heap_alloc(bytes_assembly_info);
+    if (!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex,
+            AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))
+    {
+        ERR("QueryActCtxW failed: %d!\n", GetLastError());
+        goto end;
+    }
+
+    redirect_data = guid_info.lpData;
+    class_data = (void *)((char *)redirect_data + redirect_data->clrdata_offset);
+
+    ptr_name = (char *)class_data + class_data->name_offset;
+    if (lstrlenW(ptr_name) + 1 > classname_size) /* Include null-terminator */
+    {
+        ERR("Buffer is too small\n");
+        goto end;
+    }
+    strcpyW(classname, ptr_name);
+
+    ptr_path_start = assembly_info->lpAssemblyEncodedAssemblyIdentity;
+    ptr_path_end = strchrW(ptr_path_start, ',');
+    memcpy(path, ptr_path_start, (char*)ptr_path_end - (char*)ptr_path_start);
+
+    GetModuleFileNameW(NULL, filename, filename_size);
+    PathRemoveFileSpecW(filename);
+
+    if (lstrlenW(filename) + lstrlenW(path) + ARRAY_SIZE(str_dll) + 1 > filename_size) /* Include blackslash */
+    {
+        ERR("Buffer is too small\n");
+        goto end;
+    }
+
+    PathAppendW(filename, path);
+    strcatW(filename, str_dll);
+
+    ret = TRUE;
+
+end:
+    if (assembly_info)
+        heap_free(assembly_info);
+
+    if (guid_info.hActCtx)
+        ReleaseActCtx(guid_info.hActCtx);
+
+    return ret;
+}
+
 #define CHARS_IN_GUID 39
 
 HRESULT create_monodata(REFIID riid, LPVOID *ppObj )
@@ -1640,9 +1748,8 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj )
     TRACE("Registry key: %s\n", debugstr_w(path));
 
     res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key);
-    if (res == ERROR_FILE_NOT_FOUND)
+    if (res != ERROR_FILE_NOT_FOUND)
-        return CLASS_E_CLASSNOTAVAILABLE;
+    {
-
         res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen);
         if(res != ERROR_SUCCESS)
         {
@@ -1710,6 +1817,14 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj )
                 strcatW(filename, wszDLL);
             }
         }
+    }
+    else
+    {
+        if (!try_create_registration_free_com(riid, classname, ARRAY_SIZE(classname), filename, ARRAY_SIZE(filename)))
+            return CLASS_E_CLASSNOTAVAILABLE;
+
+        TRACE("classname (%s)\n", debugstr_w(classname));
+    }
 
     TRACE("filename (%s)\n", debugstr_w(filename));
 

dlls/mscoree/tests/comtest.c

@@ -114,7 +114,7 @@ static void run_test(BOOL expect_success)
     HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
 
     hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test);
-    todo_wine
+    todo_wine_if(!expect_success)
     ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr);
 
     if (hr == S_OK)
@@ -135,7 +135,7 @@ static void run_test(BOOL expect_success)
     {
         ITest *test2 = NULL;
         hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2);
-        todo_wine
+        todo_wine_if(!expect_success)
         ok(hr == S_OK, "Got %x\n", hr);
 
         if (hr == S_OK)