wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against c0ea1ad37d3343c403d80ee18bf0d90c2699148b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-12-01 10:27:42 +11:00
parent 3b7c98ebf1
commit 4c51f4f5f6
7 changed files with 39 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 40af1acfcc95f7aeef48b6b57338a9365946af33 Mon Sep 17 00:00:00 2001
From c4ea95ba65062d383c7635ce79bea2e21ca1ef8a 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
@@ -23,8 +23,8 @@ received a lot of help from Sebastian Lackner.
dlls/winex11.drv/init.c | 1 +
dlls/winex11.drv/x11drv.h | 1 +
dlls/winex11.drv/xim.c | 72 ++++++++++++++++++++++++++++++++++++++-
include/wine/gdi_driver.h | 4 ++-
7 files changed, 92 insertions(+), 2 deletions(-)
include/wine/gdi_driver.h | 2 ++
7 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
index 2da7e02ca1a..1dd3ff29de4 100644
@@ -56,10 +56,10 @@ index 2da7e02ca1a..1dd3ff29de4 100644
}
return ret;
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 0b386b0af21..f979630c707 100644
index 9ff676aca22..747e1d55533 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -362,6 +362,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
@@ -321,6 +321,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
}
@@ -71,7 +71,7 @@ index 0b386b0af21..f979630c707 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -413,6 +418,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -373,6 +378,8 @@ static struct user_driver_funcs lazy_load_driver =
nulldrv_WindowPosChanged,
/* system parameters */
nulldrv_SystemParametersInfo,
@@ -81,10 +81,10 @@ index 0b386b0af21..f979630c707 100644
nulldrv_ThreadDetach
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 15e7d3701f7..bcca0c30353 100644
index 93c2ff1da4c..f63da32561a 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -986,6 +986,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
@@ -991,6 +991,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
return FALSE;
}
@@ -95,7 +95,7 @@ index 15e7d3701f7..bcca0c30353 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1072,6 +1076,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1129,6 +1133,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);
@@ -104,10 +104,10 @@ index 15e7d3701f7..bcca0c30353 100644
#undef SET_USER_FUNC
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 854221bf948..c9bef8d46d2 100644
index 1a86836b9c1..d9bdd2b6e3f 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -425,6 +425,7 @@ static const struct user_driver_funcs x11drv_funcs =
@@ -429,6 +429,7 @@ static const struct user_driver_funcs x11drv_funcs =
.pWindowPosChanging = X11DRV_WindowPosChanging,
.pWindowPosChanged = X11DRV_WindowPosChanged,
.pSystemParametersInfo = X11DRV_SystemParametersInfo,
@@ -116,10 +116,10 @@ index 854221bf948..c9bef8d46d2 100644
};
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 4b4ee8daaeb..182ca4dd857 100644
index ce9a254fb5b..9b6d83ae4f3 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -240,6 +240,7 @@ extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT sw
@@ -242,6 +242,7 @@ extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT sw
struct window_surface *surface ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
UINT flags ) DECLSPEC_HIDDEN;
@@ -231,19 +231,10 @@ index 3994c2106cc..ec943dcd623 100644
return xic;
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 994b082d5b4..e65b1873926 100644
index b8e088282e5..dcf11f240d4 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 70
+#define WINE_GDI_DRIVER_VERSION 71
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
@@ -285,6 +285,8 @@ struct user_driver_funcs
@@ -322,6 +322,8 @@ struct user_driver_funcs
const RECT *,struct window_surface*);
/* system parameters */
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);