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

mscoree: Handle the shared wine-mono installation like the msi case. 

Expect to find the wine-mono-<ver> directory in the same location as the
msi file, that is inside the mono directory.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Francois Gouget 2020-03-23 14:32:22 +01:00 committed by Alexandre Julliard
parent c2d35ed176
commit 3649fe09ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/mscoree/metahost.c
View File

@ -785,7 +785,7 @@ static BOOL get_mono_path_datadir(LPWSTR path)
static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0};
static const WCHAR unix_prefix[] = {'\\','?','?','\\','u','n','i','x','\\'};
static const WCHAR monoW[] = {'\\','m','o','n','o',0};
static const WCHAR dotdotW[] = {'\\','.','.',0};
static const WCHAR dotdotmonoW[] = {'\\','.','.','\\','m','o','n','o',0};
const WCHAR *data_dir, *suffix;
WCHAR *package_dir;
BOOL ret;
@ -793,7 +793,7 @@ static BOOL get_mono_path_datadir(LPWSTR path)
if ((data_dir = _wgetenv( winedatadirW )))
suffix = monoW;
else if ((data_dir = _wgetenv( winebuilddirW )))
suffix = dotdotW;
suffix = dotdotmonoW;
else
return FALSE;