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 7c5b9304a62b794ba07110e15eef6aec3a46ef0a.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2024-03-23 17:27:34 +11:00
parent 5a1e1cb2e0
commit 126e7db0e0
6 changed files with 74 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d72fa6e8e3d4188d3b6b6da92cad5a785cc2c839 Mon Sep 17 00:00:00 2001
From 1f6f25d59452ac969c5cf78cfb472409e303d9d8 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,10 +26,10 @@ 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 e6a24d1a46c..672b6571671 100644
index 04192aae309..d5dc16e1cb8 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 )
@@ -929,6 +929,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version )
return (void *)-1;
}
@@ -41,27 +41,27 @@ index e6a24d1a46c..672b6571671 100644
static void nulldrv_ThreadDetach( void )
{
}
@@ -1261,6 +1266,7 @@ static const struct user_driver_funcs lazy_load_driver =
loaderdrv_wine_get_vulkan_driver,
@@ -1310,6 +1315,7 @@ static const struct user_driver_funcs lazy_load_driver =
loaderdrv_VulkanInit,
/* opengl support */
nulldrv_wine_get_wgl_driver,
+ nulldrv_UpdateCandidatePos,
/* thread management */
nulldrv_ThreadDetach,
};
@@ -1337,6 +1343,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version
@@ -1394,6 +1400,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version
SET_USER_FUNC(SystemParametersInfo);
SET_USER_FUNC(wine_get_vulkan_driver);
SET_USER_FUNC(VulkanInit);
SET_USER_FUNC(wine_get_wgl_driver);
+ SET_USER_FUNC(UpdateCandidatePos);
SET_USER_FUNC(ThreadDetach);
#undef SET_USER_FUNC
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index 3e6e440de93..ac19b5146a9 100644
index 9e764a335f5..532cab0e8e6 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -2330,6 +2330,8 @@ BOOL set_caret_pos( int x, int y )
@@ -2334,6 +2334,8 @@ BOOL set_caret_pos( int x, int y )
r.left = x;
r.top = y;
display_caret( hwnd, &r );
@@ -70,7 +70,7 @@ index 3e6e440de93..ac19b5146a9 100644
NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, caret.timeout );
}
return ret;
@@ -2367,6 +2369,8 @@ BOOL WINAPI NtUserShowCaret( HWND hwnd )
@@ -2371,6 +2373,8 @@ BOOL WINAPI NtUserShowCaret( HWND hwnd )
if (ret && hidden == 1) /* hidden was 1 so it's now 0 */
{
display_caret( hwnd, &r );
@@ -80,22 +80,22 @@ index 3e6e440de93..ac19b5146a9 100644
}
return ret;
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index c3d54da1d4d..8e277ba0003 100644
index f9a331c5619..c5f92342e18 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -437,6 +437,7 @@ static const struct user_driver_funcs x11drv_funcs =
@@ -434,6 +434,7 @@ static const struct user_driver_funcs x11drv_funcs =
.pSystemParametersInfo = X11DRV_SystemParametersInfo,
.pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver,
.pVulkanInit = X11DRV_VulkanInit,
.pwine_get_wgl_driver = X11DRV_wine_get_wgl_driver,
+ .pUpdateCandidatePos = X11DRV_UpdateCandidatePos,
.pThreadDetach = X11DRV_ThreadDetach,
};
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 2917579927c..8e8ca22a2db 100644
index bab633c5613..424df92c48c 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
@@ -257,6 +257,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
struct window_surface *surface );
extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
UINT flags );
@@ -104,7 +104,7 @@ index 2917579927c..8e8ca22a2db 100644
/* X11 driver internal functions */
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 209d63f0402..32e5fef58db 100644
index c6a93eb5e16..786a089160f 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -36,6 +36,7 @@
@@ -115,7 +115,7 @@ index 209d63f0402..32e5fef58db 100644
WINE_DEFAULT_DEBUG_CHANNEL(xim);
@@ -438,6 +439,49 @@ void xim_thread_attach( struct x11drv_thread_data *data )
@@ -410,6 +411,49 @@ void xim_thread_attach( struct x11drv_thread_data *data )
XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data );
}
@@ -165,7 +165,7 @@ index 209d63f0402..32e5fef58db 100644
static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg )
{
struct x11drv_win_data *data;
@@ -491,6 +535,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win )
@@ -463,6 +507,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win )
XFree( preedit );
XFree( status );
@@ -199,11 +199,11 @@ index 209d63f0402..32e5fef58db 100644
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index aa59a256482..1c0abebed3b 100644
index d0ba6ee5f85..f33370bac93 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -343,6 +343,8 @@ struct user_driver_funcs
const struct vulkan_funcs * (*pwine_get_vulkan_driver)(UINT);
@@ -352,6 +352,8 @@ struct user_driver_funcs
UINT (*pVulkanInit)(UINT,void *,struct vulkan_funcs *);
/* opengl support */
struct opengl_funcs * (*pwine_get_wgl_driver)(UINT);
+ /* IME functions */
@@ -212,5 +212,5 @@ index aa59a256482..1c0abebed3b 100644
void (*pThreadDetach)(void);
};
--
2.42.0
2.43.0