[PATCH] mscoree: Update Wine Mono to 6.0.0.

Esme Povirk esme at codeweavers.com
Mon Feb 8 15:13:32 CST 2021


Signed-off-by: Esme Povirk <esme at codeweavers.com>
---
 dlls/appwiz.cpl/addons.c       | 4 ++--
 dlls/mscoree/mscoree_private.h | 2 +-
 dlls/mscoree/tests/comtest.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index cfc51155f57..b2e726422da 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -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 "???"
diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h
index c9edc2d68d0..da587285cfe 100644
--- a/dlls/mscoree/mscoree_private.h
+++ b/dlls/mscoree/mscoree_private.h
@@ -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;
diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c
index 4b2183bac3a..6c0d081cbd3 100644
--- a/dlls/mscoree/tests/comtest.c
+++ b/dlls/mscoree/tests/comtest.c
@@ -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);
     }
-- 
2.25.1




More information about the wine-devel mailing list