[PATCH] mscoree: Handle the shared wine-mono installation like the msi case.
Francois Gouget
fgouget at codeweavers.com
Mon Mar 23 08:32:22 CDT 2020
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>
---
> Also, I don't really like this:
> + suffix = monoW + 3;
> It doesn't seem worth the 12 bytes it saves in the binary.
At least that's a simple tweak.
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 3786f3afc5c..df01f9b77ff 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;
--
2.20.1
More information about the wine-devel
mailing list