wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against fcddf19498fca9b51baea705f5748b998f4560b9.

Browse Source
This commit is contained in:
Zebediah Figura
2023-11-29 18:35:48 -06:00
parent 97a1486fb9
commit 614cfc4589
33 changed files with 403 additions and 410 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 7149a4637b34e291dd5a9003b6f4a421d6c1781b Mon Sep 17 00:00:00 2001
From d72fa6e8e3d4188d3b6b6da92cad5a785cc2c839 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
@@ -26,7 +26,7 @@ received a lot of help from Sebastian Lackner.
6 files changed, 85 insertions(+)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index ed2e0973d39..2965f5f0090 100644
index e6a24d1a46c..672b6571671 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -923,6 +923,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version )
@@ -58,7 +58,7 @@ index ed2e0973d39..2965f5f0090 100644
#undef SET_USER_FUNC
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index 1f9e48423fc..9eba12c37bd 100644
index 3e6e440de93..ac19b5146a9 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -2330,6 +2330,8 @@ BOOL set_caret_pos( int x, int y )
@@ -92,15 +92,15 @@ index c3d54da1d4d..8e277ba0003 100644
};
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 9ee6498a02e..ef88221202f 100644
index 2917579927c..8e8ca22a2db 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -256,6 +256,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
struct window_surface *surface ) DECLSPEC_HIDDEN;
struct window_surface *surface );
extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
UINT flags ) DECLSPEC_HIDDEN;
+extern void X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect ) DECLSPEC_HIDDEN;
extern void X11DRV_ThreadDetach(void) DECLSPEC_HIDDEN;
UINT flags );
+extern void X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect );
extern void X11DRV_ThreadDetach(void);
/* X11 driver internal functions */
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
@@ -199,7 +199,7 @@ index 209d63f0402..32e5fef58db 100644
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index c4e859f21e5..fba67f9873e 100644
index aa59a256482..1c0abebed3b 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -343,6 +343,8 @@ struct user_driver_funcs
@@ -212,5 +212,5 @@ index c4e859f21e5..fba67f9873e 100644
void (*pThreadDetach)(void);
};
--
2.40.1
2.42.0