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

Fixed rebase

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-20 08:45:32 +11:00
parent e3a9010df6
commit 8fb1779241
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 9b42107e6396b8fa014ef258ff7e705d7048dc33 Mon Sep 17 00:00:00 2001
From 72a7f7ad3dffa132367cec29b1aa20fcaca6d316 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
@@ -19,12 +19,12 @@ received a lot of help from Sebastian Lackner.
---
dlls/user32/caret.c | 3 ++
dlls/user32/driver.c | 7 ++++
dlls/win32u/driver.c | 7 ++++
dlls/win32u/driver.c | 8 +++++
dlls/winex11.drv/init.c | 1 +
dlls/winex11.drv/x11drv.h | 1 +
dlls/winex11.drv/xim.c | 72 ++++++++++++++++++++++++++++++++++++++-
include/wine/gdi_driver.h | 6 ++++
7 files changed, 96 insertions(+), 1 deletion(-)
7 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
index 8bf4962b708..33954123efe 100644
@@ -80,7 +80,7 @@ index fbbf630a80e..7ce98f4a0f9 100644
NULL,
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index d1062cb5f3a..02b09aecf52 100644
index d1062cb5f3a..50fc011e19f 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,15 @@ index d1062cb5f3a..02b09aecf52 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1287,6 +1293,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1223,6 +1229,7 @@ static const struct user_driver_funcs lazy_load_driver =
loaderdrv_wine_get_vulkan_driver,
/* opengl support */
nulldrv_wine_get_wgl_driver,
+ nulldrv_UpdateCandidatePos,
/* thread management */
nulldrv_ThreadDetach,
};
@@ -1287,6 +1294,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);