From e853aaffe30f3c1795cf9db1a369045d7f0c6a57 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 17 Mar 2022 09:36:39 +1100 Subject: [PATCH] Rebase against 62df608d3ed84aac7ce517fd07ea13e48b49b08c. --- ...se-minimum-SetTimer-interval-to-5-ms.patch | 38 +++++++++---------- patches/patchinstall.sh | 4 +- ...te-a-candidate-window-s-position-wit.patch | 20 +++++----- ...v-Add-support-for-_NET_ACTIVE_WINDOW.patch | 12 +++--- staging/upstream-commit | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch index f5fa7639..dd59a657 100644 --- a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch +++ b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch @@ -1,31 +1,18 @@ -From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001 +From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 2 May 2014 20:46:19 +0200 Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2) --- - dlls/user32/message.c | 2 +- dlls/user32/tests/msg.c | 2 ++ + dlls/win32u/message.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/dlls/user32/message.c b/dlls/user32/message.c -index 1336865112a..cbe9920384f 100644 ---- a/dlls/user32/message.c -+++ b/dlls/user32/message.c -@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER - - if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - -- timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); -+ timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM ); - - SERVER_START_REQ( set_win_timer ) - { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c -index c0ba5834cf9..a6bc158e8a7 100644 +index 4519da6962d..304a3b87f46 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c -@@ -10282,6 +10282,7 @@ static void test_timers(void) +@@ -10709,6 +10709,7 @@ static void test_timers(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); @@ -33,7 +20,7 @@ index c0ba5834cf9..a6bc158e8a7 100644 ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, -@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void) +@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); @@ -41,6 +28,19 @@ index c0ba5834cf9..a6bc158e8a7 100644 ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, +diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c +index d00178e6aa4..513150a3d61 100644 +--- a/dlls/win32u/message.c ++++ b/dlls/win32u/message.c +@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME + + if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE ); + +- timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); ++ timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM ); + + SERVER_START_REQ( set_win_timer ) + { -- -2.17.1 +2.35.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f5270033..889f4fea 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "670a1e81b465f67cb7e49fdb84c1fc96853fc9d7" + echo "62df608d3ed84aac7ce517fd07ea13e48b49b08c" } # Show version information @@ -1413,7 +1413,7 @@ fi # Patchset Pipelight # | # | Modified files: -# | * dlls/user32/message.c, dlls/user32/tests/msg.c, dlls/winex11.drv/init.c, dlls/winex11.drv/opengl.c, +# | * dlls/user32/tests/msg.c, dlls/win32u/message.c, dlls/winex11.drv/init.c, dlls/winex11.drv/opengl.c, # | dlls/winex11.drv/x11drv.h # | if test "$enable_Pipelight" -eq 1; then diff --git a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch index 4e70ffaf..c6238a9f 100644 --- a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch +++ b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch @@ -1,4 +1,4 @@ -From 6ffb90b2107dd35387683c72eb8fdf9900b0a564 Mon Sep 17 00:00:00 2001 +From 91dfacc1a9c0af50534563975d2ef9f2262559f4 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Tue, 23 Sep 2014 23:22:17 +0800 Subject: [PATCH] winex11.drv: Update a candidate window's position with @@ -27,7 +27,7 @@ received a lot of help from Sebastian Lackner. 7 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c -index a5e9b25aa29..0969ec6892d 100644 +index 8bf4962b708..33954123efe 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -27,6 +27,7 @@ @@ -43,7 +43,7 @@ index a5e9b25aa29..0969ec6892d 100644 r.top = y; CARET_DisplayCaret( hwnd, &r ); + USER_Driver->pUpdateCandidatePos( hwnd, &r ); - SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); + NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); } return ret; @@ -352,6 +354,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) @@ -51,14 +51,14 @@ index a5e9b25aa29..0969ec6892d 100644 { CARET_DisplayCaret( hwnd, &r ); + USER_Driver->pUpdateCandidatePos( hwnd, &r ); - SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); + NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); } return ret; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index 9f3ad85ac19..3f487ce72d8 100644 +index 72ea5ad17bd..af279b2ce17 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c -@@ -154,6 +154,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) +@@ -146,6 +146,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) return load_driver()->pCreateWindow( hwnd ); } @@ -70,7 +70,7 @@ index 9f3ad85ac19..3f487ce72d8 100644 static struct user_driver_funcs lazy_load_driver = { { NULL }, -@@ -208,6 +213,8 @@ static struct user_driver_funcs lazy_load_driver = +@@ -200,6 +205,8 @@ static struct user_driver_funcs lazy_load_driver = NULL, /* opengl support */ NULL, @@ -80,7 +80,7 @@ index 9f3ad85ac19..3f487ce72d8 100644 NULL, }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index 5499744482a..a7822fef746 100644 +index afe44e1c4a3..8eb412f7368 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -914,6 +914,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi @@ -103,7 +103,7 @@ index 5499744482a..a7822fef746 100644 static void CDECL nulldrv_ThreadDetach( void ) { } -@@ -1271,6 +1277,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver +@@ -1273,6 +1279,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(SystemParametersInfo); SET_USER_FUNC(wine_get_vulkan_driver); SET_USER_FUNC(wine_get_wgl_driver); @@ -239,7 +239,7 @@ index 3994c2106cc..ec943dcd623 100644 return xic; } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index e6f8239e27d..560c21b18c1 100644 +index b3c77a1d2c1..23bd1e9d8cf 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -318,10 +318,16 @@ struct user_driver_funcs diff --git a/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch b/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch index 9b260d88..153ff1b0 100644 --- a/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch +++ b/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch @@ -1,4 +1,4 @@ -From 54cf4c24f3c032fa3200fb6b5835cb7b4dd3cba4 Mon Sep 17 00:00:00 2001 +From 3bfac39d5222d7ae92940ac70b7369f79006a4ba Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 10 Feb 2016 15:09:29 +0800 Subject: [PATCH] winex11.drv: Add support for _NET_ACTIVE_WINDOW. (v2) @@ -18,7 +18,7 @@ For bug #2155. 8 files changed, 69 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index 0523da699d4..aa2fae2fd26 100644 +index af279b2ce17..c5a78393684 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -95,6 +95,10 @@ static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) @@ -29,10 +29,10 @@ index 0523da699d4..aa2fae2fd26 100644 +{ +} + - static void CDECL nulldrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) + static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) { } -@@ -192,6 +196,7 @@ static struct user_driver_funcs lazy_load_driver = +@@ -188,6 +192,7 @@ static struct user_driver_funcs lazy_load_driver = NULL, NULL, NULL, @@ -41,7 +41,7 @@ index 0523da699d4..aa2fae2fd26 100644 NULL, nulldrv_SetWindowIcon, diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index 52aee36c029..6b6cc1fe7dd 100644 +index 8eb412f7368..7d092027ee7 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -842,6 +842,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) @@ -55,7 +55,7 @@ index 52aee36c029..6b6cc1fe7dd 100644 static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags ) { } -@@ -1261,6 +1265,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver +@@ -1262,6 +1266,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(ReleaseDC); SET_USER_FUNC(ScrollDC); diff --git a/staging/upstream-commit b/staging/upstream-commit index 6561be22..8a1ec28e 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -670a1e81b465f67cb7e49fdb84c1fc96853fc9d7 +62df608d3ed84aac7ce517fd07ea13e48b49b08c