summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--0009-kernel32-dont-create-console-when-not-cui.patch20
-rw-r--r--PKGBUILD6
3 files changed, 0 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18b831e8edad..ac3bbc521c5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -115,7 +115,6 @@ pkgbase = wine-lol-staging
source = git+https://gitlab.winehq.org/wine/wine.git#tag=wine-8.21
source = 0004-LoL-broken-client-update-fix.patch
source = 0008-ntdll-nopguard-call_vectored_handlers.patch
- source = 0009-kernel32-dont-create-console-when-not-cui.patch
source = 0011-ntdll-signal_set_full_context-amd64.patch
source = 0012-ntdll-implement-ntcontinueex.patch
source = 0013-server-error-on-connect-to-zero.patch
@@ -123,7 +122,6 @@ pkgbase = wine-lol-staging
sha256sums = SKIP
sha256sums = 7607a84fd357a86bc8fb59d2cf002a3e471bd8ec78ecdb844b0b77b1ae6d11a0
sha256sums = 2075ddc417ddd11954f76be753c88e04db28f0b3937e60508f178630dd5763eb
- sha256sums = b19443ba1e01014ab478b03ac84797df2d481432798259371d94e4ba2e7b317c
sha256sums = 8dfef7fdbeb4bf503f72c2b3a15033849f67197d6d9571135369b4b0183ea213
sha256sums = 8bb15743e589f7505817309122e04af8cb99e12459a9b4ef05b14eeef10ccc83
sha256sums = 1c58cd6efaf0c74c83b8a887fc79d3d23f427e14edd08eeef3bfc568b281caaa
diff --git a/0009-kernel32-dont-create-console-when-not-cui.patch b/0009-kernel32-dont-create-console-when-not-cui.patch
deleted file mode 100644
index e034e84c5bd8..000000000000
--- a/0009-kernel32-dont-create-console-when-not-cui.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
-index fa143857bc2..aa37d92ef70 100644
---- a/dlls/kernelbase/console.c
-+++ b/dlls/kernelbase/console.c
-@@ -2342,6 +2342,13 @@ void init_console( void )
- if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI)
- alloc_console( no_window );
- }
-- else if (params->ConsoleHandle && params->ConsoleHandle != CONSOLE_HANDLE_SHELL_NO_WINDOW)
-- create_console_connection( params->ConsoleHandle );
-+ else if (params->ConsoleHandle)
-+ {
-+ HMODULE mod = GetModuleHandleW( NULL );
-+ if (params->ConsoleHandle != CONSOLE_HANDLE_SHELL_NO_WINDOW &&
-+ RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI)
-+ create_console_connection( params->ConsoleHandle );
-+ else
-+ params->ConsoleHandle = NULL;
-+ }
- }
diff --git a/PKGBUILD b/PKGBUILD
index 45438d422e3c..a19ac09e1ed9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,6 @@ source=("git+https://gitlab.winehq.org/wine/wine-staging.git#tag=v${_winever}"
"git+https://gitlab.winehq.org/wine/wine.git#tag=wine-${_winever}"
"0004-LoL-broken-client-update-fix.patch"
"0008-ntdll-nopguard-call_vectored_handlers.patch"
- "0009-kernel32-dont-create-console-when-not-cui.patch"
"0011-ntdll-signal_set_full_context-amd64.patch"
"0012-ntdll-implement-ntcontinueex.patch"
"0013-server-error-on-connect-to-zero.patch"
@@ -27,7 +26,6 @@ sha256sums=('SKIP'
'SKIP'
'7607a84fd357a86bc8fb59d2cf002a3e471bd8ec78ecdb844b0b77b1ae6d11a0'
'2075ddc417ddd11954f76be753c88e04db28f0b3937e60508f178630dd5763eb'
- 'b19443ba1e01014ab478b03ac84797df2d481432798259371d94e4ba2e7b317c'
'8dfef7fdbeb4bf503f72c2b3a15033849f67197d6d9571135369b4b0183ea213'
'8bb15743e589f7505817309122e04af8cb99e12459a9b4ef05b14eeef10ccc83'
'1c58cd6efaf0c74c83b8a887fc79d3d23f427e14edd08eeef3bfc568b281caaa'
@@ -125,10 +123,6 @@ prepare() {
echo 'Apply 0008-ntdll-nopguard-call_vectored_handlers.patch'
patch -Np1 < "${srcdir}/0008-ntdll-nopguard-call_vectored_handlers.patch"
- # Game Optional, only necessary when starting LoL.exe wine manually (e.g. when running .rofl files)
- echo 'Apply 0009-kernel32-dont-create-console-when-not-cui.patch'
- patch -Np1 < "${srcdir}/0009-kernel32-dont-create-console-when-not-cui.patch"
-
# Fix NtSetContextThread syscall
echo 'Apply 00011-ntdll-signal_set_full_context-amd64.patch'
patch -Np1 < "${srcdir}/0011-ntdll-signal_set_full_context-amd64.patch"