From ff1bc557574777a2d219dd0f7077b100b2afc9d3 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 5 Oct 2024 11:27:49 +1000 Subject: [PATCH] Rebase against 7ee99608f469723bafadb28ef0ebd20631f86e9d. --- patches/gdi32-rotation/definition | 1 + ...1-kernel32-Always-start-debugger-on-WinSta0.patch | 12 ++++++------ staging/upstream-commit | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/patches/gdi32-rotation/definition b/patches/gdi32-rotation/definition index cad5066b..0fb42627 100644 --- a/patches/gdi32-rotation/definition +++ b/patches/gdi32-rotation/definition @@ -1,2 +1,3 @@ Fixes: [34579] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing problem Fixes: [35331] gdi32: fix for rotated ellipse +Disabled: True diff --git a/patches/kernel32-Debugger/0001-kernel32-Always-start-debugger-on-WinSta0.patch b/patches/kernel32-Debugger/0001-kernel32-Always-start-debugger-on-WinSta0.patch index 825140de..4dfcd3e5 100644 --- a/patches/kernel32-Debugger/0001-kernel32-Always-start-debugger-on-WinSta0.patch +++ b/patches/kernel32-Debugger/0001-kernel32-Always-start-debugger-on-WinSta0.patch @@ -1,24 +1,24 @@ -From b617701d440a9b5210762503cf441e9fcb3132e1 Mon Sep 17 00:00:00 2001 +From 4dfa7d8a06e20d9888398298e03c20fac89a9fdf Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 13 Jan 2017 01:59:13 +0100 -Subject: kernel32: Always start debugger on WinSta0. +Subject: [PATCH] kernel32: Always start debugger on WinSta0. --- dlls/kernelbase/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c -index 016c21109..0681f726b 100644 +index cbefc0c8733..b37faaa0003 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c -@@ -640,6 +640,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) +@@ -625,6 +625,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) TRACE( "Starting debugger %s\n", debugstr_w(cmdline) ); memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); + startup.lpDesktop = (WCHAR*)L"WinSta0"; startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - ret = CreateProcessW( NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info ); + ret = CreateProcessW( NULL, cmdline, NULL, NULL, TRUE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &startup, &info ); -- -2.23.0 +2.45.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index d4969ffa..1e4a4572 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -7c1fbc40b7ed0b9b1f2c96b99a592530eadae14f +7ee99608f469723bafadb28ef0ebd20631f86e9d