wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 835dfaab023175028161974c5cd8585b77df101c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-12-07 14:08:29 +11:00
parent 82e4617d86
commit a2fcffc18e
5 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
View File

@@ -1,4 +1,4 @@
From c4ea95ba65062d383c7635ce79bea2e21ca1ef8a Mon Sep 17 00:00:00 2001
From 29ecc8286ee52997384ebde43da5e6a1f43b3bdc Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@gmail.com>
Date: Tue, 23 Sep 2014 23:22:17 +0800
Subject: [PATCH] winex11.drv: Update a candidate window's position with
@@ -56,10 +56,10 @@ index 2da7e02ca1a..1dd3ff29de4 100644
}
return ret;
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 9ff676aca22..747e1d55533 100644
index 10b0132734b..eef699d921a 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -321,6 +321,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
@@ -364,6 +364,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
}
@@ -71,20 +71,20 @@ index 9ff676aca22..747e1d55533 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -373,6 +378,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -414,6 +419,8 @@ static struct user_driver_funcs lazy_load_driver =
nulldrv_WindowPosChanged,
/* system parameters */
nulldrv_SystemParametersInfo,
NULL,
+ /* candidate pos functions */
+ loaderdrv_UpdateCandidatePos,
/* thread management */
nulldrv_ThreadDetach
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 93c2ff1da4c..f63da32561a 100644
index 5fa1a2ca236..b401f71776c 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -991,6 +991,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
@@ -936,6 +936,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
return FALSE;
}
@@ -95,7 +95,7 @@ index 93c2ff1da4c..f63da32561a 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1129,6 +1133,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1092,6 +1096,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
SET_USER_FUNC(WindowPosChanging);
SET_USER_FUNC(WindowPosChanged);
SET_USER_FUNC(SystemParametersInfo);
@@ -231,10 +231,10 @@ index 3994c2106cc..ec943dcd623 100644
return xic;
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index b8e088282e5..dcf11f240d4 100644
index f76170f5a16..dd58e625801 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -322,6 +322,8 @@ struct user_driver_funcs
@@ -320,6 +320,8 @@ struct user_driver_funcs
const RECT *,struct window_surface*);
/* system parameters */
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);