Add patch to better group running wine programs in WMs.

README.md

@@ -13,12 +13,13 @@ which are not present in regular wine, and always report such issues to us
 Included bugfixes and improvements
 ----------------------------------
 
-**Bugfixes and features included in the next upcoming release [8]:**
+**Bugfixes and features included in the next upcoming release [9]:**
 
 * Fix ITERATE_MoveFiles when no source- and destname is specified ([Wine Bug #10085](http://bugs.winehq.org/show_bug.cgi?id=10085 "Adobe Bridge CS2 complains that it can't start due to licensing restrictions (affects photoshop)"))
 * Gothic 2 demo expects an error when opening a terminating process ([Wine Bug #37087](http://bugs.winehq.org/show_bug.cgi?id=37087 "Gothic 2 english demo fails with 'Conflict: a hook process was found. Please deactivate all Antivirus and Anti-Trojan programs and debuggers.'"))
 * Multiple applications need BCryptGetFipsAlgorithmMode ([Wine Bug #32194](http://bugs.winehq.org/show_bug.cgi?id=32194 "Multiple games and applications need bcrypt.dll.BCryptGetFipsAlgorithmMode (Chess Position Trainer, Terraria, .NET System.Security.Cryptography)"))
 * Other Pipelight-specific enhancements
+* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](http://bugs.winehq.org/show_bug.cgi?id=32699 "Add StartupWMClass to .desktop files."))
 * Support for DwmInvalidateIconicBitmaps ([Wine Bug #32977](http://bugs.winehq.org/show_bug.cgi?id=32977 "Solidworks 2012 needs unimplemented function dwmapi.dll.DwmInvalidateIconicBitmaps (Win7 mode)"))
 * Support for Dynamic DST (daylight saving time) information in registry
 * Support for GetFinalPathNameByHandle ([Wine Bug #36073](http://bugs.winehq.org/show_bug.cgi?id=36073 "OneDrive crashes on unimplemented function KERNEL32.dll.GetFinalPathNameByHandleW"))

patches/Makefile

@@ -51,6 +51,7 @@ PATCHLIST := \
 	wineboot-HKEY_DYN_DATA.ok \
 	winepulse-PulseAudio_Support.ok \
 	winex11-Limited_Resolutions.ok \
+	winex11-Window_Groups.ok \
 	winex11-XEMBED.ok \
 	ws2_32-Connect_Time.ok \
 	ws2_32-TransmitFile.ok \
@@ -925,6 +926,24 @@ winex11-Limited_Resolutions.ok:
 		echo '+    { "winex11-Limited_Resolutions", "Erich E. Hoover", "Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes." },'; \
 	) > winex11-Limited_Resolutions.ok
 
+# Patchset winex11-Window_Groups
+# |
+# | Included patches:
+# |   *	Prevent window managers from grouping all wine programs together. [by Michael Müller]
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#32699] Prevent window managers from grouping all wine programs together
+# |
+# | Modified files: 
+# |   *	dlls/winex11.drv/window.c
+# |
+.INTERMEDIATE: winex11-Window_Groups.ok
+winex11-Window_Groups.ok:
+	$(call APPLY_FILE,winex11-Window_Groups/0001-winex11-Prevent-window-managers-from-grouping-all-wi.patch)
+	@( \
+		echo '+    { "winex11-Window_Groups", "Michael Müller", "Prevent window managers from grouping all wine programs together." },'; \
+	) > winex11-Window_Groups.ok
+
 # Patchset winex11-XEMBED
 # |
 # | Included patches:

patches/winex11-Window_Groups/0001-winex11-Prevent-window-managers-from-grouping-all-wi.patch

@@ -0,0 +1,29 @@
+From 55d50964170f5fd8cf75b5e4e7ca109a60875980 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sat, 16 Aug 2014 01:17:27 +0200
+Subject: winex11: Prevent window managers from grouping all wine programs
+ together.
+
+---
+ dlls/winex11.drv/window.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
+index 06e2294..e715642 100644
+--- a/dlls/winex11.drv/window.c
++++ b/dlls/winex11.drv/window.c
+@@ -842,10 +842,8 @@ static void set_initial_wm_hints( Display *display, Window window )
+     /* class hints */
+     if ((class_hints = XAllocClassHint()))
+     {
+-        static char wine[] = "Wine";
+-
+         class_hints->res_name = process_name;
+-        class_hints->res_class = wine;
++        class_hints->res_class = process_name;
+         XSetClassHint( display, window, class_hints );
+         XFree( class_hints );
+     }
+-- 
+1.9.1
+

patches/winex11-Window_Groups/definition

@@ -0,0 +1,4 @@
+Author: Michael Müller
+Subject: Prevent window managers from grouping all wine programs together.
+Revision: 1
+Fixes: [32699] Prevent window managers from grouping all wine programs together