Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
052113c0
Commit
052113c0
authored
Aug 27, 2021
by
Esme Povirk
Committed by
Alexandre Julliard
Aug 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mscoree: Always base the config file path on the main exe.
Signed-off-by:
Esme Povirk
<
esme@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2b37b075
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
12 deletions
+4
-12
corruntimehost.c
dlls/mscoree/corruntimehost.c
+4
-12
No files found.
dlls/mscoree/corruntimehost.c
View file @
052113c0
...
...
@@ -137,7 +137,7 @@ static void domain_restore(MonoDomain *prev_domain)
static
HRESULT
RuntimeHost_GetDefaultDomain
(
RuntimeHost
*
This
,
const
WCHAR
*
config_path
,
MonoDomain
**
result
)
{
WCHAR
config_dir
[
MAX_PATH
];
WCHAR
exe_config
[
MAX_PATH
];
WCHAR
base_dir
[
MAX_PATH
];
char
*
base_dirA
,
*
config_pathA
,
*
slash
;
HRESULT
res
=
S_OK
;
...
...
@@ -151,18 +151,10 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf
if
(
!
config_path
)
{
DWORD
len
=
ARRAY_SIZE
(
config_dir
);
GetModuleFileNameW
(
NULL
,
exe_config
,
MAX_PATH
);
lstrcatW
(
exe_config
,
L".config"
);
static
const
WCHAR
machine_configW
[]
=
{
'\\'
,
'C'
,
'O'
,
'N'
,
'F'
,
'I'
,
'G'
,
'\\'
,
'm'
,
'a'
,
'c'
,
'h'
,
'i'
,
'n'
,
'e'
,
'.'
,
'c'
,
'o'
,
'n'
,
'f'
,
'i'
,
'g'
,
0
};
res
=
ICLRRuntimeInfo_GetRuntimeDirectory
(
&
This
->
version
->
ICLRRuntimeInfo_iface
,
config_dir
,
&
len
);
if
(
FAILED
(
res
))
goto
end
;
lstrcatW
(
config_dir
,
machine_configW
);
config_path
=
config_dir
;
config_path
=
exe_config
;
}
config_pathA
=
WtoA
(
config_path
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment