[PATCH] mscoree: Update Wine Mono to 4.7.4.

[Vincent Povirk]

Wine-Bug: 46369

This contains a bugfix from Akihiro Sagawa.

Signed-off-by: Vincent Povirk 
---
 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 79f667bbebb..6ed09a9257c 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
 #define GECKO_SHA "???"
 #endif

-#define MONO_VERSION "4.7.3"
-#define MONO_SHA "d24a8017371c7e8224a1778bb43a113ed7ed9720efd9d0cda175d42db6106d3a"
+#define MONO_VERSION "4.7.4"
+#define MONO_SHA "be99edb6dc6691ca17a2c2d90229547cd555e4e30cdb497ffe2e6e472356100f"

typedef struct {
     const char *version;
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 234afe45efb..984da242991 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -682,7 +682,7 @@ static BOOL install_wine_mono(void)
     LONG len;
     BOOL ret;

-    static const char* mono_version = "4.7.3";
+    static const char* mono_version = "4.7.4";
     static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}";

static const WCHAR controlW[] = {'\','c','o','n','t','r','o','l','.','e','x','e',0};

[Vincent Povirk]

Sorry, don't commit this yet please. I noticed an issue where
installing this over 4.7.3 doesn't remove 4.7.3. I think it's a
packaging mistake on my part, but I won't be able to test that theory
and hopefully correct things until next week.

On Thu, Jan 3, 2019 at 1:02 PM Vincent Povirk  wrote:
> Wine-Bug: 46369
>
> This contains a bugfix from Akihiro Sagawa.
> Signed-off-by: Vincent Povirk
>
> 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 79f667bbebb..6ed09a9257c 100644
> --- a/dlls/appwiz.cpl/addons.c
> +++ b/dlls/appwiz.cpl/addons.c
> @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
>  #define GECKO_SHA "???"
>  #endif
>
> -#define MONO_VERSION "4.7.3"
> -#define MONO_SHA "d24a8017371c7e8224a1778bb43a113ed7ed9720efd9d0cda175d42db6106d3a"
> +#define MONO_VERSION "4.7.4"
> +#define MONO_SHA "be99edb6dc6691ca17a2c2d90229547cd555e4e30cdb497ffe2e6e472356100f"
>
> typedef struct {
>      const char *version;
> diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
> index 234afe45efb..984da242991 100644
> --- a/dlls/mscoree/mscoree_main.c
> +++ b/dlls/mscoree/mscoree_main.c
> @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void)
>      LONG len;
>      BOOL ret;
> - static const char* mono_version = "4.7.3";
> -
>
> static const char* mono_version = "4.7.4";
> static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}";
>
> static const WCHAR controlW[] = {'\','c','o','n','t','r','o','l','.','e','x','e',0};
>
> --
> 2.17.1