Module: wine Branch: master Commit: 62e253796e592d989e2b8f27630052f7fa64180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e253796e592d989e2b8f2763...
Author: Vincent Povirk vincent@codeweavers.com Date: Tue Jun 7 14:23:12 2016 -0500
mscoree: Update Wine Mono to 4.6.3.
This brings in some build fixes, bugfixes from upstream, and a patch from Paul Gofman for compatibility with 64-bit Managed C++ code.
Signed-off-by: Vincent Povirk vincent@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8cbc221..c29f070 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif
-#define MONO_VERSION "4.6.2" -#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d" +#define MONO_VERSION "4.6.3" +#define MONO_SHA "c1d6d223c99c41a9d4e674e967042f10bfe02b8b"
typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 033a121..8e158e2 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret;
- static const char* mono_version = "4.6.2"; + static const char* mono_version = "4.6.3"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}";
static const WCHAR controlW[] = {'\','c','o','n','t','r','o','l','.','e','x','e',0};