ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mscoree: Update Wine Mono to 6.0.0. 

Signed-off-by: Esme Povirk <esme@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Esme Povirk 2021-02-08 15:13:32 -06:00 committed by Alexandre Julliard
parent 5a3dad108b
commit cae84e2b06
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/appwiz.cpl/addons.c
View File

@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
#define GECKO_SHA "???" #define GECKO_SHA "???"
#endif #endif
#define MONO_VERSION "5.1.1" #define MONO_VERSION "6.0.0"
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define MONO_ARCH "x86" #define MONO_ARCH "x86"
#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" #define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0"
#else #else
#define MONO_ARCH "" #define MONO_ARCH ""
#define MONO_SHA "???" #define MONO_SHA "???"

2
dlls/mscoree/mscoree_private.h
View File

@ -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_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN;
extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) 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 */ /* Mono embedding */
typedef struct _MonoDomain MonoDomain; typedef struct _MonoDomain MonoDomain;

2
dlls/mscoree/tests/comtest.c
View File

@ -195,7 +195,7 @@ static void run_registry_test(run_type run)
ok(hr == S_OK, "Got %x\n", hr); ok(hr == S_OK, "Got %x\n", hr);
ok(i == 42, "Expected 42, got %d\n", i); ok(i == 42, "Expected 42, got %d\n", i);
hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); 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); if (hr == S_OK) IUnknown_Release(unk);
ITest_Release(test); ITest_Release(test);
} }