Rebase against 3dbce69fd4cc8f4802479939d2cf50905b79f5a3.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "97d6cfd7059fbe55fdd24a04e8d9133848328d4e"
+	echo "3dbce69fd4cc8f4802479939d2cf50905b79f5a3"
 }
 
 # Show version information
@@ -250,14 +250,11 @@ patch_enable_all ()
 	enable_winemenubuilder_Desktop_Icon_Path="$1"
 	enable_winemenubuilder_integration="$1"
 	enable_wineps_drv_PostScript_Fixes="$1"
-	enable_winex11_CandidateWindowPos="$1"
 	enable_winex11_MWM_Decorations="$1"
 	enable_winex11_UpdateLayeredWindow="$1"
 	enable_winex11_Vulkan_support="$1"
-	enable_winex11_WM_WINDOWPOSCHANGING="$1"
 	enable_winex11_Window_Style="$1"
 	enable_winex11_XEMBED="$1"
-	enable_winex11__NET_ACTIVE_WINDOW="$1"
 	enable_winex11_ime_check_thread_data="$1"
 	enable_winex11_key_translation="$1"
 	enable_winex11_wglShareLists="$1"
@@ -780,9 +777,6 @@ patch_enable ()
 		wineps.drv-PostScript_Fixes)
 			enable_wineps_drv_PostScript_Fixes="$2"
 			;;
-		winex11-CandidateWindowPos)
-			enable_winex11_CandidateWindowPos="$2"
-			;;
 		winex11-MWM_Decorations)
 			enable_winex11_MWM_Decorations="$2"
 			;;
@@ -792,18 +786,12 @@ patch_enable ()
 		winex11-Vulkan_support)
 			enable_winex11_Vulkan_support="$2"
 			;;
-		winex11-WM_WINDOWPOSCHANGING)
-			enable_winex11_WM_WINDOWPOSCHANGING="$2"
-			;;
 		winex11-Window_Style)
 			enable_winex11_Window_Style="$2"
 			;;
 		winex11-XEMBED)
 			enable_winex11_XEMBED="$2"
 			;;
-		winex11-_NET_ACTIVE_WINDOW)
-			enable_winex11__NET_ACTIVE_WINDOW="$2"
-			;;
 		winex11-ime-check-thread-data)
 			enable_winex11_ime_check_thread_data="$2"
 			;;
@@ -1187,13 +1175,6 @@ patch_apply()
 }
 
 
-if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
-	if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
-		abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but winex11-WM_WINDOWPOSCHANGING depends on that."
-	fi
-	enable_winex11__NET_ACTIVE_WINDOW=1
-fi
-
 if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then
 	if test "$enable_wined3d_SWVP_shaders" -gt 1; then
 		abort "Patchset wined3d-SWVP-shaders disabled, but wined3d-Indexed_Vertex_Blending depends on that."
@@ -1422,7 +1403,7 @@ fi
 # Patchset Staging
 # |
 # | Modified files:
-# |   *	Makefile.in, configure.ac, dlls/ntdll/loader.c
+# |   *	configure.ac, dlls/ntdll/loader.c
 # |
 if test "$enable_Staging" -eq 1; then
 	patch_apply Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
@@ -3766,19 +3747,6 @@ if test "$enable_wineps_drv_PostScript_Fixes" -eq 1; then
 	patch_apply wineps.drv-PostScript_Fixes/0004-wineps.drv-Add-support-for-GETFACENAME-and-DOWNLOADF.patch
 fi
 
-# Patchset winex11-CandidateWindowPos
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#30938] Update a XIM candidate position when cursor location changes
-# |
-# | Modified files:
-# |   *	dlls/user32/caret.c, dlls/user32/driver.c, dlls/user32/user_private.h, dlls/winex11.drv/winex11.drv.spec,
-# | 	dlls/winex11.drv/xim.c
-# |
-if test "$enable_winex11_CandidateWindowPos" -eq 1; then
-	patch_apply winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
-fi
-
 # Patchset winex11-MWM_Decorations
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3816,35 +3784,6 @@ if test "$enable_winex11_Vulkan_support" -eq 1; then
 	patch_apply winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch
 fi
 
-# Patchset winex11-_NET_ACTIVE_WINDOW
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#2155] Forward activate window requests to WM using _NET_ACTIVE_WINDOW
-# |
-# | Modified files:
-# |   *	dlls/user32/driver.c, dlls/user32/focus.c, dlls/user32/user_private.h, dlls/winex11.drv/event.c,
-# | 	dlls/winex11.drv/window.c, dlls/winex11.drv/winex11.drv.spec, dlls/winex11.drv/x11drv.h, dlls/winex11.drv/x11drv_main.c
-# |
-if test "$enable_winex11__NET_ACTIVE_WINDOW" -eq 1; then
-	patch_apply winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch
-	patch_apply winex11-_NET_ACTIVE_WINDOW/0002-user32-Before-asking-a-WM-to-activate-a-window-make-.patch
-fi
-
-# Patchset winex11-WM_WINDOWPOSCHANGING
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	winex11-_NET_ACTIVE_WINDOW
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#34594] Fix handling of WM_WINDOWPOS{CHANGING,CHANGED} for deactivated topmost window
-# |
-# | Modified files:
-# |   *	dlls/winex11.drv/event.c
-# |
-if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
-	patch_apply winex11-WM_WINDOWPOSCHANGING/0001-winex11.drv-Send-WM_WINDOWPOSCHANGING-WM_WINDOWPOSCH.patch
-fi
-
 # Patchset winex11-Window_Style
 # |
 # | This patchset fixes the following Wine bugs:

patches/winex11-CandidateWindowPos/definition

@@ -1 +1,2 @@
 Fixes: [30938] Update a XIM candidate position when cursor location changes
+Disabled: True

patches/winex11-WM_WINDOWPOSCHANGING/definition

@@ -1,2 +1,3 @@
 Fixes: [34594] Fix handling of WM_WINDOWPOS{CHANGING,CHANGED} for deactivated topmost window
 Depends: winex11-_NET_ACTIVE_WINDOW
+Disabled: True

patches/winex11-_NET_ACTIVE_WINDOW/definition

@@ -1 +1,2 @@
 Fixes: [2155] Forward activate window requests to WM using _NET_ACTIVE_WINDOW
+Disabled: True

staging/upstream-commit

@@ -1 +1 @@
-97d6cfd7059fbe55fdd24a04e8d9133848328d4e
+3dbce69fd4cc8f4802479939d2cf50905b79f5a3