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

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2023-05-24 12:06:20 +10:00
parent 3e3ebf5cfc
commit 6900845545
12 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 322b0ade65ffd9f5e8cfdcd7faaaf5a3826c9ce4 Mon Sep 17 00:00:00 2001
From f4c7ba985b14b3e8779beea13256f8759519a67b 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, 83 insertions(+)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index a2ac8fbf815..ffd0c0e6e5a 100644
index d80b95499fa..0946e8470bb 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -910,6 +910,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version )
@@ -924,6 +924,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version )
return (void *)-1;
}
@@ -41,7 +41,7 @@ index a2ac8fbf815..ffd0c0e6e5a 100644
static void nulldrv_ThreadDetach( void )
{
}
@@ -1225,6 +1230,7 @@ static const struct user_driver_funcs lazy_load_driver =
@@ -1257,6 +1262,7 @@ static const struct user_driver_funcs lazy_load_driver =
loaderdrv_wine_get_vulkan_driver,
/* opengl support */
nulldrv_wine_get_wgl_driver,
@@ -49,7 +49,7 @@ index a2ac8fbf815..ffd0c0e6e5a 100644
/* thread management */
nulldrv_ThreadDetach,
};
@@ -1298,6 +1304,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version
@@ -1333,6 +1339,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(wine_get_wgl_driver);
@@ -58,7 +58,7 @@ index a2ac8fbf815..ffd0c0e6e5a 100644
#undef SET_USER_FUNC
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index f1eb5f3a8ca..31ed6a62812 100644
index a900f6f553c..d1b74538ade 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -2320,6 +2320,7 @@ BOOL set_caret_pos( int x, int y )
@@ -78,10 +78,10 @@ index f1eb5f3a8ca..31ed6a62812 100644
}
return ret;
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 2d056a359ef..eb57a2fcffb 100644
index 14035b338dc..8ba0de64ec8 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -439,6 +439,7 @@ static const struct user_driver_funcs x11drv_funcs =
@@ -441,6 +441,7 @@ static const struct user_driver_funcs x11drv_funcs =
.pSystemParametersInfo = X11DRV_SystemParametersInfo,
.pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver,
.pwine_get_wgl_driver = X11DRV_wine_get_wgl_driver,
@@ -90,10 +90,10 @@ index 2d056a359ef..eb57a2fcffb 100644
};
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index d5b0855035b..85a20c1e7c5 100644
index 049737003f0..3e5a630f01e 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -253,6 +253,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
@@ -256,6 +256,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
struct window_surface *surface ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
UINT flags ) DECLSPEC_HIDDEN;
@@ -102,10 +102,10 @@ index d5b0855035b..85a20c1e7c5 100644
/* X11 driver internal functions */
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index b7f5f696ba5..51fb6bdff62 100644
index 1c3d2dd9875..5c336522b9b 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -34,6 +34,7 @@
@@ -36,6 +36,7 @@
#include "x11drv.h"
#include "imm.h"
#include "wine/debug.h"
@@ -113,8 +113,8 @@ index b7f5f696ba5..51fb6bdff62 100644
WINE_DEFAULT_DEBUG_CHANNEL(xim);
@@ -432,6 +433,49 @@ void xim_thread_attach( struct x11drv_thread_data *data )
else XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data );
@@ -436,6 +437,49 @@ void xim_thread_attach( struct x11drv_thread_data *data )
XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data );
}
+/***********************************************************************
@@ -163,7 +163,7 @@ index b7f5f696ba5..51fb6bdff62 100644
static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg )
{
struct x11drv_win_data *data;
@@ -485,6 +529,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win )
@@ -489,6 +533,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win )
XFree( preedit );
XFree( status );
@@ -197,10 +197,10 @@ index b7f5f696ba5..51fb6bdff62 100644
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 1ffaa409c72..219eb75d3de 100644
index 30b792a0232..4a27fb1e823 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -334,6 +334,8 @@ struct user_driver_funcs
@@ -339,6 +339,8 @@ struct user_driver_funcs
const struct vulkan_funcs * (*pwine_get_vulkan_driver)(UINT);
/* opengl support */
struct opengl_funcs * (*pwine_get_wgl_driver)(UINT);
@@ -210,5 +210,5 @@ index 1ffaa409c72..219eb75d3de 100644
void (*pThreadDetach)(void);
};
--
2.40.0
2.40.1