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 330dc601978922aa1d5864d29d94882d6b1990d1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-12 11:27:46 +11:00
parent 0e1d830578
commit f077cbe2d3
28 changed files with 467 additions and 458 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 11c77aff12c68d21157e54cf26c81032a20bc4eb Mon Sep 17 00:00:00 2001
From 7cacbda4b7462a3a016437bb885a33d2d5589cd7 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
@@ -56,11 +56,11 @@ index 2da7e02ca1a..1dd3ff29de4 100644
}
return ret;
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 56637b613e9..946ed37a76e 100644
index 56148448560..f86e3ff1f7f 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -294,6 +294,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
@@ -169,6 +169,11 @@ static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT
load_driver()->pGetDC( hdc, hwnd, top_win, win_rect, top_rect, flags );
}
+static void CDECL loaderdrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
@@ -71,7 +71,7 @@ index 56637b613e9..946ed37a76e 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -348,6 +353,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -223,6 +228,8 @@ static struct user_driver_funcs lazy_load_driver =
NULL,
/* opengl support */
NULL,
@@ -81,10 +81,10 @@ index 56637b613e9..946ed37a76e 100644
NULL,
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 67a051f59f1..73e77b7c2c1 100644
index ed686405e73..0cc6e36f47d 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -917,6 +917,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
@@ -914,6 +914,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
return FALSE;
}
@@ -92,7 +92,7 @@ index 67a051f59f1..73e77b7c2c1 100644
static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT version )
{
return NULL;
@@ -927,6 +928,11 @@ static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( UINT version )
@@ -924,6 +925,11 @@ static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( UINT version )
return (void *)-1;
}
@@ -104,7 +104,7 @@ index 67a051f59f1..73e77b7c2c1 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1135,6 +1141,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1263,6 +1269,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);
@@ -261,5 +261,5 @@ index e6f8239e27d..560c21b18c1 100644
void (CDECL *pThreadDetach)(void);
};
--
2.34.1
2.35.1