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 62df608d3ed84aac7ce517fd07ea13e48b49b08c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-17 09:36:39 +11:00
parent 849ac07bce
commit e853aaffe3
5 changed files with 38 additions and 38 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 6ffb90b2107dd35387683c72eb8fdf9900b0a564 Mon Sep 17 00:00:00 2001
From 91dfacc1a9c0af50534563975d2ef9f2262559f4 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
@@ -27,7 +27,7 @@ received a lot of help from Sebastian Lackner.
7 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
index a5e9b25aa29..0969ec6892d 100644
index 8bf4962b708..33954123efe 100644
--- a/dlls/user32/caret.c
+++ b/dlls/user32/caret.c
@@ -27,6 +27,7 @@
@@ -43,7 +43,7 @@ index a5e9b25aa29..0969ec6892d 100644
r.top = y;
CARET_DisplayCaret( hwnd, &r );
+ USER_Driver->pUpdateCandidatePos( hwnd, &r );
SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
}
return ret;
@@ -352,6 +354,7 @@ BOOL WINAPI ShowCaret( HWND hwnd )
@@ -51,14 +51,14 @@ index a5e9b25aa29..0969ec6892d 100644
{
CARET_DisplayCaret( hwnd, &r );
+ USER_Driver->pUpdateCandidatePos( hwnd, &r );
SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
}
return ret;
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 9f3ad85ac19..3f487ce72d8 100644
index 72ea5ad17bd..af279b2ce17 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -154,6 +154,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd )
@@ -146,6 +146,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd )
return load_driver()->pCreateWindow( hwnd );
}
@@ -70,7 +70,7 @@ index 9f3ad85ac19..3f487ce72d8 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -208,6 +213,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -200,6 +205,8 @@ static struct user_driver_funcs lazy_load_driver =
NULL,
/* opengl support */
NULL,
@@ -80,7 +80,7 @@ index 9f3ad85ac19..3f487ce72d8 100644
NULL,
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 5499744482a..a7822fef746 100644
index afe44e1c4a3..8eb412f7368 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -914,6 +914,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
@@ -103,7 +103,7 @@ index 5499744482a..a7822fef746 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1271,6 +1277,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1273,6 +1279,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
SET_USER_FUNC(SystemParametersInfo);
SET_USER_FUNC(wine_get_vulkan_driver);
SET_USER_FUNC(wine_get_wgl_driver);
@@ -239,7 +239,7 @@ index 3994c2106cc..ec943dcd623 100644
return xic;
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index e6f8239e27d..560c21b18c1 100644
index b3c77a1d2c1..23bd1e9d8cf 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -318,10 +318,16 @@ struct user_driver_funcs