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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3649fe09edb50e82b1be294d51f2af3db591d780
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3649fe09edb50e82b1be294d51f2af3db591d780

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Mar 23 14:32:22 2020 +0100

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 at codeweavers.com>
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mscoree/metahost.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c
index 3786f3afc5..df01f9b77f 100644
--- a/dlls/mscoree/metahost.c
+++ b/dlls/mscoree/metahost.c
@@ -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;