update fullscreen hack patch, revert 0ffb1535517301d28c7c004eac639a9a…

…0cc26c00 for the time being to enable unicode
GloriousEggroll · Apr 13, 2019 · a8ccab6 · a8ccab6
1 parent 74f43a2
commit a8ccab6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/game-patches-testing/proton-prep.sh b/game-patches-testing/proton-prep.sh
@@ -26,6 +26,9 @@
     git reset --hard HEAD
     git clean -xdf
 
+    #revert 0ffb1535517301d28c7c004eac639a9a0cc26c00 because steam needs it
+    git revert --no-commit 0ffb1535517301d28c7c004eac639a9a0cc26c00
+
     echo "system tray fix for kde plasma"
     patch -Np1 < ../game-patches-testing/plasma_systray_fix.patch
 

diff --git a/game-patches-testing/valve-wined3d-d3d11.patch b/game-patches-testing/valve-wined3d-d3d11.patch
@@ -530,11 +530,11 @@ diff --git a/include/Makefile.in b/include/Makefile.in
 index eaf31149de2..d2c5a28acbb 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -683,6 +683,7 @@ SOURCES = \
- 	wine/itss.idl \
+@@ -681,6 +681,7 @@ SOURCES = \
  	wine/library.h \
  	wine/svcctl.idl \
-+        wine/wined3d-interop.idl \
+ 	wine/unicode.h \
++	wine/wined3d-interop.idl \
  	wine/winedxgi.idl \
  	winerror.h \
  	winevt.h \

diff --git a/game-patches-testing/valve-winex11-fullscreen-hack.patch b/game-patches-testing/valve-winex11-fullscreen-hack.patch
@@ -99,7 +99,7 @@ index d478cbdcb3a..6d2eb0673ed 100644
 +            XMoveResizeWindow(data->display, data->whole_window, tl.x, tl.y, p.x, p.y);
 +            if(data->client_window)
 +                XMoveResizeWindow(data->display, data->client_window, 0, 0, p.x, p.y);
-+            sync_gl_drawable(hwnd);
++            sync_gl_drawable(hwnd,FALSE);
 +            update_net_wm_states( data );
 +        }
 +    }else {
@@ -139,7 +139,7 @@ index d478cbdcb3a..6d2eb0673ed 100644
 +                        data->client_rect.right - data->client_rect.left,
 +                        data->client_rect.bottom - data->client_rect.top);
 +            }
-+            sync_gl_drawable(hwnd);
++            sync_gl_drawable(hwnd,FALSE);
 +        }
      }
      release_win_data( data );
@@ -700,7 +700,7 @@ index 7a3b340e19a..fc320c78de8 100644
      }
 
 +    if (data->fs_hack)
-+        sync_gl_drawable( hwnd );
++        sync_gl_drawable( hwnd,FALSE );
 +
      /* check if we are currently processing an event relevant to this window */
      event_type = 0;