From 9787d66b919255b9e65f07c2915f4ac0f9ea9770 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Thu, 9 Jun 2022 18:21:04 +0200 Subject: [PATCH] =?UTF-8?q?Remove=20'winex11.drv:=20Remove=20unused=20X11D?= =?UTF-8?q?RV=5FGET=5FDRAWABLE=20ExtEscape=20code'=20patch=20from=20both?= =?UTF-8?q?=20valve=5Fproton=C3=A7=5Ffullscreen=5Fhack-staging=20and=20chi?= =?UTF-8?q?ldwindow-proton=20patchsets.=20This=20reportedly=20breaks=20gal?= =?UTF-8?q?lium-nine=20which=20relies=20on=20this.=20Thanks=20to=20@niobiu?= =?UTF-8?q?m93=20for=20reporting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/Frogging-Family/wine-tkg-git/issues/783 --- .../misc/childwindow/childwindow-proton.patch | 59 ------------------- ...valve_proton_fullscreen_hack-staging.patch | 59 ------------------- 2 files changed, 118 deletions(-) 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 index 54987ce25..306829051 100644 --- a/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton.patch +++ b/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton.patch @@ -722,65 +722,6 @@ index d702105c64b..1a077d9323e 100644 result = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); if (result == VK_SUCCESS) { -From 96b82203f192eade6910f4ac2ecb188e27d22feb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Bernon?= -Date: Thu, 11 Mar 2021 23:27:57 +0100 -Subject: [PATCH] winex11.drv: Remove unused X11DRV_GET_DRAWABLE ExtEscape - code. - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277 -CW-Bug-Id: 16608 ---- - dlls/winex11.drv/init.c | 8 -------- - dlls/winex11.drv/x11drv.h | 9 --------- - 2 files changed, 17 deletions(-) - -diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index 0e8d2ffbf9e..8f152eedc69 100644 ---- a/dlls/winex11.drv/init.c -+++ b/dlls/winex11.drv/init.c -@@ -222,14 +222,6 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI - return TRUE; - } - break; -- case X11DRV_GET_DRAWABLE: -- if (out_count >= sizeof(struct x11drv_escape_get_drawable)) -- { -- struct x11drv_escape_get_drawable *data = out_data; -- data->drawable = physDev->drawable; -- return TRUE; -- } -- break; - case X11DRV_PRESENT_DRAWABLE: - if (in_count >= sizeof(struct x11drv_escape_present_drawable)) - { -diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 9c8def1b068..dd7b9be0524 100644 ---- a/dlls/winex11.drv/x11drv.h -+++ b/dlls/winex11.drv/x11drv.h -@@ -335,7 +335,6 @@ extern int *get_window_surface_mapping( int bpp, int *mapping ) DECLSPEC_HIDDEN; - enum x11drv_escape_codes - { - X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ -- X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_START_EXPOSURES, /* start graphics exposures */ - X11DRV_END_EXPOSURES, /* end graphics exposures */ - X11DRV_PRESENT_DRAWABLE, /* present the drawable on screen */ -@@ -349,14 +348,6 @@ struct x11drv_escape_set_drawable - RECT dc_rect; /* DC rectangle relative to drawable */ - }; - --struct x11drv_escape_get_drawable --{ -- enum x11drv_escape_codes code; /* escape code (X11DRV_GET_DRAWABLE) */ -- Drawable drawable; /* X drawable */ -- Drawable gl_drawable; /* GL drawable */ -- int pixel_format; /* internal GL pixel format */ --}; -- - struct x11drv_escape_present_drawable - { - enum x11drv_escape_codes code; /* escape code (X11DRV_PRESENT_DRAWABLE) */ From f06b97c57d0abd9ab25289d3ccce12737beef51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Fri, 12 Mar 2021 00:10:49 +0100 diff --git a/wine-tkg-git/wine-tkg-patches/proton/valve_proton_fullscreen_hack/valve_proton_fullscreen_hack-staging.patch b/wine-tkg-git/wine-tkg-patches/proton/valve_proton_fullscreen_hack/valve_proton_fullscreen_hack-staging.patch index a4ce8bdf7..6a09be035 100644 --- a/wine-tkg-git/wine-tkg-patches/proton/valve_proton_fullscreen_hack/valve_proton_fullscreen_hack-staging.patch +++ b/wine-tkg-git/wine-tkg-patches/proton/valve_proton_fullscreen_hack/valve_proton_fullscreen_hack-staging.patch @@ -1703,65 +1703,6 @@ index d702105c64b..1a077d9323e 100644 result = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); if (result == VK_SUCCESS) { -From 96b82203f192eade6910f4ac2ecb188e27d22feb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Bernon?= -Date: Thu, 11 Mar 2021 23:27:57 +0100 -Subject: [PATCH] winex11.drv: Remove unused X11DRV_GET_DRAWABLE ExtEscape - code. - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277 -CW-Bug-Id: 16608 ---- - dlls/winex11.drv/init.c | 8 -------- - dlls/winex11.drv/x11drv.h | 9 --------- - 2 files changed, 17 deletions(-) - -diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index 0e8d2ffbf9e..8f152eedc69 100644 ---- a/dlls/winex11.drv/init.c -+++ b/dlls/winex11.drv/init.c -@@ -222,14 +222,6 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI - return TRUE; - } - break; -- case X11DRV_GET_DRAWABLE: -- if (out_count >= sizeof(struct x11drv_escape_get_drawable)) -- { -- struct x11drv_escape_get_drawable *data = out_data; -- data->drawable = physDev->drawable; -- return TRUE; -- } -- break; - case X11DRV_PRESENT_DRAWABLE: - if (in_count >= sizeof(struct x11drv_escape_present_drawable)) - { -diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 9c8def1b068..dd7b9be0524 100644 ---- a/dlls/winex11.drv/x11drv.h -+++ b/dlls/winex11.drv/x11drv.h -@@ -335,7 +335,6 @@ extern int *get_window_surface_mapping( int bpp, int *mapping ) DECLSPEC_HIDDEN; - enum x11drv_escape_codes - { - X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ -- X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_START_EXPOSURES, /* start graphics exposures */ - X11DRV_END_EXPOSURES, /* end graphics exposures */ - X11DRV_PRESENT_DRAWABLE, /* present the drawable on screen */ -@@ -349,14 +348,6 @@ struct x11drv_escape_set_drawable - RECT dc_rect; /* DC rectangle relative to drawable */ - }; - --struct x11drv_escape_get_drawable --{ -- enum x11drv_escape_codes code; /* escape code (X11DRV_GET_DRAWABLE) */ -- Drawable drawable; /* X drawable */ -- Drawable gl_drawable; /* GL drawable */ -- int pixel_format; /* internal GL pixel format */ --}; -- - struct x11drv_escape_present_drawable - { - enum x11drv_escape_codes code; /* escape code (X11DRV_PRESENT_DRAWABLE) */ From f06b97c57d0abd9ab25289d3ccce12737beef51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Fri, 12 Mar 2021 00:10:49 +0100