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
cae84e2b
Commit
cae84e2b
authored
Feb 08, 2021
by
Esme Povirk
Committed by
Alexandre Julliard
Feb 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mscoree: Update Wine Mono to 6.0.0.
Signed-off-by:
Esme Povirk
<
esme@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5a3dad10
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
addons.c
dlls/appwiz.cpl/addons.c
+2
-2
mscoree_private.h
dlls/mscoree/mscoree_private.h
+1
-1
comtest.c
dlls/mscoree/tests/comtest.c
+1
-1
No files found.
dlls/appwiz.cpl/addons.c
View file @
cae84e2b
...
...
@@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
#define GECKO_SHA "???"
#endif
#define MONO_VERSION "
5.1.1
"
#define MONO_VERSION "
6.0.0
"
#if defined(__i386__) || defined(__x86_64__)
#define MONO_ARCH "x86"
#define MONO_SHA "
74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227
"
#define MONO_SHA "
5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0
"
#else
#define MONO_ARCH ""
#define MONO_SHA "???"
...
...
dlls/mscoree/mscoree_private.h
View file @
cae84e2b
...
...
@@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version)
extern
HRESULT
assembly_get_vtable_fixups
(
ASSEMBLY
*
assembly
,
VTableFixup
**
fixups
,
DWORD
*
count
)
DECLSPEC_HIDDEN
;
extern
HRESULT
assembly_get_native_entrypoint
(
ASSEMBLY
*
assembly
,
NativeEntryPointFunc
*
func
)
DECLSPEC_HIDDEN
;
#define WINE_MONO_VERSION "
5.1.1
"
#define WINE_MONO_VERSION "
6.0.0
"
/* Mono embedding */
typedef
struct
_MonoDomain
MonoDomain
;
...
...
dlls/mscoree/tests/comtest.c
View file @
cae84e2b
...
...
@@ -195,7 +195,7 @@ static void run_registry_test(run_type run)
ok
(
hr
==
S_OK
,
"Got %x
\n
"
,
hr
);
ok
(
i
==
42
,
"Expected 42, got %d
\n
"
,
i
);
hr
=
ITest_QueryInterface
(
test
,
&
IID_ITest2
,
(
void
**
)
&
unk
);
todo_wine
ok
(
hr
==
S_OK
,
"ITest_QueryInterface returned %x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"ITest_QueryInterface returned %x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
IUnknown_Release
(
unk
);
ITest_Release
(
test
);
}
...
...
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