Rebase against 835dfaab023175028161974c5cd8585b77df101c.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "3f6102080e632b9f4d8a97c0f0b1231fbd8e759b"
+	echo "835dfaab023175028161974c5cd8585b77df101c"
 }
 
 # Show version information
@@ -205,7 +205,6 @@ patch_enable_all ()
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
 	enable_user32_FlashWindowEx="$1"
-	enable_user32_GetSystemMetrics="$1"
 	enable_user32_Implement_CascadeWindows="$1"
 	enable_user32_LR_LOADFROMFILE="$1"
 	enable_user32_ListBox_Size="$1"
@@ -644,9 +643,6 @@ patch_enable ()
 		user32-FlashWindowEx)
 			enable_user32_FlashWindowEx="$2"
 			;;
-		user32-GetSystemMetrics)
-			enable_user32_GetSystemMetrics="$2"
-			;;
 		user32-Implement-CascadeWindows)
 			enable_user32_Implement_CascadeWindows="$2"
 			;;
@@ -3209,18 +3205,6 @@ if test "$enable_user32_FlashWindowEx" -eq 1; then
 	patch_apply user32-FlashWindowEx/0001-user32-Improve-FlashWindowEx-message-and-return-valu.patch
 fi
 
-# Patchset user32-GetSystemMetrics
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#18732] Make it possible to change media center / tablet pc status
-# |
-# | Modified files:
-# |   *	dlls/user32/sysparams.c
-# |
-if test "$enable_user32_GetSystemMetrics" -eq 1; then
-	patch_apply user32-GetSystemMetrics/0001-user32-Allow-changing-the-tablet-media-center-status.patch
-fi
-
 # Patchset user32-Implement-CascadeWindows
 # |
 # | This patchset fixes the following Wine bugs:

patches/secur32-InitializeSecurityContextW/0001-secur32-Input-Parameter-should-be-NULL-on-first-call.patch

@@ -1,4 +1,4 @@
-From e229a4497bcfd9649ddfdb2d77f06b03f6e7b97f Mon Sep 17 00:00:00 2001
+From 3b7ee6a45c7b33aeccc9ccf7460d1e4d69cc7023 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 21 Apr 2021 21:06:55 +1000
 Subject: [PATCH] secur32: Input Parameter should be NULL on first call to
@@ -13,10 +13,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
-index 895364a3fc7..58d40cfb3eb 100644
+index 32181b3b35f..bca15750bc9 100644
 --- a/dlls/secur32/schannel.c
 +++ b/dlls/secur32/schannel.c
-@@ -915,7 +915,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+@@ -724,7 +724,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
          ptsExpiry->HighPart = 0;
      }
  
@@ -24,7 +24,7 @@ index 895364a3fc7..58d40cfb3eb 100644
 +    if (!phContext || (phNewContext && !pInput))
      {
          ULONG_PTR handle;
- 
+         struct create_session_params create_params;
 diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
 index 7cb3871193c..27381d60b38 100644
 --- a/dlls/secur32/tests/schannel.c

patches/user32-GetSystemMetrics/definition

@@ -1 +1,2 @@
 Fixes: [18732] Make it possible to change media center / tablet pc status
+Disabled: True

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

@@ -1,4 +1,4 @@
-From c4ea95ba65062d383c7635ce79bea2e21ca1ef8a Mon Sep 17 00:00:00 2001
+From 29ecc8286ee52997384ebde43da5e6a1f43b3bdc 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 9ff676aca22..747e1d55533 100644
+index 10b0132734b..eef699d921a 100644
 --- a/dlls/user32/driver.c
 +++ b/dlls/user32/driver.c
-@@ -321,6 +321,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
+@@ -364,6 +364,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
      return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
  }
  
@@ -71,20 +71,20 @@ index 9ff676aca22..747e1d55533 100644
  static struct user_driver_funcs lazy_load_driver =
  {
      { NULL },
-@@ -373,6 +378,8 @@ static struct user_driver_funcs lazy_load_driver =
+@@ -414,6 +419,8 @@ static struct user_driver_funcs lazy_load_driver =
      nulldrv_WindowPosChanged,
      /* system parameters */
-     nulldrv_SystemParametersInfo,
+     NULL,
 +    /* candidate pos functions */
 +    loaderdrv_UpdateCandidatePos,
      /* thread management */
      nulldrv_ThreadDetach
  };
 diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
-index 93c2ff1da4c..f63da32561a 100644
+index 5fa1a2ca236..b401f71776c 100644
 --- a/dlls/win32u/driver.c
 +++ b/dlls/win32u/driver.c
-@@ -991,6 +991,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
+@@ -936,6 +936,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
      return FALSE;
  }
  
@@ -95,7 +95,7 @@ index 93c2ff1da4c..f63da32561a 100644
  static void CDECL nulldrv_ThreadDetach( void )
  {
  }
-@@ -1129,6 +1133,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
+@@ -1092,6 +1096,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
      SET_USER_FUNC(WindowPosChanging);
      SET_USER_FUNC(WindowPosChanged);
      SET_USER_FUNC(SystemParametersInfo);
@@ -231,10 +231,10 @@ index 3994c2106cc..ec943dcd623 100644
      return xic;
  }
 diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
-index b8e088282e5..dcf11f240d4 100644
+index f76170f5a16..dd58e625801 100644
 --- a/include/wine/gdi_driver.h
 +++ b/include/wine/gdi_driver.h
-@@ -322,6 +322,8 @@ struct user_driver_funcs
+@@ -320,6 +320,8 @@ struct user_driver_funcs
                                         const RECT *,struct window_surface*);
      /* system parameters */
      BOOL    (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);

staging/upstream-commit

@@ -1 +1 @@
-3f6102080e632b9f4d8a97c0f0b1231fbd8e759b
+835dfaab023175028161974c5cd8585b77df101c