Rebase against df0566d531b4454673eb71a0903986d215988e40.

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

@@ -1,4 +1,4 @@
-From 19a4bd8f76819adf43158402935a3b49f37d946e Mon Sep 17 00:00:00 2001
+From 11c77aff12c68d21157e54cf26c81032a20bc4eb 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
@@ -23,8 +23,8 @@ received a lot of help from Sebastian Lackner.
  dlls/winex11.drv/init.c   |  1 +
  dlls/winex11.drv/x11drv.h |  1 +
  dlls/winex11.drv/xim.c    | 72 ++++++++++++++++++++++++++++++++++++++-
- include/wine/gdi_driver.h |  5 +++
- 7 files changed, 96 insertions(+), 1 deletion(-)
+ include/wine/gdi_driver.h |  6 ++++
+ 7 files changed, 97 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
 index 2da7e02ca1a..1dd3ff29de4 100644
@@ -56,10 +56,10 @@ index 2da7e02ca1a..1dd3ff29de4 100644
      }
      return ret;
 diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
-index 7e9f63ad1c7..1a144bb78c9 100644
+index 56637b613e9..946ed37a76e 100644
 --- a/dlls/user32/driver.c
 +++ b/dlls/user32/driver.c
-@@ -341,6 +341,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
+@@ -294,6 +294,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
      return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
  }
  
@@ -71,20 +71,20 @@ index 7e9f63ad1c7..1a144bb78c9 100644
  static struct user_driver_funcs lazy_load_driver =
  {
      { NULL },
-@@ -393,6 +398,8 @@ static struct user_driver_funcs lazy_load_driver =
+@@ -348,6 +353,8 @@ static struct user_driver_funcs lazy_load_driver =
      NULL,
-     /* vulkan support */
+     /* opengl support */
      NULL,
 +    /* candidate pos functions */
 +    loaderdrv_UpdateCandidatePos,
      /* thread management */
-     NULL
+     NULL,
  };
 diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
-index b3a3e70f83f..3f8542e3b20 100644
+index 67a051f59f1..73e77b7c2c1 100644
 --- a/dlls/win32u/driver.c
 +++ b/dlls/win32u/driver.c
-@@ -931,11 +931,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
+@@ -917,6 +917,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
      return FALSE;
  }
  
@@ -92,6 +92,8 @@ index b3a3e70f83f..3f8542e3b20 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 )
+     return (void *)-1;
  }
  
 +static void CDECL nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
@@ -102,22 +104,22 @@ index b3a3e70f83f..3f8542e3b20 100644
  static void CDECL nulldrv_ThreadDetach( void )
  {
  }
-@@ -1133,6 +1139,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
-     SET_USER_FUNC(WindowPosChanged);
+@@ -1135,6 +1141,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);
 +    SET_USER_FUNC(UpdateCandidatePos);
      SET_USER_FUNC(ThreadDetach);
  #undef SET_USER_FUNC
  
 diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
-index 1f0549e4d39..7ed3ef7183c 100644
+index 9f2be685dec..4fb100e684b 100644
 --- a/dlls/winex11.drv/init.c
 +++ b/dlls/winex11.drv/init.c
-@@ -422,6 +422,7 @@ static const struct user_driver_funcs x11drv_funcs =
-     .pWindowPosChanged = X11DRV_WindowPosChanged,
+@@ -415,6 +415,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,
 +    .pUpdateCandidatePos = X11DRV_UpdateCandidatePos,
      .pThreadDetach = X11DRV_ThreadDetach,
  };
@@ -238,16 +240,19 @@ index 3994c2106cc..ec943dcd623 100644
      return xic;
  }
 diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
-index 567a6c21608..ff92d097f7d 100644
+index e6f8239e27d..560c21b18c1 100644
 --- a/include/wine/gdi_driver.h
 +++ b/include/wine/gdi_driver.h
-@@ -319,8 +319,13 @@ struct user_driver_funcs
+@@ -318,10 +318,16 @@ struct user_driver_funcs
                                         const RECT *,struct window_surface*);
      /* system parameters */
      BOOL    (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);
 +
      /* vulkan support */
      const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT);
++
+     /* opengl support */
+     struct opengl_funcs * (CDECL *pwine_get_wgl_driver)(UINT);
 +
 +    /* IME functions */
 +    void    (CDECL *pUpdateCandidatePos)(HWND, const RECT *);