diff --git a/patches/ntdll-call_thread_func_wrapper/0001-ntdll-Reserve-some-more-stack-space-in-call_thread_f.patch b/patches/ntdll-call_thread_func_wrapper/0001-ntdll-Reserve-some-more-stack-space-in-call_thread_f.patch deleted file mode 100644 index 24e4a6ad..00000000 --- a/patches/ntdll-call_thread_func_wrapper/0001-ntdll-Reserve-some-more-stack-space-in-call_thread_f.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e6bfa67377478b11fdb37eda1351d9392f60b63a Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Sat, 27 Feb 2016 18:05:25 +0100 -Subject: [PATCH] ntdll: Reserve some more stack space in - call_thread_func_wrapper. - ---- - dlls/ntdll/signal_i386.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c -index abbc094c75..70fed467a0 100644 ---- a/dlls/ntdll/signal_i386.c -+++ b/dlls/ntdll/signal_i386.c -@@ -2674,7 +2674,7 @@ __ASM_GLOBAL_FUNC(call_thread_func_wrapper, - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") -- "subl $4,%esp\n\t" -+ "subl $20,%esp\n\t" - "pushl 12(%ebp)\n\t" - "call *8(%ebp)\n\t" - "leave\n\t" --- -2.16.1 - diff --git a/patches/ntdll-call_thread_func_wrapper/definition b/patches/ntdll-call_thread_func_wrapper/definition deleted file mode 100644 index 750bb7f8..00000000 --- a/patches/ntdll-call_thread_func_wrapper/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [40068] Reserve some more stack space in call_thread_func_wrapper diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b7713a4c..484ffb23 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -270,7 +270,6 @@ patch_enable_all () enable_ntdll_Wait_User_APC="$1" enable_ntdll_Zero_mod_name="$1" enable_ntdll__aulldvrm="$1" - enable_ntdll_call_thread_func_wrapper="$1" enable_ntdll_set_full_cpu_context="$1" enable_ntdll_x86_64_ExceptionInformation="$1" enable_ntoskrnl_Ob_callbacks="$1" @@ -430,12 +429,10 @@ patch_enable_all () enable_winex11_MWM_Decorations="$1" enable_winex11_UpdateLayeredWindow="$1" enable_winex11_WM_WINDOWPOSCHANGING="$1" - enable_winex11_Window_Groups="$1" enable_winex11_Window_Style="$1" enable_winex11_XEMBED="$1" enable_winex11__NET_ACTIVE_WINDOW="$1" enable_winex11_wglShareLists="$1" - enable_winhlp32_Flex_Workaround="$1" enable_winhttp_Accept_Headers="$1" enable_winhttp_System_Proxy_Autoconfig="$1" enable_wininet_Cleanup="$1" @@ -1027,9 +1024,6 @@ patch_enable () ntdll-_aulldvrm) enable_ntdll__aulldvrm="$2" ;; - ntdll-call_thread_func_wrapper) - enable_ntdll_call_thread_func_wrapper="$2" - ;; ntdll-set_full_cpu_context) enable_ntdll_set_full_cpu_context="$2" ;; @@ -1507,9 +1501,6 @@ patch_enable () winex11-WM_WINDOWPOSCHANGING) enable_winex11_WM_WINDOWPOSCHANGING="$2" ;; - winex11-Window_Groups) - enable_winex11_Window_Groups="$2" - ;; winex11-Window_Style) enable_winex11_Window_Style="$2" ;; @@ -1522,9 +1513,6 @@ patch_enable () winex11-wglShareLists) enable_winex11_wglShareLists="$2" ;; - winhlp32-Flex_Workaround) - enable_winhlp32_Flex_Workaround="$2" - ;; winhttp-Accept_Headers) enable_winhttp_Accept_Headers="$2" ;; @@ -6194,21 +6182,6 @@ if test "$enable_ntdll__aulldvrm" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-call_thread_func_wrapper -# | -# | This patchset fixes the following Wine bugs: -# | * [#40068] Reserve some more stack space in call_thread_func_wrapper -# | -# | Modified files: -# | * dlls/ntdll/signal_i386.c -# | -if test "$enable_ntdll_call_thread_func_wrapper" -eq 1; then - patch_apply ntdll-call_thread_func_wrapper/0001-ntdll-Reserve-some-more-stack-space-in-call_thread_f.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "ntdll: Reserve some more stack space in call_thread_func_wrapper.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-set_full_cpu_context # | # | Modified files: @@ -8899,21 +8872,6 @@ if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then ) >> "$patchlist" fi -# Patchset winex11-Window_Groups -# | -# | This patchset fixes the following Wine bugs: -# | * [#32699] Prevent window managers from grouping all wine programs together -# | -# | Modified files: -# | * dlls/winex11.drv/window.c -# | -if test "$enable_winex11_Window_Groups" -eq 1; then - patch_apply winex11-Window_Groups/0001-winex11-Prevent-window-managers-from-grouping-all-wi.patch - ( - printf '%s\n' '+ { "Michael Müller", "winex11: Prevent window managers from grouping all wine programs together.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winex11-Window_Style # | # | This patchset fixes the following Wine bugs: @@ -8957,21 +8915,6 @@ if test "$enable_winex11_wglShareLists" -eq 1; then ) >> "$patchlist" fi -# Patchset winhlp32-Flex_Workaround -# | -# | This patchset fixes the following Wine bugs: -# | * [#42132] Workaround a bug present in the current versions of Flex -# | -# | Modified files: -# | * programs/winhlp32/macro.lex.l -# | -if test "$enable_winhlp32_Flex_Workaround" -eq 1; then - patch_apply winhlp32-Flex_Workaround/0001-winhlp32-Workaround-a-bug-in-Flex.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "winhlp32: Workaround a bug in Flex.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winhttp-Accept_Headers # | # | Modified files: diff --git a/patches/wined3d-Interpolation_Modifiers/0002-wined3d-Unroll-vertex-geometry-shader-outputs-and-pi.patch b/patches/wined3d-Interpolation_Modifiers/0002-wined3d-Unroll-vertex-geometry-shader-outputs-and-pi.patch deleted file mode 100644 index 2024c5fc..00000000 --- a/patches/wined3d-Interpolation_Modifiers/0002-wined3d-Unroll-vertex-geometry-shader-outputs-and-pi.patch +++ /dev/null @@ -1,203 +0,0 @@ -From f851b588d460fd11fcf0e2abde1051b4029457f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B3zef=20Kucia?= -Date: Fri, 8 Sep 2017 01:03:52 +0200 -Subject: wined3d: Unroll vertex / geometry shader outputs and pixel shader - inputs for >= sm4. - ---- - dlls/wined3d/glsl_shader.c | 84 +++++++++++++++++++++++++++++++++++----------- - 1 file changed, 64 insertions(+), 20 deletions(-) - -diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index 31b892faf65..2c97ba8ef8d 100644 ---- a/dlls/wined3d/glsl_shader.c -+++ b/dlls/wined3d/glsl_shader.c -@@ -841,7 +841,7 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 - continue; - } - -- string_buffer_sprintf(buffer, "shader_in_out.reg[%u]", e->register_idx); -+ string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); - append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); - } - -@@ -1849,21 +1849,53 @@ static const char *shader_glsl_shader_output_name(const struct wined3d_gl_info * - } - - static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, -- struct wined3d_string_buffer *buffer, unsigned int element_count) -+ struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL unroll) - { - if (shader_glsl_use_interface_blocks(gl_info)) -- shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in;\n", element_count); -+ { -+ if (unroll) -+ { -+ unsigned int i; -+ -+ shader_addline(buffer, "in shader_in_out {\n"); -+ for (i = 0; i < element_count; ++i) -+ shader_addline(buffer, "vec4 reg%u;\n", i); -+ shader_addline(buffer, "} shader_in;\n"); -+ } -+ else -+ { -+ shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in;\n", element_count); -+ } -+ } - else -+ { - declare_in_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); -+ } - } - - static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, -- struct wined3d_string_buffer *buffer, unsigned int element_count) -+ struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL unroll) - { -+ unsigned int i; -+ - if (shader_glsl_use_interface_blocks(gl_info)) -- shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", element_count); -+ { -+ if (unroll) -+ { -+ shader_addline(buffer, "out shader_in_out {\n"); -+ for (i = 0; i < element_count; ++i) -+ shader_addline(buffer, " vec4 reg%u;\n", i); -+ shader_addline(buffer, "} shader_out;\n"); -+ } -+ else -+ { -+ shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", element_count); -+ } -+ } - else -+ { - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); -+ } - } - - static const char *glsl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) -@@ -6304,7 +6336,7 @@ static void shader_glsl_dp2add(const struct wined3d_shader_instruction *ins) - static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, - const struct wined3d_shader_signature *input_signature, - const struct wined3d_shader_reg_maps *reg_maps, -- const struct ps_compile_args *args, const struct wined3d_gl_info *gl_info) -+ const struct ps_compile_args *args, const struct wined3d_gl_info *gl_info, BOOL unroll) - { - unsigned int i; - -@@ -6351,10 +6383,16 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w - { - if (input->sysval_semantic) - FIXME("Unhandled sysval semantic %#x.\n", input->sysval_semantic); -- shader_addline(buffer, "ps_in[%u]%s = %s[%u]%s;\n", -- shader->u.ps.input_reg_map[input->register_idx], reg_mask, -- shader_glsl_shader_input_name(gl_info), -- shader->u.ps.input_reg_map[input->register_idx], reg_mask); -+ if (unroll) -+ shader_addline(buffer, "ps_in[%u]%s = %s%u%s;\n", -+ shader->u.ps.input_reg_map[input->register_idx], reg_mask, -+ shader_glsl_shader_input_name(gl_info), -+ shader->u.ps.input_reg_map[input->register_idx], reg_mask); -+ else -+ shader_addline(buffer, "ps_in[%u]%s = %s[%u]%s;\n", -+ shader->u.ps.input_reg_map[input->register_idx], reg_mask, -+ shader_glsl_shader_input_name(gl_info), -+ shader->u.ps.input_reg_map[input->register_idx], reg_mask); - } - } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) -@@ -6545,7 +6583,8 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, - - static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, - unsigned int input_count, const struct wined3d_shader_signature *output_signature, -- const struct wined3d_shader_reg_maps *reg_maps_out, const char *output_variable_name) -+ const struct wined3d_shader_reg_maps *reg_maps_out, const char *output_variable_name, -+ BOOL rasterizer_setup) - { - struct wined3d_string_buffer *buffer = &priv->shader_buffer; - char reg_mask[6]; -@@ -6566,8 +6605,12 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, - - shader_glsl_write_mask_to_str(output->mask, reg_mask); - -- shader_addline(buffer, "%s.reg[%u]%s = outputs[%u]%s;\n", -- output_variable_name, output->register_idx, reg_mask, output->register_idx, reg_mask); -+ if (rasterizer_setup) -+ shader_addline(buffer, "%s.reg%u%s = outputs[%u]%s;\n", -+ output_variable_name, output->register_idx, reg_mask, output->register_idx, reg_mask); -+ else -+ shader_addline(buffer, "%s.reg[%u]%s = outputs[%u]%s;\n", -+ output_variable_name, output->register_idx, reg_mask, output->register_idx, reg_mask); - } - } - -@@ -6625,7 +6668,7 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv - shader_glsl_setup_vs3_output(priv, gl_info, map, input_signature, reg_maps_in, - output_signature, reg_maps_out); - else -- shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out, "shader_out"); -+ shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out, "shader_out", TRUE); - } - - /* Context activation is done by the caller. */ -@@ -6757,7 +6800,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl - { - unsigned int in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); - -- shader_glsl_declare_shader_outputs(gl_info, buffer, in_count); -+ shader_glsl_declare_shader_outputs(gl_info, buffer, in_count, FALSE); - shader_addline(buffer, "void setup_vs_output(in vec4 outputs[%u])\n{\n", vs->limits->packed_output); - shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, - &ps->reg_maps, 0, &vs->output_signature, &vs->reg_maps, per_vertex_point_size); -@@ -6783,7 +6826,7 @@ static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, - input_count = min(vec4_varyings(4, gl_info), input_count); - - if (input_count) -- shader_glsl_declare_shader_outputs(gl_info, buffer, input_count); -+ shader_glsl_declare_shader_outputs(gl_info, buffer, input_count, rasterizer_setup); - - shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", - prefix, shader->limits->packed_output); -@@ -6793,7 +6836,7 @@ static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, - NULL, input_count, &shader->output_signature, &shader->reg_maps, FALSE); - else - shader_glsl_setup_sm4_shader_output(priv, input_count, &shader->output_signature, -- &shader->reg_maps, "shader_out"); -+ &shader->reg_maps, "shader_out", rasterizer_setup); - - shader_addline(buffer, "}\n"); - } -@@ -7119,7 +7162,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context - unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); - - if (args->vp_mode == vertexshader && reg_maps->input_registers) -- shader_glsl_declare_shader_inputs(gl_info, buffer, in_count); -+ shader_glsl_declare_shader_inputs(gl_info, buffer, in_count, version->major >= 4); - shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); - } - -@@ -7265,7 +7308,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context - - /* Pack 3.0 inputs */ - if (reg_maps->shader_version.major >= 3) -- shader_glsl_input_pack(shader, buffer, &shader->input_signature, reg_maps, args, gl_info); -+ shader_glsl_input_pack(shader, buffer, &shader->input_signature, reg_maps, args, gl_info, -+ reg_maps->shader_version.major >= 4); - - /* Base Shader Body */ - if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, NULL, NULL))) -@@ -7494,7 +7538,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con - shader_addline(buffer, "void setup_hs_output(in vec4 outputs[%u])\n{\n", - shader->limits->packed_output); - shader_glsl_setup_sm4_shader_output(priv, shader->limits->packed_output, &shader->output_signature, -- &shader->reg_maps, "shader_out[gl_InvocationID]"); -+ &shader->reg_maps, "shader_out[gl_InvocationID]", FALSE); - shader_addline(buffer, "}\n"); - } - --- -2.14.1 - diff --git a/patches/winex11-Window_Groups/0001-winex11-Prevent-window-managers-from-grouping-all-wi.patch b/patches/winex11-Window_Groups/0001-winex11-Prevent-window-managers-from-grouping-all-wi.patch deleted file mode 100644 index 17a0f09e..00000000 --- a/patches/winex11-Window_Groups/0001-winex11-Prevent-window-managers-from-grouping-all-wi.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 55d50964170f5fd8cf75b5e4e7ca109a60875980 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 Aug 2014 01:17:27 +0200 -Subject: winex11: Prevent window managers from grouping all wine programs - together. - ---- - dlls/winex11.drv/window.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c -index 06e2294..e715642 100644 ---- a/dlls/winex11.drv/window.c -+++ b/dlls/winex11.drv/window.c -@@ -842,10 +842,8 @@ static void set_initial_wm_hints( Display *display, Window window ) - /* class hints */ - if ((class_hints = XAllocClassHint())) - { -- static char wine[] = "Wine"; -- - class_hints->res_name = process_name; -- class_hints->res_class = wine; -+ class_hints->res_class = process_name; - XSetClassHint( display, window, class_hints ); - XFree( class_hints ); - } --- -1.9.1 - diff --git a/patches/winex11-Window_Groups/definition b/patches/winex11-Window_Groups/definition deleted file mode 100644 index cbafd52a..00000000 --- a/patches/winex11-Window_Groups/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [32699] Prevent window managers from grouping all wine programs together diff --git a/patches/winhlp32-Flex_Workaround/0001-winhlp32-Workaround-a-bug-in-Flex.patch b/patches/winhlp32-Flex_Workaround/0001-winhlp32-Workaround-a-bug-in-Flex.patch deleted file mode 100644 index d674ead8..00000000 --- a/patches/winhlp32-Flex_Workaround/0001-winhlp32-Workaround-a-bug-in-Flex.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 14 Jan 2017 05:48:28 +0100 -Subject: winhlp32: Workaround a bug in Flex. - ---- - programs/winhlp32/macro.lex.l | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l -index 8f6945ca988..da2dd22e447 100644 ---- a/programs/winhlp32/macro.lex.l -+++ b/programs/winhlp32/macro.lex.l -@@ -20,7 +20,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - %} --%option noinput nounput never-interactive 8bit -+%option noinput nounput never-interactive 8bit noyywrap - %x quote - %{ - #include "config.h" -@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) - { - return lex_data ? lex_data->window : Globals.active_win; - } -- --#ifndef yywrap --int yywrap(void) { return 1; } --#endif --- -2.11.0 - diff --git a/patches/winhlp32-Flex_Workaround/definition b/patches/winhlp32-Flex_Workaround/definition deleted file mode 100644 index 6d8a4552..00000000 --- a/patches/winhlp32-Flex_Workaround/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [42132] Workaround a bug present in the current versions of Flex