Rebase against 47b02e8c1ea4ad82cd572dc3dcf60af753222f39.

This commit is contained in:
Alistair Leslie-Hughes
2022-03-19 15:02:16 +11:00
parent 62db3313d5
commit e3a9010df6
6 changed files with 44 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
From 91dfacc1a9c0af50534563975d2ef9f2262559f4 Mon Sep 17 00:00:00 2001
From 9b42107e6396b8fa014ef258ff7e705d7048dc33 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
@@ -55,11 +55,11 @@ index 8bf4962b708..33954123efe 100644
}
return ret;
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 72ea5ad17bd..af279b2ce17 100644
index fbbf630a80e..7ce98f4a0f9 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -146,6 +146,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd )
return load_driver()->pCreateWindow( hwnd );
@@ -113,6 +113,11 @@ static void CDECL loaderdrv_UpdateClipboard(void)
load_driver()->pUpdateClipboard();
}
+static void CDECL loaderdrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
@@ -70,7 +70,7 @@ index 72ea5ad17bd..af279b2ce17 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -200,6 +205,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -167,6 +172,8 @@ static struct user_driver_funcs lazy_load_driver =
NULL,
/* opengl support */
NULL,
@@ -80,7 +80,7 @@ index 72ea5ad17bd..af279b2ce17 100644
NULL,
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index afe44e1c4a3..8eb412f7368 100644
index d1062cb5f3a..02b09aecf52 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 afe44e1c4a3..8eb412f7368 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1273,6 +1279,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1287,6 +1293,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);