Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
c110a55f
Commit
c110a55f
authored
13 years ago
by
Esme Povirk
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mscoree: Search for an arch-specific mono dll first.
parent
4cd00f2b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/mscoree/metahost.c
+16
-1
16 additions, 1 deletion
dlls/mscoree/metahost.c
with
16 additions
and
1 deletion
dlls/mscoree/metahost.c
+
16
−
1
View file @
c110a55f
...
...
@@ -564,6 +564,14 @@ HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **res
return
CLRRuntimeInfo_GetRuntimeHost
(
This
,
result
);
}
#ifdef __i386__
static
const
WCHAR
libmono2_arch_dll
[]
=
{
'\\'
,
'b'
,
'i'
,
'n'
,
'\\'
,
'l'
,
'i'
,
'b'
,
'm'
,
'o'
,
'n'
,
'o'
,
'-'
,
'2'
,
'.'
,
'0'
,
'-'
,
'x'
,
'8'
,
'6'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
#elif defined(__x86_64__)
static
const
WCHAR
libmono2_arch_dll
[]
=
{
'\\'
,
'b'
,
'i'
,
'n'
,
'\\'
,
'l'
,
'i'
,
'b'
,
'm'
,
'o'
,
'n'
,
'o'
,
'-'
,
'2'
,
'.'
,
'0'
,
'-'
,
'x'
,
'8'
,
'6'
,
'_'
,
'6'
,
'4'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
#else
static
const
WCHAR
libmono2_arch_dll
[]
=
{
'\\'
,
'b'
,
'i'
,
'n'
,
'\\'
,
'l'
,
'i'
,
'b'
,
'm'
,
'o'
,
'n'
,
'o'
,
'-'
,
'2'
,
'.'
,
'0'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
#endif
static
BOOL
find_mono_dll
(
LPCWSTR
path
,
LPWSTR
dll_path
,
int
abi_version
)
{
static
const
WCHAR
mono_dll
[]
=
{
'\\'
,
'b'
,
'i'
,
'n'
,
'\\'
,
'm'
,
'o'
,
'n'
,
'o'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
...
...
@@ -588,9 +596,16 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version)
else
if
(
abi_version
==
2
)
{
strcpyW
(
dll_path
,
path
);
strcatW
(
dll_path
,
mono2_dll
);
strcatW
(
dll_path
,
lib
mono2_
arch_
dll
);
attributes
=
GetFileAttributesW
(
dll_path
);
if
(
attributes
==
INVALID_FILE_ATTRIBUTES
)
{
strcpyW
(
dll_path
,
path
);
strcatW
(
dll_path
,
mono2_dll
);
attributes
=
GetFileAttributesW
(
dll_path
);
}
if
(
attributes
==
INVALID_FILE_ATTRIBUTES
)
{
strcpyW
(
dll_path
,
path
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment