childwindow-proton: Rebase patches, update script and move older vers…

…ion to legacy (#1235) * childwindow-proton: Rebase against c2d46eaa1ef07a2921e5711212e9c5c354f58112 Signed-off-by: Kirill Artemev <[email protected]> * childwindow-proton: Update childwindow-proton script Signed-off-by: Kirill Artemev <[email protected]> * childwindow-proton: Move older version to legacy Signed-off-by: Kirill Artemev <[email protected]> --------- Signed-off-by: Kirill Artemev <[email protected]>
Frogging-Family · Aug 10, 2024 · f841ecf · f841ecf
1 parent 90abec8
commit f841ecf
Show file tree

Hide file tree

Showing 5 changed files with 1,254 additions and 14 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton b/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton
@@ -2,8 +2,10 @@
 
 	# Standalone child window support for vk - Fixes World of Final Fantasy and others - https://bugs.winehq.org/show_bug.cgi?id=45277 - legacy patchset for older trees applied at an earlier stage in the script
 	if ( [ "$_childwindow_fix" = "true" ] && [ "$_proton_fs_hack" != "true" ] && [ "$_use_staging" = "true" ] ); then
-	  if git merge-base --is-ancestor e9ca13a6f736ff54d80805a050f174f2fce835a0 HEAD; then
+	  if git merge-base --is-ancestor c2d46eaa1ef07a2921e5711212e9c5c354f58112 HEAD; then
 	    _patchname='childwindow-proton.patch' && _patchmsg="Applied child window for vk patch" && nonuser_patcher
+	  elif git merge-base --is-ancestor e9ca13a6f736ff54d80805a050f174f2fce835a0 HEAD; then
+            _patchname='childwindow-proton-c2d46ea.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher
 	  elif git merge-base --is-ancestor 2a2637743b82031d0039698e116a0d1daf18dc1d HEAD; then
 	    _patchname='childwindow-proton-e9ca13a6.patch' && _patchmsg="Applied child window for vk patch" && nonuser_patcher
 	  elif git merge-base --is-ancestor 8ba51a6f711c5466e060a5958cc15c31b2b2ac7d HEAD; then
@@ -50,8 +52,10 @@
 	fi
 
 	if ( [ "$_childwindow_fix" = "true" ] && [ "$_proton_fs_hack" != "true" ] && [ "$_use_staging" != "true" ] ); then
-	  if git merge-base --is-ancestor e9ca13a6f736ff54d80805a050f174f2fce835a0 HEAD; then
+	  if git merge-base --is-ancestor c2d46eaa1ef07a2921e5711212e9c5c354f58112 HEAD; then
             _patchname='childwindow-proton-mainline.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher
+	  elif git merge-base --is-ancestor e9ca13a6f736ff54d80805a050f174f2fce835a0 HEAD; then
+            _patchname='childwindow-proton-mainline-c2d46ea.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher
 	  elif git merge-base --is-ancestor 2a2637743b82031d0039698e116a0d1daf18dc1d HEAD; then
             _patchname='childwindow-proton-mainline-e9ca13a6.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher
 	  elif git merge-base --is-ancestor 8ba51a6f711c5466e060a5958cc15c31b2b2ac7d HEAD; then

diff --git a/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton-mainline.patch b/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton-mainline.patch
@@ -574,13 +574,13 @@ index 11111111111..11111111111 100644
 --- a/dlls/winex11.drv/bitblt.c
 +++ b/dlls/winex11.drv/bitblt.c
 @@ -2263,7 +2263,6 @@ BOOL X11DRV_CreateWindowSurface( HWND hwnd, UINT swp_flags, const RECT *visible_
+         *surface = NULL;  /* indicate that we want to draw directly to the window */
+         if (data->embedded) goto done; /* draw directly to the window */
+         if (data->whole_window == root_window) goto done; /* draw directly to the window */
+-        if (data->client_window) goto done; /* draw directly to the window */
+         if (!client_side_graphics) goto done; /* draw directly to the window */
+     }
 
-     if (data->embedded) goto done; /* draw directly to the window */
-     if (data->whole_window == root_window) goto done; /* draw directly to the window */
--    if (data->client_window) goto done; /* draw directly to the window */
-     if (!client_side_graphics && !layered) goto done; /* draw directly to the window */
-
-     if (!get_surface_rect( visible_rect, &surface_rect )) goto done;
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
 index 1aaba9bf24b9dadb553d53ddb6796ce43e3e25a8..e919ad36c701aeee5bbcaf52a565db3e597ca8b1 100644
 --- a/dlls/winex11.drv/x11drv.h

diff --git a/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton.patch b/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton.patch
@@ -574,13 +574,13 @@ index 11111111111..11111111111 100644
 --- a/dlls/winex11.drv/bitblt.c
 +++ b/dlls/winex11.drv/bitblt.c
 @@ -2263,7 +2263,6 @@ BOOL X11DRV_CreateWindowSurface( HWND hwnd, UINT swp_flags, const RECT *visible_
+         *surface = NULL;  /* indicate that we want to draw directly to the window */
+         if (data->embedded) goto done; /* draw directly to the window */
+         if (data->whole_window == root_window) goto done; /* draw directly to the window */
+-        if (data->client_window) goto done; /* draw directly to the window */
+         if (!client_side_graphics) goto done; /* draw directly to the window */
+     }
 
-     if (data->embedded) goto done; /* draw directly to the window */
-     if (data->whole_window == root_window) goto done; /* draw directly to the window */
--    if (data->client_window) goto done; /* draw directly to the window */
-     if (!client_side_graphics && !layered) goto done; /* draw directly to the window */
-
-     if (!get_surface_rect( visible_rect, &surface_rect )) goto done;
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
 index 1aaba9bf24b9dadb553d53ddb6796ce43e3e25a8..e919ad36c701aeee5bbcaf52a565db3e597ca8b1 100644
 --- a/dlls/winex11.drv/x11drv.h