From 7b49214435cf061eed8206ebe048ac5df9564cfe Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 15 Mar 2022 10:03:22 +1100 Subject: [PATCH] Rebase against 8a52d3e93f5690fd0833c228d54a996a784afad7. --- patches/patchinstall.sh | 2 +- ...te-a-candidate-window-s-position-wit.patch | 29 +++++++++---------- ...v-Add-support-for-_NET_ACTIVE_WINDOW.patch | 14 ++++----- staging/upstream-commit | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index eb307981..2cbbe390 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "330dc601978922aa1d5864d29d94882d6b1990d1" + echo "8a52d3e93f5690fd0833c228d54a996a784afad7" } # Show version information 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 ac4853fc..4e70ffaf 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 7cacbda4b7462a3a016437bb885a33d2d5589cd7 Mon Sep 17 00:00:00 2001 +From 6ffb90b2107dd35387683c72eb8fdf9900b0a564 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 @@ -17,29 +17,28 @@ is set to "over the spot" in the registry key: This patch was based on the original work by Muneyuki Noguchi, and received a lot of help from Sebastian Lackner. --- - dlls/user32/caret.c | 4 +++ + dlls/user32/caret.c | 3 ++ dlls/user32/driver.c | 7 ++++ dlls/win32u/driver.c | 7 ++++ dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 72 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 6 ++++ - 7 files changed, 97 insertions(+), 1 deletion(-) + 7 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c -index 2da7e02ca1a..1dd3ff29de4 100644 +index a5e9b25aa29..0969ec6892d 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c -@@ -27,6 +27,8 @@ +@@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" - #include "winuser.h" + #include "ntuser.h" +#include "user_private.h" -+ #include "wine/server.h" #include "wine/debug.h" -@@ -274,6 +276,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) +@@ -274,6 +275,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) r.left = x; r.top = y; CARET_DisplayCaret( hwnd, &r ); @@ -47,7 +46,7 @@ index 2da7e02ca1a..1dd3ff29de4 100644 SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); } return ret; -@@ -352,6 +355,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) +@@ -352,6 +354,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) if (ret && (hidden == 1)) /* hidden was 1 so it's now 0 */ { CARET_DisplayCaret( hwnd, &r ); @@ -56,11 +55,11 @@ index 2da7e02ca1a..1dd3ff29de4 100644 } return ret; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index 56148448560..f86e3ff1f7f 100644 +index 9f3ad85ac19..3f487ce72d8 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c -@@ -169,6 +169,11 @@ static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT - load_driver()->pGetDC( hdc, hwnd, top_win, win_rect, top_rect, flags ); +@@ -154,6 +154,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) + return load_driver()->pCreateWindow( hwnd ); } +static void CDECL loaderdrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect ) @@ -71,7 +70,7 @@ index 56148448560..f86e3ff1f7f 100644 static struct user_driver_funcs lazy_load_driver = { { NULL }, -@@ -223,6 +228,8 @@ static struct user_driver_funcs lazy_load_driver = +@@ -208,6 +213,8 @@ static struct user_driver_funcs lazy_load_driver = NULL, /* opengl support */ NULL, @@ -81,7 +80,7 @@ index 56148448560..f86e3ff1f7f 100644 NULL, }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index ed686405e73..0cc6e36f47d 100644 +index 5499744482a..a7822fef746 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 @@ -104,7 +103,7 @@ index ed686405e73..0cc6e36f47d 100644 static void CDECL nulldrv_ThreadDetach( void ) { } -@@ -1263,6 +1269,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver +@@ -1271,6 +1277,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); 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 412a1a56..422b615d 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 7eadbc5af779e201bf2896c9938479e448cce7ab Mon Sep 17 00:00:00 2001 +From 35cc5818d0a0fcd086e0a67de86f0494cc7bb0de 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,11 +18,11 @@ For bug #2155. 8 files changed, 69 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index f86e3ff1f7f..a3a084e2953 100644 +index 3f487ce72d8..b4ae4783a91 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c -@@ -100,6 +100,10 @@ static void CDECL nulldrv_ReleaseDC( HWND hwnd, HDC hdc ) - { +@@ -91,6 +91,10 @@ static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDL + timeout, flags & MWMO_ALERTABLE ); } +static void CDECL nulldrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) @@ -32,7 +32,7 @@ index f86e3ff1f7f..a3a084e2953 100644 static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } -@@ -211,6 +215,7 @@ static struct user_driver_funcs lazy_load_driver = +@@ -196,6 +200,7 @@ static struct user_driver_funcs lazy_load_driver = NULL, NULL, NULL, @@ -41,7 +41,7 @@ index f86e3ff1f7f..a3a084e2953 100644 NULL, nulldrv_SetWindowIcon, diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index 0cc6e36f47d..41ff4a80f07 100644 +index a7822fef746..452e733755c 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 0cc6e36f47d..41ff4a80f07 100644 static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags ) { } -@@ -1252,6 +1256,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver +@@ -1260,6 +1264,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 7dc0fc5c..6a8d0465 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -330dc601978922aa1d5864d29d94882d6b1990d1 +8a52d3e93f5690fd0833c228d54a996a784afad7