Rebase against a8b5fdda3214e4fd52682aefaa093cd45766580e.

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c2f464decb8c44fbbc08e7f694c89d6aa758a754"
+	echo "a8b5fdda3214e4fd52682aefaa093cd45766580e"
 }
 
 # Show version information

patches/winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch

@@ -1,4 +1,4 @@
-From 8eecf2d7d5632e0ce4907981f195309a883f6ff6 Mon Sep 17 00:00:00 2001
+From 021f484e633dc4cebb04e011fab3a6f2ee8e2336 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 21 Aug 2016 02:36:47 +0200
 Subject: winemp3.acm: Check input format in MPEG3_StreamOpen.
@@ -9,11 +9,11 @@ Subject: winemp3.acm: Check input format in MPEG3_StreamOpen.
  2 files changed, 85 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
-index 337e20c4b03..a4aa599fd6f 100644
+index 959ec7f0c06..ea98934c198 100644
 --- a/dlls/msacm32/tests/msacm.c
 +++ b/dlls/msacm32/tests/msacm.c
-@@ -1274,6 +1274,76 @@ static void test_acmFormatChoose(void)
-     afc.pwfx = pwfx;
+@@ -1276,6 +1276,76 @@ static void test_acmFormatChoose(void)
+     HeapFree(GetProcessHeap(), 0, pwfx);
  }
  
 +static void test_mp3(void)
@@ -89,7 +89,7 @@ index 337e20c4b03..a4aa599fd6f 100644
  static struct
  {
      struct
-@@ -1444,6 +1514,7 @@ START_TEST(msacm)
+@@ -1446,6 +1516,7 @@ START_TEST(msacm)
      test_acmFormatSuggest();
      test_acmFormatTagDetails();
      test_acmFormatChoose();

patches/winex11-DefaultDisplayFrequency/0001-winex11.drv-Allow-to-select-default-display-frequenc.patch

@@ -1,4 +1,4 @@
-From 535b46a3a7a24b603897fdb5d24e0fb704026ec1 Mon Sep 17 00:00:00 2001
+From 695882d5939c00095d4ff903316dc56cc94b44f2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 5 Nov 2015 14:33:48 +0100
 Subject: winex11.drv: Allow to select default display frequency in registry
@@ -17,7 +17,7 @@ HKCU\Software\Wine\X11 Driver\DefaultDisplayFrequency
  3 files changed, 40 insertions(+), 16 deletions(-)
 
 diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
-index afa26cf..33bcddc 100644
+index afa26cf5433..33bcddc35c6 100644
 --- a/dlls/winex11.drv/settings.c
 +++ b/dlls/winex11.drv/settings.c
 @@ -342,7 +342,7 @@ static const char * _DM_fields(DWORD fields)
@@ -99,22 +99,22 @@ index afa26cf..33bcddc 100644
 +    return DISP_CHANGE_SUCCESSFUL;
  }
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index d622468..2452986 100644
+index 721c082ed10..0e31c337212 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -383,6 +383,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
+@@ -393,6 +393,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
  extern int primary_monitor DECLSPEC_HIDDEN;
  extern int copy_default_colors DECLSPEC_HIDDEN;
  extern int alloc_system_colors DECLSPEC_HIDDEN;
 +extern int default_display_frequency DECLSPEC_HIDDEN;
  extern int xrender_error_base DECLSPEC_HIDDEN;
  extern HMODULE x11drv_module DECLSPEC_HIDDEN;
- extern Display *clipboard_display DECLSPEC_HIDDEN;
+ extern char *process_name DECLSPEC_HIDDEN;
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index 41097f4..c6421a3 100644
+index 65ef59b0c1b..8244abf1bef 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -81,6 +81,7 @@ BOOL client_side_with_render = TRUE;
+@@ -82,6 +82,7 @@ BOOL client_side_with_render = TRUE;
  BOOL shape_layered_windows = TRUE;
  int copy_default_colors = 128;
  int alloc_system_colors = 256;
@@ -122,7 +122,7 @@ index 41097f4..c6421a3 100644
  DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES;
  int xrender_error_base = 0;
  HMODULE x11drv_module = 0;
-@@ -413,6 +414,9 @@ static void setup_options(void)
+@@ -412,6 +413,9 @@ static void setup_options(void)
      if (!get_config_key( hkey, appkey, "AllocSystemColors", buffer, sizeof(buffer) ))
          alloc_system_colors = atoi(buffer);
  
@@ -133,5 +133,5 @@ index 41097f4..c6421a3 100644
  
      if (appkey) RegCloseKey( appkey );
 -- 
-2.9.0
+2.13.1