Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
78108f74
Commit
78108f74
authored
Aug 08, 2021
by
Esme Povirk
Committed by
Alexandre Julliard
Aug 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mscoree: Only override Microsoft.Xna.Framework version 4.
Signed-off-by:
Esme Povirk
<
esme@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
62d26937
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
metahost.c
dlls/mscoree/metahost.c
+5
-2
No files found.
dlls/mscoree/metahost.c
View file @
78108f74
...
...
@@ -89,6 +89,7 @@ MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly);
MonoAssembly
*
(
CDECL
*
mono_assembly_load_from
)(
MonoImage
*
image
,
const
char
*
fname
,
MonoImageOpenStatus
*
status
);
const
char
*
(
CDECL
*
mono_assembly_name_get_name
)(
MonoAssemblyName
*
aname
);
const
char
*
(
CDECL
*
mono_assembly_name_get_culture
)(
MonoAssemblyName
*
aname
);
WORD
(
CDECL
*
mono_assembly_name_get_version
)(
MonoAssemblyName
*
aname
,
WORD
*
minor
,
WORD
*
build
,
WORD
*
revision
);
MonoAssembly
*
(
CDECL
*
mono_assembly_open
)(
const
char
*
filename
,
MonoImageOpenStatus
*
status
);
void
(
CDECL
*
mono_callspec_set_assembly
)(
MonoAssembly
*
assembly
);
MonoClass
*
(
CDECL
*
mono_class_from_mono_type
)(
MonoType
*
type
);
...
...
@@ -199,6 +200,7 @@ static HRESULT load_mono(LPCWSTR mono_path)
LOAD_MONO_FUNCTION
(
mono_assembly_load_from
);
LOAD_MONO_FUNCTION
(
mono_assembly_name_get_name
);
LOAD_MONO_FUNCTION
(
mono_assembly_name_get_culture
);
LOAD_MONO_FUNCTION
(
mono_assembly_name_get_version
);
LOAD_MONO_FUNCTION
(
mono_assembly_open
);
LOAD_MONO_FUNCTION
(
mono_config_parse
);
LOAD_MONO_FUNCTION
(
mono_class_from_mono_type
);
...
...
@@ -1553,8 +1555,9 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a
return
reg_entry
.
flags
;
}
if
(
strcmp
(
basename
,
"Microsoft.Xna.Framework.*"
)
==
0
)
/* XNA redist is broken in Wine Mono, use FNA instead. */
if
(
strcmp
(
basename
,
"Microsoft.Xna.Framework.*"
)
==
0
&&
mono_assembly_name_get_version
(
aname
,
NULL
,
NULL
,
NULL
)
==
4
)
/* Use FNA as a replacement for XNA4. */
return
0
;
return
ASSEMBLY_SEARCH_UNDEFINED
;
...
...
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