marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mscoree: Check for mono runtime path in registry. 

Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Vincent Povirk 2019-04-04 10:05:30 -05:00 committed by Alexandre Julliard
parent 4cae833415
commit 179797a6fb
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/mscoree/metahost.c
View File

@ -667,7 +667,7 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path)
return (attributes != INVALID_FILE_ATTRIBUTES);
}
static BOOL get_mono_path(LPWSTR path)
static BOOL get_mono_path_local(LPWSTR path)
{
static const WCHAR subdir_mono[] = {'\\','m','o','n','o','\\','m','o','n','o','-','2','.','0', 0};
WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH];
@ -685,6 +685,39 @@ static BOOL get_mono_path(LPWSTR path)
return FALSE;
}
static BOOL get_mono_path_registry(LPWSTR path)
{
static const WCHAR keyname[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','M','o','n','o',0};
static const WCHAR valuename[] = {'R','u','n','t','i','m','e','P','a','t','h',0};
WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH];
HKEY hkey;
DWORD res, valuesize;
BOOL ret=FALSE;
/* @@ Wine registry key: HKCU\Software\Wine\Mono */
res = RegOpenKeyW(HKEY_CURRENT_USER, keyname, &hkey);
if (res != ERROR_SUCCESS)
return FALSE;
valuesize = sizeof(base_path);
res = RegGetValueW(hkey, NULL, valuename, RRF_RT_REG_SZ, NULL, base_path, &valuesize);
if (res == ERROR_SUCCESS && find_mono_dll(base_path, mono_dll_path))
{
strcpyW(path, base_path);
ret = TRUE;
}
RegCloseKey(hkey);
return ret;
}
static BOOL get_mono_path(LPWSTR path)
{
return get_mono_path_local(path) ||
get_mono_path_registry(path);
}
struct InstalledRuntimeEnum
{
IEnumUnknown IEnumUnknown_iface;