Added patch to avoid double captions observed under some WMs.

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "ac59a68162321610841ed072981adddb8bc78c56"
+	echo "05f9b023d2996984dda3b8143e80a2b5037968b3"
 }
 
 # Show version information
@@ -396,6 +396,7 @@ patch_enable_all ()
 	enable_winex11_CandidateWindowPos="$1"
 	enable_winex11_Clipboard_HTML="$1"
 	enable_winex11_DefaultDisplayFrequency="$1"
+	enable_winex11_MWM_Decorations="$1"
 	enable_winex11_SC_KEYMENU="$1"
 	enable_winex11_WM_WINDOWPOSCHANGING="$1"
 	enable_winex11_Window_Groups="$1"
@@ -1382,6 +1383,9 @@ patch_enable ()
 		winex11-DefaultDisplayFrequency)
 			enable_winex11_DefaultDisplayFrequency="$2"
 			;;
+		winex11-MWM_Decorations)
+			enable_winex11_MWM_Decorations="$2"
+			;;
 		winex11-SC_KEYMENU)
 			enable_winex11_SC_KEYMENU="$2"
 			;;
@@ -8310,6 +8314,21 @@ if test "$enable_winex11_DefaultDisplayFrequency" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset winex11-MWM_Decorations
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#42117] Avoid double captions observed under some WMs
+# |
+# | Modified files:
+# |   *	dlls/winex11.drv/window.c
+# |
+if test "$enable_winex11_MWM_Decorations" -eq 1; then
+	patch_apply winex11-MWM_Decorations/0001-winex11.drv-Don-t-use-MWM_DECOR_RESIZEH-window-resiz.patch
+	(
+		echo '+    { "Dmitry Timoshkov", "winex11.drv: Don'\''t use MWM_DECOR_RESIZEH, window resizing is controlled by MWM_FUNC_RESIZE.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset winex11-SC_KEYMENU
 # |
 # | This patchset fixes the following Wine bugs:

patches/winex11-MWM_Decorations/0001-winex11.drv-Don-t-use-MWM_DECOR_RESIZEH-window-resiz.patch

@@ -0,0 +1,28 @@
+From 0c3d48134adbb00dcbb561ae920fcf9f4c58fc0f Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 30 Dec 2016 12:40:21 +0800
+Subject: winex11.drv: Don't use MWM_DECOR_RESIZEH, window resizing is
+ controlled by MWM_FUNC_RESIZE.
+
+This patch fixes double caption observed under some WMs (Metacity,
+its successor Mate, and XFCE).
+---
+ dlls/winex11.drv/window.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
+index 7408a0eb480..08856422bb7 100644
+--- a/dlls/winex11.drv/window.c
++++ b/dlls/winex11.drv/window.c
+@@ -279,7 +279,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
+         if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE;
+     }
+     if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER;
+-    else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH;
++    else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER;
+     else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER;
+     return ret;
+ }
+-- 
+2.11.0
+

patches/winex11-MWM_Decorations/definition

@@ -0,0 +1 @@
+Fixes: [42117] Avoid double captions observed under some WMs