From 2653c32b45352a512311e38e4f50dd13c4c81d2a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 9 Dec 2021 09:43:18 +1100 Subject: [PATCH] Rebase against b495ff5cc8088af66d6d4f186f82231043e45a95. --- patches/patchinstall.sh | 2 +- ...te-a-candidate-window-s-position-wit.patch | 46 ++++++++++++------- ...v-Add-support-for-_NET_ACTIVE_WINDOW.patch | 35 ++++++-------- staging/upstream-commit | 2 +- 4 files changed, 44 insertions(+), 41 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2c7899ee..7ce8bac9 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "835dfaab023175028161974c5cd8585b77df101c" + echo "b495ff5cc8088af66d6d4f186f82231043e45a95" } # 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 3e4e0f24..bab395d6 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 29ecc8286ee52997384ebde43da5e6a1f43b3bdc Mon Sep 17 00:00:00 2001 +From 496ea7a4273c2f33bce0035063c21a28027b1523 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 @@ -19,12 +19,12 @@ received a lot of help from Sebastian Lackner. --- dlls/user32/caret.c | 4 +++ dlls/user32/driver.c | 7 ++++ - dlls/win32u/driver.c | 5 +++ + 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 | 2 ++ - 7 files changed, 91 insertions(+), 1 deletion(-) + include/wine/gdi_driver.h | 5 +++ + 7 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 2da7e02ca1a..1dd3ff29de4 100644 @@ -56,7 +56,7 @@ index 2da7e02ca1a..1dd3ff29de4 100644 } return ret; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index 10b0132734b..eef699d921a 100644 +index 73f4ee67257..ffcf8d264a1 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -364,6 +364,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW @@ -71,9 +71,9 @@ index 10b0132734b..eef699d921a 100644 static struct user_driver_funcs lazy_load_driver = { { NULL }, -@@ -414,6 +419,8 @@ static struct user_driver_funcs lazy_load_driver = - nulldrv_WindowPosChanged, - /* system parameters */ +@@ -416,6 +421,8 @@ static struct user_driver_funcs lazy_load_driver = + NULL, + /* vulkan support */ NULL, + /* candidate pos functions */ + loaderdrv_UpdateCandidatePos, @@ -81,36 +81,43 @@ index 10b0132734b..eef699d921a 100644 nulldrv_ThreadDetach }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index 5fa1a2ca236..b401f71776c 100644 +index 405dbf38e11..f52a2240e59 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c -@@ -936,6 +936,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi +@@ -930,11 +930,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi return FALSE; } ++ + static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT version ) + { + return NULL; + } + +static void CDECL nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect ) +{ ++ +} + static void CDECL nulldrv_ThreadDetach( void ) { } -@@ -1092,6 +1096,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver - SET_USER_FUNC(WindowPosChanging); +@@ -1098,6 +1104,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(WindowPosChanged); SET_USER_FUNC(SystemParametersInfo); + SET_USER_FUNC(wine_get_vulkan_driver); + SET_USER_FUNC(UpdateCandidatePos); SET_USER_FUNC(ThreadDetach); #undef SET_USER_FUNC diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index 1a86836b9c1..d9bdd2b6e3f 100644 +index 1f0549e4d39..7ed3ef7183c 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c -@@ -429,6 +429,7 @@ static const struct user_driver_funcs x11drv_funcs = - .pWindowPosChanging = X11DRV_WindowPosChanging, +@@ -422,6 +422,7 @@ static const struct user_driver_funcs x11drv_funcs = .pWindowPosChanged = X11DRV_WindowPosChanged, .pSystemParametersInfo = X11DRV_SystemParametersInfo, + .pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver, + .pUpdateCandidatePos = X11DRV_UpdateCandidatePos, .pThreadDetach = X11DRV_ThreadDetach, }; @@ -231,15 +238,20 @@ index 3994c2106cc..ec943dcd623 100644 return xic; } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index f76170f5a16..dd58e625801 100644 +index 567a6c21608..ff92d097f7d 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h -@@ -320,6 +320,8 @@ struct user_driver_funcs +@@ -319,8 +319,13 @@ struct user_driver_funcs const RECT *,struct window_surface*); /* system parameters */ BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT); ++ + /* vulkan support */ + const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT); ++ + /* IME functions */ + void (CDECL *pUpdateCandidatePos)(HWND, const RECT *); ++ /* thread management */ void (CDECL *pThreadDetach)(void); }; 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 0f8ccd94..e2855b71 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 69c2c3be2a4789a8065866f63dd65997e1d6c4cb Mon Sep 17 00:00:00 2001 +From 0ec817b88c5aadb3afe4dcaec32359a80296dbf5 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) @@ -15,14 +15,14 @@ For bug #2155. dlls/winex11.drv/window.c | 48 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 1 + - include/wine/gdi_driver.h | 3 ++- - 9 files changed, 72 insertions(+), 1 deletion(-) + include/wine/gdi_driver.h | 1 + + 9 files changed, 71 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index cb30ca942e5..28d77e99256 100644 +index ffcf8d264a1..86444d8a831 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c -@@ -153,6 +153,10 @@ static void CDECL nulldrv_ReleaseDC( HWND hwnd, HDC hdc ) +@@ -208,6 +208,10 @@ static void CDECL nulldrv_ReleaseDC( HWND hwnd, HDC hdc ) { } @@ -33,7 +33,7 @@ index cb30ca942e5..28d77e99256 100644 static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags ) { } -@@ -339,6 +343,7 @@ static struct user_driver_funcs lazy_load_driver = +@@ -403,6 +407,7 @@ static struct user_driver_funcs lazy_load_driver = nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, NULL, @@ -55,10 +55,10 @@ index 775a8f428c1..bd6d12cd355 100644 if (focus) { diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index e9b3781f461..10a3fce2585 100644 +index f52a2240e59..bac29683ca4 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c -@@ -896,6 +896,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) +@@ -858,6 +858,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) hdc, rect.left - dx, rect.top - dy, SRCCOPY, 0, 0 ); } @@ -69,7 +69,7 @@ index e9b3781f461..10a3fce2585 100644 static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags ) { } -@@ -1106,6 +1110,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver +@@ -1088,6 +1092,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); @@ -101,10 +101,10 @@ index 6a4f3b5db08..50cb77037c1 100644 Foreground window, because in most cases the messages sent above must have already changed the foreground window, in which diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index d9bdd2b6e3f..9b4ec242ec8 100644 +index 7ed3ef7183c..75884022107 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c -@@ -413,6 +413,7 @@ static const struct user_driver_funcs x11drv_funcs = +@@ -405,6 +405,7 @@ static const struct user_driver_funcs x11drv_funcs = .pMsgWaitForMultipleObjectsEx = X11DRV_MsgWaitForMultipleObjectsEx, .pReleaseDC = X11DRV_ReleaseDC, .pScrollDC = X11DRV_ScrollDC, @@ -212,19 +212,10 @@ index bdd458182af..f775c2aa89b 100644 "_NET_STARTUP_INFO", "_NET_SUPPORTED", diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index dd58e625801..97c3b0a4320 100644 +index ff92d097f7d..17ba60e0307 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h -@@ -167,7 +167,7 @@ struct gdi_dc_funcs - }; - - /* increment this when you change the DC function table */ --#define WINE_GDI_DRIVER_VERSION 73 -+#define WINE_GDI_DRIVER_VERSION 74 - - #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ - #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -@@ -302,6 +302,7 @@ struct user_driver_funcs +@@ -301,6 +301,7 @@ struct user_driver_funcs DWORD (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); void (CDECL *pReleaseDC)(HWND,HDC); BOOL (CDECL *pScrollDC)(HDC,INT,INT,HRGN); diff --git a/staging/upstream-commit b/staging/upstream-commit index 240f2061..61b10148 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -835dfaab023175028161974c5cd8585b77df101c +b495ff5cc8088af66d6d4f186f82231043e45a95