Remove patch for creating handles for new consoles.

README.md

@@ -37,7 +37,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [22]:**
+**Bugfixes and features included in the next upcoming release [21]:**
 
 * Add stub for D3DXComputeNormalMap
 * Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
@@ -50,7 +50,6 @@ Included bug fixes and improvements
 * Fix handling of subdirectory in FtpFindFirstFile ([Wine Bug #16526](https://bugs.winehq.org/show_bug.cgi?id=16526))
 * Fix parameters for ConvertToIndexedBlendedMesh stub ([Wine Bug #36449](https://bugs.winehq.org/show_bug.cgi?id=36449))
 * GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
-* Hearthstone fails to start ([Wine Bug #36216](https://bugs.winehq.org/show_bug.cgi?id=36216))
 * IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
 * Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
 * Implement IDXGIOutput::GetDesc

debian/changelog

@@ -5,7 +5,6 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
   * Fix issue in DOS Attributes patch which broke ./configure on systems with alternative shells.
   * Fix issue in user32-WndProc patch which caused crashes for some 16-bit apps.
   * Fix issue in ws2_32-WriteWatches patch which can cause exceptions on the signal stack.
-  * Added patch to creating handles for new consoles when a new process is created.
   * Added patch for CreateProcess to prioritize the working directory over the system search path.
   * Added patch with stubs for WinSqm[Start|End]Session.
   * Added patch to fix handling of subdirectory in FtpFindFirstFile.

patches/Makefile

@@ -51,7 +51,6 @@ PATCHLIST := \
 	imm32-Cross_Thread_Access.ok \
 	include-Winetest.ok \
 	iphlpapi-TCP_Table.ok \
-	kernel32-Create_Handles_for_New_Consoles.ok \
 	kernel32-GetFinalPathNameByHandle.ok \
 	kernel32-GetNumaProcessorNode.ok \
 	kernel32-GetStringTypeW.ok \
@@ -718,21 +717,6 @@ iphlpapi-TCP_Table.ok:
 		echo '+    { "Erich E. Hoover", "iphlpapi: Implement AllocateAndGetTcpExTableFromStack.", 1 },'; \
 	) > iphlpapi-TCP_Table.ok
 
-# Patchset kernel32-Create_Handles_for_New_Consoles
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#36216] Hearthstone fails to start
-# |
-# | Modified files:
-# |   *	dlls/kernel32/console.c, dlls/kernel32/process.c
-# |
-.INTERMEDIATE: kernel32-Create_Handles_for_New_Consoles.ok
-kernel32-Create_Handles_for_New_Consoles.ok:
-	$(call APPLY_FILE,kernel32-Create_Handles_for_New_Consoles/0001-kernel32-Allocate-console-handles-when-creating-a-pr.patch)
-	@( \
-		echo '+    { "Erich E. Hoover", "kernel32: Allocate console handles when creating a process with a new console.", 1 },'; \
-	) > kernel32-Create_Handles_for_New_Consoles.ok
-
 # Patchset kernel32-GetFinalPathNameByHandle
 # |
 # | This patchset fixes the following Wine bugs:

patches/kernel32-Create_Handles_for_New_Consoles/0001-kernel32-Allocate-console-handles-when-creating-a-pr.patch

@@ -1,54 +0,0 @@
-From 5b221387c0df72462ba6603875cf6e2bf9a15fd9 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Sat, 3 Jan 2015 23:37:42 -0700
-Subject: kernel32: Allocate console handles when creating a process with a new
- console.
-
----
- dlls/kernel32/console.c | 4 +++-
- dlls/kernel32/process.c | 8 +++++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
-index 303b638..d08818a 100644
---- a/dlls/kernel32/console.c
-+++ b/dlls/kernel32/console.c
-@@ -3061,7 +3061,9 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
- BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params)
- {
-     memset(&S_termios, 0, sizeof(S_termios));
--    if (params->ConsoleHandle == KERNEL32_CONSOLE_SHELL)
-+    if (params->ConsoleHandle == KERNEL32_CONSOLE_SHELL ||
-+        /* FIXME: probably not correct, needs more tests */
-+        params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC)
-     {
-         HANDLE  conin;
- 
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 0a087ab..0979978 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -1679,13 +1679,19 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
-     info->hstdin  = wine_server_obj_handle( hstdin );
-     info->hstdout = wine_server_obj_handle( hstdout );
-     info->hstderr = wine_server_obj_handle( hstderr );
--    if ((flags & (CREATE_NEW_CONSOLE | DETACHED_PROCESS)) != 0)
-+    if (flags & DETACHED_PROCESS)
-     {
-         /* this is temporary (for console handles). We have no way to control that the handle is invalid in child process otherwise */
-         if (is_console_handle(hstdin))  info->hstdin  = wine_server_obj_handle( INVALID_HANDLE_VALUE );
-         if (is_console_handle(hstdout)) info->hstdout = wine_server_obj_handle( INVALID_HANDLE_VALUE );
-         if (is_console_handle(hstderr)) info->hstderr = wine_server_obj_handle( INVALID_HANDLE_VALUE );
-     }
-+    else if (flags & CREATE_NEW_CONSOLE)
-+    {
-+        info->hstdin = 0;
-+        info->hstdout = 0;
-+        info->hstderr = 0;
-+    }
-     else
-     {
-         if (is_console_handle(hstdin))  info->hstdin  = console_handle_unmap(hstdin);
--- 
-1.9.1
-

patches/kernel32-Create_Handles_for_New_Consoles/definition

@@ -1 +0,0 @@
-Fixes: [36216] Hearthstone fails to start