From 17abc8d4efe2274666a3fab6c354c653c072eba9 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 16 Feb 2022 10:21:38 +1100
Subject: [PATCH] Rebase against 781277de62822c2bac23dc892a99665cdb140a5e.

---
 patches/patchinstall.sh                        |  2 +-
 ...ate-a-candidate-window-s-position-wit.patch | 18 +++++++++---------
 staging/upstream-commit                        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 921ed525..f75f1e73 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "cfb1d2058fb47ff3f72501e0aaf35b97ea128036"
+	echo "781277de62822c2bac23dc892a99665cdb140a5e"
 }
 
 # Show version information
diff --git a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
index bab395d6..cebaf918 100644
--- a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
+++ b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
@@ -1,4 +1,4 @@
-From 496ea7a4273c2f33bce0035063c21a28027b1523 Mon Sep 17 00:00:00 2001
+From 19a4bd8f76819adf43158402935a3b49f37d946e 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,10 +56,10 @@ index 2da7e02ca1a..1dd3ff29de4 100644
      }
      return ret;
 diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
-index 73f4ee67257..ffcf8d264a1 100644
+index 7e9f63ad1c7..1a144bb78c9 100644
 --- a/dlls/user32/driver.c
 +++ b/dlls/user32/driver.c
-@@ -364,6 +364,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
+@@ -341,6 +341,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
      return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
  }
  
@@ -71,20 +71,20 @@ index 73f4ee67257..ffcf8d264a1 100644
  static struct user_driver_funcs lazy_load_driver =
  {
      { NULL },
-@@ -416,6 +421,8 @@ static struct user_driver_funcs lazy_load_driver =
+@@ -393,6 +398,8 @@ static struct user_driver_funcs lazy_load_driver =
      NULL,
      /* vulkan support */
      NULL,
 +    /* candidate pos functions */
 +    loaderdrv_UpdateCandidatePos,
      /* thread management */
-     nulldrv_ThreadDetach
+     NULL
  };
 diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
-index 405dbf38e11..f52a2240e59 100644
+index b3a3e70f83f..3f8542e3b20 100644
 --- a/dlls/win32u/driver.c
 +++ b/dlls/win32u/driver.c
-@@ -930,11 +930,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
+@@ -931,11 +931,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
      return FALSE;
  }
  
@@ -102,7 +102,7 @@ index 405dbf38e11..f52a2240e59 100644
  static void CDECL nulldrv_ThreadDetach( void )
  {
  }
-@@ -1098,6 +1104,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
+@@ -1133,6 +1139,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
      SET_USER_FUNC(WindowPosChanged);
      SET_USER_FUNC(SystemParametersInfo);
      SET_USER_FUNC(wine_get_vulkan_driver);
@@ -256,5 +256,5 @@ index 567a6c21608..ff92d097f7d 100644
      void    (CDECL *pThreadDetach)(void);
  };
 -- 
-2.33.0
+2.34.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 90278141..1d2f078a 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-cfb1d2058fb47ff3f72501e0aaf35b97ea128036
+781277de62822c2bac23dc892a99665cdb140a5e