From d007ef33eed1022e834d69d7cc0b3eea1361dba6 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 29 Nov 2022 10:30:08 +1100 Subject: [PATCH] Rebase against 6905b76b9400209ded97983ceca9f9c15de22d98. --- patches/patchinstall.sh | 2 +- ...e-bindless-textures-for-GLSL-shaders.patch | 72 +++++++++---------- ...v-Add-support-for-_NET_ACTIVE_WINDOW.patch | 42 +++++------ staging/upstream-commit | 2 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 53c816da..42e61a39 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "20d86f34a066657048610803e7143232efa6c0d3" + echo "6905b76b9400209ded97983ceca9f9c15de22d98" } # Show version information diff --git a/patches/wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch b/patches/wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch index 2300b23f..e8d91a06 100644 --- a/patches/wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch +++ b/patches/wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch @@ -1,4 +1,4 @@ -From 53a8ae5e78c5548a81bfafa20aa2551a786b120a Mon Sep 17 00:00:00 2001 +From 4c505cb4e69ee0d1b44a115e7d1ce5d03e546283 Mon Sep 17 00:00:00 2001 From: Andrew Wesie Date: Tue, 2 Oct 2018 23:28:01 -0500 Subject: [PATCH] wined3d: Use bindless textures for GLSL shaders. @@ -19,7 +19,7 @@ Signed-off-by: Andrew Wesie 10 files changed, 261 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c -index 4464bf3ecc2..90492d16238 100644 +index 521e3a044bc..9c3c430194b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -56,6 +56,7 @@ static const struct wined3d_extension_map gl_extension_map[] = @@ -30,7 +30,7 @@ index 4464bf3ecc2..90492d16238 100644 {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_buffer_storage", ARB_BUFFER_STORAGE }, {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, -@@ -2106,6 +2107,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) +@@ -2120,6 +2121,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_base_instance */ USE_GL_FUNC(glDrawArraysInstancedBaseInstance) USE_GL_FUNC(glDrawElementsInstancedBaseVertexBaseInstance) @@ -43,10 +43,10 @@ index 4464bf3ecc2..90492d16238 100644 USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c -index b4c395ec355..b0b8cb3dd6e 100644 +index db70a9853d4..82240b65019 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c -@@ -5638,6 +5638,12 @@ static BOOL shader_arb_has_ffp_proj_control(void *shader_priv) +@@ -5639,6 +5639,12 @@ static BOOL shader_arb_has_ffp_proj_control(void *shader_priv) return priv->ffp_proj_control; } @@ -59,7 +59,7 @@ index b4c395ec355..b0b8cb3dd6e 100644 static void shader_arb_precompile(void *shader_priv, struct wined3d_shader *shader) {} static uint64_t shader_arb_shader_compile(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc, -@@ -5666,6 +5672,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend = +@@ -5667,6 +5673,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend = shader_arb_get_caps, shader_arb_color_fixup_supported, shader_arb_has_ffp_proj_control, @@ -68,10 +68,10 @@ index b4c395ec355..b0b8cb3dd6e 100644 }; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c -index 8ac5c28c892..21a29ba157b 100644 +index af46cd9dfd7..14a2e52bee8 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c -@@ -3940,6 +3940,12 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * +@@ -3986,6 +3986,12 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * if (!(shader = state->shader[shader_type])) return; @@ -85,7 +85,7 @@ index 8ac5c28c892..21a29ba157b 100644 &shader->reg_maps.shader_version, &base, &count); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index d14b40d8e3e..995410e984d 100644 +index 909b3f7961c..138e35883d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -578,6 +578,59 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device) @@ -148,7 +148,7 @@ index d14b40d8e3e..995410e984d 100644 static bool wined3d_null_image_vk_init(struct wined3d_image_vk *image, struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int layer_count, unsigned int sample_count) { -@@ -1273,6 +1326,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) +@@ -1283,6 +1336,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) wined3d_device_gl_create_dummy_textures(device_gl, context_gl); wined3d_device_create_default_samplers(device, context); @@ -157,10 +157,10 @@ index d14b40d8e3e..995410e984d 100644 } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index f79fa1571e6..85ef1c8ecd7 100644 +index abbbf407f33..d0be8f975db 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c -@@ -732,6 +732,113 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b +@@ -744,6 +744,113 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b ERR("Unmapped sampler %u.\n", sampler_idx); } @@ -274,7 +274,7 @@ index f79fa1571e6..85ef1c8ecd7 100644 /* Context activation is done by the caller. */ static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) -@@ -2413,7 +2520,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c +@@ -2551,7 +2658,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c break; } @@ -285,7 +285,7 @@ index f79fa1571e6..85ef1c8ecd7 100644 shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, version, entry->bind_idx); shader_addline(buffer, "uniform %s%s %s_sampler%u;\n", sampler_type_prefix, sampler_type, prefix, entry->bind_idx); -@@ -7514,6 +7623,8 @@ static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *b +@@ -7652,6 +7761,8 @@ static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *b static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { @@ -294,7 +294,7 @@ index f79fa1571e6..85ef1c8ecd7 100644 if (gl_info->supported[ARB_CULL_DISTANCE]) shader_addline(buffer, "#extension GL_ARB_cull_distance : enable\n"); if (gl_info->supported[ARB_GPU_SHADER5]) -@@ -11519,6 +11630,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = +@@ -11792,6 +11903,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = shader_glsl_get_caps, shader_glsl_color_fixup_supported, shader_glsl_has_ffp_proj_control, @@ -303,10 +303,10 @@ index f79fa1571e6..85ef1c8ecd7 100644 }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c -index 6282883ed04..51c95b73e9e 100644 +index 68f9fe4cb90..132a1213518 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c -@@ -3276,6 +3276,12 @@ static BOOL shader_none_has_ffp_proj_control(void *shader_priv) +@@ -3292,6 +3292,12 @@ static BOOL shader_none_has_ffp_proj_control(void *shader_priv) return priv->ffp_proj_control; } @@ -319,7 +319,7 @@ index 6282883ed04..51c95b73e9e 100644 static uint64_t shader_none_shader_compile(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc, enum wined3d_shader_type shader_type) { -@@ -3301,6 +3307,7 @@ const struct wined3d_shader_backend_ops none_shader_backend = +@@ -3317,6 +3323,7 @@ const struct wined3d_shader_backend_ops none_shader_backend = shader_none_get_caps, shader_none_color_fixup_supported, shader_none_has_ffp_proj_control, @@ -328,10 +328,10 @@ index 6282883ed04..51c95b73e9e 100644 }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index fdd2c70c667..5ebc012a20e 100644 +index ae188ba4290..684d355bf8f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1239,7 +1239,7 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_ +@@ -1258,7 +1258,7 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_ } /* Context activation is done by the caller. */ @@ -340,7 +340,7 @@ index fdd2c70c667..5ebc012a20e 100644 struct wined3d_context_gl *context_gl, BOOL srgb) { const struct wined3d_format *format = texture_gl->t.resource.format; -@@ -1263,10 +1263,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, +@@ -1282,10 +1282,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, target = texture_gl->target; if (gl_tex->name) @@ -352,7 +352,7 @@ index fdd2c70c667..5ebc012a20e 100644 gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name); checkGLcall("glGenTextures"); -@@ -1275,7 +1272,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, +@@ -1294,7 +1291,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, if (!gl_tex->name) { ERR("Failed to generate a texture name.\n"); @@ -361,7 +361,7 @@ index fdd2c70c667..5ebc012a20e 100644 } /* Initialise the state of the texture object to the OpenGL defaults, not -@@ -1359,6 +1356,15 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, +@@ -1378,6 +1375,15 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); checkGLcall("set format swizzle"); } @@ -378,10 +378,10 @@ index fdd2c70c667..5ebc012a20e 100644 /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c -index 087aa21b75d..62a27535baa 100644 +index 65d7bd67ada..90df50e2e7f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c -@@ -1201,6 +1201,36 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl +@@ -1248,6 +1248,36 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl wined3d_sampler_gl_bind(sampler_gl, unit, texture_gl, context_gl); } @@ -419,7 +419,7 @@ index 087aa21b75d..62a27535baa 100644 static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h -index 7b6fa50c5f0..a8186c169e0 100644 +index 75c4cd732ab..ccc1ce2f0ff 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -42,6 +42,7 @@ enum wined3d_gl_extension @@ -431,10 +431,10 @@ index 7b6fa50c5f0..a8186c169e0 100644 ARB_BUFFER_STORAGE, ARB_CLEAR_BUFFER_OBJECT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 5b3eb0136b0..c28d3608ba5 100644 +index bb6dcf78ae6..8a5ea778b3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -95,6 +95,7 @@ struct wined3d_adapter; +@@ -88,6 +88,7 @@ struct wined3d_adapter; struct wined3d_buffer_vk; struct wined3d_context; struct wined3d_context_vk; @@ -442,7 +442,7 @@ index 5b3eb0136b0..c28d3608ba5 100644 struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; -@@ -1506,6 +1507,8 @@ struct wined3d_shader_backend_ops +@@ -1612,6 +1613,8 @@ struct wined3d_shader_backend_ops void (*shader_get_caps)(const struct wined3d_adapter *adapter, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); BOOL (*shader_has_ffp_proj_control)(void *shader_priv); @@ -451,7 +451,7 @@ index 5b3eb0136b0..c28d3608ba5 100644 uint64_t (*shader_compile)(struct wined3d_context *context, const struct wined3d_shader_desc *shader_desc, enum wined3d_shader_type shader_type); }; -@@ -3825,6 +3828,21 @@ struct wined3d_dummy_textures +@@ -3962,6 +3965,21 @@ struct wined3d_dummy_textures GLuint tex_2d_ms_array; }; @@ -473,7 +473,7 @@ index 5b3eb0136b0..c28d3608ba5 100644 #define WINED3D_UNMAPPED_STAGE ~0u /* Multithreaded flag. Removed from the public header to signal that -@@ -3900,6 +3918,9 @@ struct wined3d_device +@@ -4037,6 +4055,9 @@ struct wined3d_device struct wined3d_sampler *default_sampler; struct wined3d_sampler *null_sampler; @@ -483,16 +483,16 @@ index 5b3eb0136b0..c28d3608ba5 100644 /* Command stream */ struct wined3d_cs *cs; -@@ -4569,6 +4590,8 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, +@@ -4735,6 +4756,8 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, struct wined3d_bo_address *data, uint32_t location) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; +GLuint wined3d_texture_get_name(struct wined3d_texture_gl *texture_gl, + struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, uint32_t location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, -@@ -5372,6 +5395,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view +@@ -5547,6 +5570,8 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; @@ -502,5 +502,5 @@ index 5b3eb0136b0..c28d3608ba5 100644 struct wined3d_view_vk { -- -2.35.1 +2.38.1 diff --git a/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch b/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch index f8109fcb..0257d220 100644 --- a/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch +++ b/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch @@ -1,4 +1,4 @@ -From aeaff5bd1a2a1940d6e28388aabc1bc9b7608cd8 Mon Sep 17 00:00:00 2001 +From f678ed41b4306e31b6a95282710c2bf3a5abb1be Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 10 Feb 2016 15:09:29 +0800 Subject: [PATCH] winex11.drv: Add support for _NET_ACTIVE_WINDOW. (v2) @@ -17,10 +17,10 @@ For bug #2155. 7 files changed, 65 insertions(+) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index 4a853b516f4..35eab0ec13c 100644 +index 557d555d673..c8077a73e32 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c -@@ -833,6 +833,10 @@ static BOOL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) +@@ -828,6 +828,10 @@ static BOOL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) hdc, rect.left - dx, rect.top - dy, SRCCOPY, 0, 0 ); } @@ -31,7 +31,7 @@ index 4a853b516f4..35eab0ec13c 100644 static void nulldrv_SetCapture( HWND hwnd, UINT flags ) { } -@@ -1196,6 +1200,7 @@ static const struct user_driver_funcs lazy_load_driver = +@@ -1190,6 +1194,7 @@ static const struct user_driver_funcs lazy_load_driver = nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, nulldrv_ScrollDC, @@ -39,7 +39,7 @@ index 4a853b516f4..35eab0ec13c 100644 nulldrv_SetCapture, nulldrv_SetFocus, loaderdrv_SetLayeredWindowAttributes, -@@ -1270,6 +1275,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version +@@ -1264,6 +1269,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(ReleaseDC); SET_USER_FUNC(ScrollDC); @@ -48,7 +48,7 @@ index 4a853b516f4..35eab0ec13c 100644 SET_USER_FUNC(SetFocus); SET_USER_FUNC(SetLayeredWindowAttributes); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c -index cbfb228ea09..2c73b4c9eb9 100644 +index 86edf66b820..f2b965706f4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -595,6 +595,9 @@ static void set_focus( Display *display, HWND hwnd, Time time ) @@ -61,7 +61,7 @@ index cbfb228ea09..2c73b4c9eb9 100644 TRACE( "setting foreground window to %p\n", hwnd ); NtUserSetForegroundWindow( hwnd ); -@@ -851,6 +854,8 @@ static void focus_out( Display *display , HWND hwnd ) +@@ -853,6 +856,8 @@ static void focus_out( Display *display , HWND hwnd ) if (!focus_win) { @@ -71,7 +71,7 @@ index cbfb228ea09..2c73b4c9eb9 100644 Foreground window, because in most cases the messages sent above must have already changed the foreground window, in which diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index 618bc844f05..533e60a4871 100644 +index ba9aff82a06..0b80a660e9a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -418,6 +418,7 @@ static const struct user_driver_funcs x11drv_funcs = @@ -83,10 +83,10 @@ index 618bc844f05..533e60a4871 100644 .pSetFocus = X11DRV_SetFocus, .pSetLayeredWindowAttributes = X11DRV_SetLayeredWindowAttributes, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c -index 3ebbee0856e..6c52e1841df 100644 +index 603314ff3bb..49ee4b75052 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c -@@ -2383,6 +2383,54 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) +@@ -2431,6 +2431,54 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) } @@ -142,10 +142,10 @@ index 3ebbee0856e..6c52e1841df 100644 * SetCapture (X11DRV.@) */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 49c2380559e..d8b5a99fec2 100644 +index cd5f203c377..5e9ae21ab0d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -228,6 +228,7 @@ extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, +@@ -227,6 +227,7 @@ extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, const RECT *top_rect, DWORD flags ) DECLSPEC_HIDDEN; extern void X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) DECLSPEC_HIDDEN; @@ -153,7 +153,7 @@ index 49c2380559e..d8b5a99fec2 100644 extern void X11DRV_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN; extern void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) DECLSPEC_HIDDEN; -@@ -369,6 +370,7 @@ struct x11drv_thread_data +@@ -377,6 +378,7 @@ struct x11drv_thread_data Display *display; XEvent *current_event; /* event currently being processed */ HWND grab_hwnd; /* window that currently grabs the mouse */ @@ -161,31 +161,31 @@ index 49c2380559e..d8b5a99fec2 100644 HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ -@@ -479,6 +481,7 @@ enum x11drv_atoms - XATOM_DndSelection, +@@ -485,6 +487,7 @@ enum x11drv_atoms XATOM__ICC_PROFILE, + XATOM__KDE_NET_WM_STATE_SKIP_SWITCHER, XATOM__MOTIF_WM_HINTS, + XATOM__NET_ACTIVE_WINDOW, XATOM__NET_STARTUP_INFO_BEGIN, XATOM__NET_STARTUP_INFO, XATOM__NET_SUPPORTED, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c -index dc987ae70a2..8ebec6301f2 100644 +index 797e4f92d38..d0c8d8a28e1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c -@@ -156,6 +156,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = - "DndSelection", +@@ -157,6 +157,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_ICC_PROFILE", + "_KDE_NET_WM_STATE_SKIP_SWITCHER", "_MOTIF_WM_HINTS", + "_NET_ACTIVE_WINDOW", "_NET_STARTUP_INFO_BEGIN", "_NET_STARTUP_INFO", "_NET_SUPPORTED", diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index 998aa3ed3e9..9be79656f0e 100644 +index d074c09cceb..d45a894adf2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h -@@ -307,6 +307,7 @@ struct user_driver_funcs +@@ -310,6 +310,7 @@ struct user_driver_funcs NTSTATUS (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,const LARGE_INTEGER*,DWORD,DWORD); void (*pReleaseDC)(HWND,HDC); BOOL (*pScrollDC)(HDC,INT,INT,HRGN); @@ -194,5 +194,5 @@ index 998aa3ed3e9..9be79656f0e 100644 void (*pSetFocus)(HWND); void (*pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); -- -2.35.1 +2.38.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index ea522ba7..b307a07d 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -20d86f34a066657048610803e7143232efa6c0d3 +6905b76b9400209ded97983ceca9f9c15de22d98