Added patch to fix bug in wineserver debug_children inheritance (fixes Wine Staging Bug #525).

README.md

@@ -39,6 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
+**Bug fixes and features included in the next upcoming release [1]:**
+
+* Properly inherit debug_children flag in wineserver
+
+
 **Bug fixes and features in Wine Staging 1.7.50 [242]:**
 
 *Note: The following list only contains features and bug fixes which are not

debian/changelog

@@ -1,3 +1,8 @@
+wine-staging (1.7.51) UNRELEASED; urgency=low
+  * Added patch to fix bug in wineserver debug_children inheritance (fixes Wine
+    Staging Bug #525).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 24 Aug 2015 07:55:18 +0200
+
 wine-staging (1.7.50) unstable; urgency=low
   * Updated GTK3 patchset to fix "division by zero" exception errors (fixes Wine
     Staging Bug #523).

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Show version information
 version()
 {
-	echo "Wine Staging 1.7.50"
+	echo "Wine Staging 1.7.51 (unreleased)"
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
@@ -212,6 +212,7 @@ patch_enable_all ()
 	enable_server_Address_List_Change="$1"
 	enable_server_ClipCursor="$1"
 	enable_server_CreateProcess_ACLs="$1"
+	enable_server_Debug_Inheritance="$1"
 	enable_server_Delete_On_Close="$1"
 	enable_server_FileEndOfFileInformation="$1"
 	enable_server_File_Permissions="$1"
@@ -728,6 +729,9 @@ patch_enable ()
 		server-CreateProcess_ACLs)
 			enable_server_CreateProcess_ACLs="$2"
 			;;
+		server-Debug_Inheritance)
+			enable_server_Debug_Inheritance="$2"
+			;;
 		server-Delete_On_Close)
 			enable_server_Delete_On_Close="$2"
 			;;
@@ -4458,6 +4462,18 @@ if test "$enable_server_ClipCursor" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset server-Debug_Inheritance
+# |
+# | Modified files:
+# |   *	server/process.c
+# |
+if test "$enable_server_Debug_Inheritance" -eq 1; then
+	patch_apply server-Debug_Inheritance/0001-server-Properly-inherit-debug_children-flag.patch
+	(
+		echo '+    { "Sebastian Lackner", "server: Properly inherit debug_children flag.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset server-Delete_On_Close
 # |
 # | This patchset fixes the following Wine bugs:

patches/server-Debug_Inheritance/0001-server-Properly-inherit-debug_children-flag.patch

@@ -0,0 +1,43 @@
+From 876a479a3c7697b863cedaabc610d3e2966b941e Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Mon, 24 Aug 2015 07:53:34 +0200
+Subject: server: Properly inherit debug_children flag.
+
+---
+ server/process.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/server/process.c b/server/process.c
+index a92821a..adbc10b 100644
+--- a/server/process.c
++++ b/server/process.c
+@@ -1260,8 +1260,6 @@ DECL_HANDLER(new_process)
+ 
+     if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done;
+     process = thread->process;
+-    process->debug_children = (req->create_flags & DEBUG_PROCESS)
+-        && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS);
+     process->startup_info = (struct startup_info *)grab_object( info );
+ 
+     if (parent->job
+@@ -1302,9 +1300,17 @@ DECL_HANDLER(new_process)
+ 
+     /* attach to the debugger if requested */
+     if (req->create_flags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS))
++    {
+         set_process_debugger( process, current );
++        process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS);
++    }
+     else if (parent->debugger && parent->debug_children)
++    {
+         set_process_debugger( process, parent->debugger );
++        process->debug_children = 1;
++    }
++    else
++        process->debug_children = 0;
+ 
+     if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP))
+         process->group_id = parent->group_id;
+-- 
+2.5.0
+

patches/server-Debug_Inheritance/definition

@@ -0,0 +1 @@
+Fixes: Properly inherit debug_children flag in wineserver