wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove patch for creating handles for new consoles.

Browse Source
This commit is contained in:
Erich E. Hoover
2015-01-04 11:22:35 -07:00
parent 205001dab8
commit abdef6b13c
5 changed files with 1 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/Makefile
View File

@@ -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:

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

@@ -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

1
patches/kernel32-Create_Handles_for_New_Consoles/definition
View File

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