childwindow-proton: rebase, move previous version to legacy, update c…

…hildwindow-proton script (#1206)

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 2a2637743b82031d0039698e116a0d1daf18dc1d HEAD; then
+	  if git merge-base --is-ancestor e9ca13a6f736ff54d80805a050f174f2fce835a0 HEAD; then
 	    _patchname='childwindow-proton.patch' && _patchmsg="Applied child window for vk patch" && 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
 	    _patchname='childwindow-proton-2a263774.patch' && _patchmsg="Applied child window for vk patch" && nonuser_patcher
 	  elif git merge-base --is-ancestor 9e9d2d43c1d1931fd3450543b4913d339687d24c HEAD; then
@@ -48,8 +50,10 @@
 	fi
 
 	if ( [ "$_childwindow_fix" = "true" ] && [ "$_proton_fs_hack" != "true" ] && [ "$_use_staging" != "true" ] ); then
-	  if git merge-base --is-ancestor 2a2637743b82031d0039698e116a0d1daf18dc1d HEAD; then
+	  if git merge-base --is-ancestor e9ca13a6f736ff54d80805a050f174f2fce835a0 HEAD; then
             _patchname='childwindow-proton-mainline.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
             _patchname='childwindow-proton-mainline-2a263774.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher
 	  elif git merge-base --is-ancestor 9e9d2d43c1d1931fd3450543b4913d339687d24c HEAD; then

wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton-mainline.patch

@@ -569,14 +569,18 @@ index c6bf49c6ec8bc83580a42abb3eb9314189280673..3a93ed89afe11e21464bf5211dd09636
      data->whole_colormap = 0;
      data->wm_state = WithdrawnState;
      data->net_wm_state = 0;
-@@ -2627,7 +2653,6 @@ BOOL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
+diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
+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_
 
      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 (data->surface)
+     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

wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton.patch

@@ -569,7 +569,11 @@ index c6bf49c6ec8bc83580a42abb3eb9314189280673..3a93ed89afe11e21464bf5211dd09636
      data->whole_colormap = 0;
      data->wm_state = WithdrawnState;
      data->net_wm_state = 0;
-@@ -2627,7 +2653,6 @@ BOOL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
+diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
+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_
 
      if (data->embedded) goto done; /* draw directly to the window */
      if (data->whole_window == root_window) goto done; /* draw directly to the window */