wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Correct Author of AttachConsole patch

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-07-30 11:57:32 +10:00
parent ba9e6db9f3
commit a5044d57dd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches/kernel32-AttachConsole/0001-kernel32-Add-AttachConsole-implementation.patch
View File

@ -1,17 +1,17 @@
From 6a63336af94902ddc0d71d23d8e1e84260a71716 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
From fb031b7cf30e5258aa855019961bbdeafb3cfa78 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sat, 28 Jul 2018 10:49:59 +1000
Subject: [PATCH] kernel32: Add AttachConsole implementation
---
dlls/kernel32/console.c | 19 ++++-
dlls/kernel32/tests/console.c | 131 +++++++++++++++++++++++++++++++---
server/console.c | 43 +++++++++++
server/protocol.def | 10 +++
dlls/kernel32/console.c | 19 +++++-
dlls/kernel32/tests/console.c | 131 +++++++++++++++++++++++++++++++++++++++---
server/console.c | 43 ++++++++++++++
server/protocol.def | 10 ++++
4 files changed, 193 insertions(+), 10 deletions(-)
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 51061de922..1637a879dc 100644
index 51061de..1637a87 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -2909,8 +2909,23 @@ BOOL WINAPI ScrollConsoleScreenBufferW(HANDLE hConsoleOutput, LPSMALL_RECT lpScr
@ -41,7 +41,7 @@ index 51061de922..1637a879dc 100644
/******************************************************************
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index ac77ab76b0..acd61d078b 100644
index ac77ab7..acd61d0 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -208,19 +208,29 @@ static void testEmptyWrite(HANDLE hCon)
@ -210,10 +210,10 @@ index ac77ab76b0..acd61d078b 100644
+ test_AttachConsole(hConOut);
}
diff --git a/server/console.c b/server/console.c
index 51252e973c..a46310bb28 100644
index 058c8ce..8460a7f 100644
--- a/server/console.c
+++ b/server/console.c
@@ -1549,6 +1549,49 @@ DECL_HANDLER(open_console)
@@ -1546,6 +1546,49 @@ DECL_HANDLER(open_console)
else if (!get_error()) set_error( STATUS_ACCESS_DENIED );
}
@ -264,10 +264,10 @@ index 51252e973c..a46310bb28 100644
DECL_HANDLER(set_console_input_info)
{
diff --git a/server/protocol.def b/server/protocol.def
index f31557a57c..4cedeb66b4 100644
index 5d89c2b..c8bb3b1 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1501,6 +1501,16 @@ struct console_renderer_event
@@ -1463,6 +1463,16 @@ struct console_renderer_event
@END
@ -285,5 +285,5 @@ index f31557a57c..4cedeb66b4 100644
@REQ(get_console_wait_event)
@REPLY
--
2.18.0
1.9.1

2
patches/patchinstall.sh
View File

@ -3986,7 +3986,7 @@ fi
if test "$enable_kernel32_AttachConsole" -eq 1; then
patch_apply kernel32-AttachConsole/0001-kernel32-Add-AttachConsole-implementation.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "kernel32: Add AttachConsole implementation.", 1 },';
printf '%s\n' '+ { "Jacek Caban", "kernel32: Add AttachConsole implementation.", 1 },';
) >> "$patchlist"
fi