Vincent Povirk : mscoree: Use the . NET 4 interfaces to implement CorBindToRuntimeHost.
Alexandre Julliard
julliard at winehq.org
Tue Nov 9 13:13:24 CST 2010
Module: wine
Branch: master
Commit: 0985e02969d9791f6c439e3012a47f6187b202f9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0985e02969d9791f6c439e3012a47f6187b202f9
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Fri Oct 1 15:43:31 2010 -0500
mscoree: Use the .NET 4 interfaces to implement CorBindToRuntimeHost.
---
dlls/mscoree/mscoree_main.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index e528360..d1f4324 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -319,17 +319,25 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor
DWORD startupFlags, REFCLSID rclsid,
REFIID riid, LPVOID *ppv)
{
- FIXME("(%s, %s, %s, %p, %d, %s, %s, %p): semi-stub!\n", debugstr_w(pwszVersion),
+ HRESULT ret;
+ ICLRRuntimeInfo *info;
+
+ TRACE("(%s, %s, %s, %p, %d, %s, %s, %p)\n", debugstr_w(pwszVersion),
debugstr_w(pwszBuildFlavor), debugstr_w(pwszHostConfigFile), pReserved,
startupFlags, debugstr_guid(rclsid), debugstr_guid(riid), ppv);
- if (!get_mono_path(NULL))
+ *ppv = NULL;
+
+ ret = get_runtime_info(NULL, pwszVersion, pwszHostConfigFile, startupFlags, 0, TRUE, &info);
+
+ if (SUCCEEDED(ret))
{
- MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n");
- return E_FAIL;
+ ret = ICLRRuntimeInfo_GetInterface(info, rclsid, riid, ppv);
+
+ ICLRRuntimeInfo_Release(info);
}
- return S_OK;
+ return ret;
}
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
More information about the wine-cvs
mailing list