May 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winemac: Get rid of unnecessary blit_data / drawn surface members.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 4d659e65c2d514df83537c4e09ba2b7d12433afd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d659e65c2d514df83537c4e09ba2b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 00:51:31 2024 +0200 winemac: Get rid of unnecessary blit_data / drawn surface members. --- dlls/winemac.drv/cocoa_window.m | 29 +++----- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_cocoa.h | 7 +- dlls/winemac.drv/surface.c | 146 ++++++---------------------------------- dlls/winemac.drv/window.c | 4 +- 5 files changed, 38 insertions(+), 149 deletions(-)

1 0

Rémi Bernon : wineandroid: Hold the lock while reading window surface bits.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: b44730a39e78d692c15624ea45d8c0a41466c7cc URL: https://gitlab.winehq.org/wine/wine/-/commit/b44730a39e78d692c15624ea45d8c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 16:20:52 2024 +0200 wineandroid: Hold the lock while reading window surface bits. To avoid hiding the change in the next commit. --- dlls/wineandroid.drv/window.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 8314876f1c4..d1c93b5ceff 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -695,8 +695,12 @@ static void android_surface_flush( struct window_surface *window_surface ) surface->header.rect.bottom - surface->header.rect.top ); needs_flush = intersect_rect( &rect, &rect, &window_surface->bounds ); reset_bounds( &window_surface->bounds ); - window_surface_unlock( window_surface ); - if (!needs_flush) return; + + if (!needs_flush) + { + window_surface_unlock( window_surface ); + return; + } TRACE( "flushing %p hwnd %p surface %s rect %s bits %p alpha %02x key %08x region %u rects\n", surface, surface->hwnd, wine_dbgstr_rect( &surface->header.rect ), @@ -760,6 +764,8 @@ static void android_surface_flush( struct window_surface *window_surface ) } else TRACE( "Unable to lock surface %p window %p buffer %p\n", surface, surface->hwnd, surface->window ); + + window_surface_unlock( window_surface ); } /***********************************************************************

1 0

Rémi Bernon : win32u: Use a helper to flush window surface, factor locking and bounds reset.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 5d0efbcc6e88e2b7886f2a0cfb58c9100b452160 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d0efbcc6e88e2b7886f2a0cfb58c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 11:21:12 2024 +0200 win32u: Use a helper to flush window surface, factor locking and bounds reset. --- dlls/win32u/dce.c | 27 +++++++++--- dlls/win32u/dibdrv/dc.c | 2 +- dlls/wineandroid.drv/window.c | 65 +++++++++------------------- dlls/winemac.drv/surface.c | 16 ++----- dlls/winemac.drv/window.c | 2 +- dlls/winewayland.drv/window.c | 2 +- dlls/winewayland.drv/window_surface.c | 22 ++-------- dlls/winex11.drv/bitblt.c | 80 +++++++++++++---------------------- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 6 +-- include/wine/gdi_driver.h | 3 +- 11 files changed, 86 insertions(+), 141 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context.fog_coord field.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 7693cbe39ca9c6808a447befa9aa679761e1a3d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7693cbe39ca9c6808a447befa9aa67… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:05:59 2024 -0500 wined3d: Remove the no longer used wined3d_context.fog_coord field. --- dlls/wined3d/context_gl.c | 13 ------------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d245a87526f..9a85e0a4c86 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4883,19 +4883,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s WARN_(d3d_perf)("Using software emulation because not all material properties could be tracked.\n"); emulation = TRUE; } - else if (context->fog_coord && state->render_states[WINED3D_RS_FOGENABLE]) - { - static BOOL warned; - - /* Either write a pipeline replacement shader or convert the - * specular alpha from unsigned byte to a float in the vertex - * buffer. */ - if (!warned++) - FIXME("Using software emulation because manual fog coordinates are provided.\n"); - else - WARN_(d3d_perf)("Using software emulation because manual fog coordinates are provided.\n"); - emulation = TRUE; - } if (emulation) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17b57424839..3fc9dfb9a8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1930,7 +1930,6 @@ struct wined3d_context DWORD uses_fbo_attached_resources : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; - DWORD fog_coord : 1; DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; @@ -1938,7 +1937,7 @@ struct wined3d_context DWORD update_primitive_type : 1; DWORD update_patch_vertex_count : 1; DWORD update_multisample_state : 1; - DWORD padding : 11; + DWORD padding : 12; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context_gl.untracked_material_count field.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: c85ae9eba2785f10ae72a73d92d3b6eb8cd55832 URL: https://gitlab.winehq.org/wine/wine/-/commit/c85ae9eba2785f10ae72a73d92d3b6… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:08:20 2024 -0500 wined3d: Remove the no longer used wined3d_context_gl.untracked_material_count field. --- dlls/wined3d/context_gl.c | 55 +++++------------------------------------------ dlls/wined3d/wined3d_gl.h | 3 +-- 2 files changed, 6 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9a85e0a4c86..310473138a4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4704,28 +4704,6 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ checkGLcall("draw indirect"); } -static void remove_vbos(struct wined3d_context *context, - const struct wined3d_state *state, struct wined3d_stream_info *s) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(s->elements); ++i) - { - struct wined3d_stream_info_element *e; - - if (!(s->use_map & (1u << i))) - continue; - - e = &s->elements[i]; - if (e->data.buffer_object) - { - struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; - e->data.buffer_object = 0; - e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context); - } - } -} - static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) { GLenum gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); @@ -4756,14 +4734,13 @@ static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primiti void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) { - BOOL emulation = FALSE, rasterizer_discard = FALSE; const struct wined3d_fb_state *fb = &state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_rendertarget_view *dsv, *rtv; - struct wined3d_stream_info si_emulated; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; + bool rasterizer_discard = false; unsigned int i, idx_size = 0; const void *idx_data = NULL; @@ -4870,28 +4847,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s idx_size = 4; } - if (!use_vs(state)) - { - if (!stream_info->position_transformed && context_gl->untracked_material_count - && state->render_states[WINED3D_RS_LIGHTING]) - { - static BOOL warned; - - if (!warned++) - FIXME("Using software emulation because not all material properties could be tracked.\n"); - else - WARN_(d3d_perf)("Using software emulation because not all material properties could be tracked.\n"); - emulation = TRUE; - } - - if (emulation) - { - si_emulated = context->stream_info; - remove_vbos(context, state, &si_emulated); - stream_info = &si_emulated; - } - } - if (use_transform_feedback(state)) { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; @@ -4900,7 +4855,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s { glEnable(GL_RASTERIZER_DISCARD); checkGLcall("enable rasterizer discard"); - rasterizer_discard = TRUE; + rasterizer_discard = true; } if (context->transform_feedback_paused) @@ -4952,16 +4907,16 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { - if (!context->use_immediate_mode_draw && !emulation) + if (!context->use_immediate_mode_draw) wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); else - FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); + FIXME("Indirect draws with immediate mode are not supported.\n"); } else { unsigned int instance_count = parameters->u.direct.instance_count; - if (context->use_immediate_mode_draw || emulation) + if (context->use_immediate_mode_draw) draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, idx_size, parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, parameters->u.direct.index_count, instance_count); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9a27bb5b2bf..2da6add961d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -615,11 +615,10 @@ struct wined3d_context_gl uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t untracked_material_count : 2; /* Max value 2 */ uint32_t needs_set : 1; uint32_t internal_format_set : 1; uint32_t valid : 1; - uint32_t padding : 22; + uint32_t padding : 24; uint32_t default_attrib_value_set;

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context.use_immediate_mode_draw field.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: a7d33cb73b7b5b582be2092b7db8d59b1dda019d URL: https://gitlab.winehq.org/wine/wine/-/commit/a7d33cb73b7b5b582be2092b7db8d5… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:14:54 2024 -0500 wined3d: Remove the no longer used wined3d_context.use_immediate_mode_draw field. --- dlls/wined3d/adapter_gl.c | 108 ----------------------------------------- dlls/wined3d/context.c | 2 - dlls/wined3d/context_gl.c | 82 ++----------------------------- dlls/wined3d/wined3d_gl.h | 7 --- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 6 insertions(+), 196 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used WINED3D_SHADER_CAP_VS_CLIPPING flag.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: f31849ba8b4cb168f19b824dfff22a58b306640d URL: https://gitlab.winehq.org/wine/wine/-/commit/f31849ba8b4cb168f19b824dfff22a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:24:31 2024 -0500 wined3d: Remove the no longer used WINED3D_SHADER_CAP_VS_CLIPPING flag. --- dlls/wined3d/adapter_gl.c | 1 - dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/ffp_gl.c | 15 --------------- dlls/wined3d/glsl_shader.c | 8 +------- dlls/wined3d/shader_spirv.c | 3 +-- dlls/wined3d/utils.c | 11 ----------- dlls/wined3d/wined3d_private.h | 5 +---- 7 files changed, 3 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 823304600f6..56aa9b73269 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4909,7 +4909,6 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->wined3d_creation_flags = wined3d_creation_flags; d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; - d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8e004339525..aa02d03b7a4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2327,7 +2327,6 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; d3d_info->ffp_alpha_test = false; - d3d_info->vs_clipping = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING); d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index e2b9be647d0..b1a3c56a097 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -537,21 +537,6 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state struct wined3d_context_gl *context_gl = wined3d_context_gl(context); uint32_t enable_mask; - if (use_vs(state) && !context->d3d_info->vs_clipping) - { - static BOOL warned; - - /* The OpenGL spec says that clipping planes are disabled when using - * shaders. Direct3D planes aren't, so that is an issue. The MacOS ATI - * driver keeps clipping planes activated with shaders in some - * conditions I got sick of tracking down. The shader state handler - * disables all clip planes because of that - don't do anything here - * and keep them disabled. */ - if (state->render_states[WINED3D_RS_CLIPPLANEENABLE] && !warned++) - FIXME("Clipping not supported with vertex shaders.\n"); - return; - } - /* glEnable(GL_CLIP_PLANEx) doesn't apply to (ARB backend) vertex shaders. * The enabled / disabled planes are hardcoded into the shader. Update the * shader to update the enabled clipplanes. In case of fixed function, we diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c114734e013..13ba1d65d13 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9594,7 +9594,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * const struct wined3d_gl_info *gl_info = context_gl->gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); BOOL tempreg_used = FALSE, tfactor_used = FALSE; - UINT lowest_disabled_stage; GLuint shader_id; DWORD arg0, arg1, arg2; unsigned int stage; @@ -9660,7 +9659,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) tss_const_map |= 1u << stage; } - lowest_disabled_stage = stage; shader_glsl_add_version_declaration(buffer, gl_info); @@ -9799,9 +9797,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (legacy_syntax && settings->fog != WINED3D_FFP_PS_FOG_OFF) shader_addline(buffer, "ffp_varying_fogcoord = gl_FogFragCoord;\n"); - if (lowest_disabled_stage < 7 && settings->emul_clipplanes) - shader_addline(buffer, "if (any(lessThan(ffp_texcoord[7], vec4(0.0)))) discard;\n"); - /* Generate texture sampling instructions */ for (stage = 0; stage < WINED3D_MAX_FFP_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { @@ -11373,8 +11368,7 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before * shader_glsl_alloc(). */ - caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING - | WINED3D_SHADER_CAP_SRGB_WRITE; + caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; if (shader_glsl_full_ffp_varyings(gl_info)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1079c19b99b..37fc1cb22d1 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1076,8 +1076,7 @@ static void shader_spirv_get_caps(const struct wined3d_adapter *adapter, struct caps->ps_uniform_count = WINED3D_MAX_PS_CONSTS_F; caps->ps_1x_max_value = FLT_MAX; caps->varying_count = 0; - caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING - | WINED3D_SHADER_CAP_SRGB_WRITE + caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE | WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7e4fe21e727..ef95c40135a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6491,17 +6491,6 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st } } settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, &state->fb); - if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] - || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) - { - /* No need to emulate clipplanes if GL supports native vertex shader clipping or if - * the fixed function vertex pipeline is used(which always supports clipplanes), or - * if no clipplane is enabled - */ - settings->emul_clipplanes = 0; - } else { - settings->emul_clipplanes = 1; - } texture = wined3d_state_get_ffp_texture(state, 0); if (state->render_states[WINED3D_RS_COLORKEYENABLE] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34c820497ad..c762de4b5bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -222,7 +222,6 @@ struct wined3d_d3d_info uint32_t wined3d_creation_flags; uint32_t emulated_flatshading : 1; uint32_t ffp_alpha_test : 1; - uint32_t vs_clipping : 1; uint32_t shader_double_precision : 1; uint32_t shader_output_interpolation : 1; uint32_t viewport_array_index_any_shader : 1; @@ -1402,7 +1401,6 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001u #define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u #define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u #define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u @@ -2669,9 +2667,8 @@ struct texture_stage_op struct ffp_frag_settings { struct texture_stage_op op[WINED3D_MAX_FFP_TEXTURES]; - enum wined3d_ffp_ps_fog_mode fog; + unsigned char fog; /* enum wined3d_ffp_ps_fog_mode */ unsigned char sRGB_write; - unsigned char emul_clipplanes; unsigned char texcoords_initialized; unsigned char color_key_enabled : 1; unsigned char pointsprite : 1;

1 0

Fabian Maurer : riched20: In para_set_fmt protect against out of bound cTabStop values.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 7b2ff977739df25252d46552d2447af50c23040e URL: https://gitlab.winehq.org/wine/wine/-/commit/7b2ff977739df25252d46552d2447a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun May 26 19:20:07 2024 +0200 riched20: In para_set_fmt protect against out of bound cTabStop values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56730 --- dlls/riched20/para.c | 5 +++-- dlls/riched20/tests/editor.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index a380f45e556..2c9e2892189 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -486,8 +486,9 @@ static BOOL para_set_fmt( ME_TextEditor *editor, ME_Paragraph *para, const PARAF COPY_FIELD(PFM_ALIGNMENT, wAlignment); if (dwMask & PFM_TABSTOPS) { - para->fmt.cTabCount = pFmt->cTabCount; - memcpy(para->fmt.rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); + /* Clamp between 0 and MAX_TAB_STOPS */ + para->fmt.cTabCount = max(0, min(pFmt->cTabCount, MAX_TAB_STOPS)); + memcpy(para->fmt.rgxTabs, pFmt->rgxTabs, para->fmt.cTabCount * sizeof(LONG)); } #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f8abb7a3e65..19cd40aea48 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8802,6 +8802,35 @@ static void test_alignment_style(void) SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); ok(pf.wAlignment == align_mask[i], "got %d expect %ld\n", pf.wAlignment, align_mask[i]); + /* Test out of bounds tab count */ + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = -25000; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == -25000, "Got %d\n", pf.cTabCount); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 0, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 25000; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 25000, "Got %d\n", pf.cTabCount); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 32, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 32; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 32, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 33; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 32, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 1; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 1, "Got %d\n", pf.cTabCount); + DestroyWindow(richedit); }

1 0

Henri Verbeet : Release 1.12.
by Alexandre Julliard 29 May '24

29 May '24

Module: vkd3d Branch: master Commit: 36c123c0056abd227ddfaac37a2a0902ac2f4bc5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/36c123c0056abd227ddfaac37a2a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 12:00:00 2024 +0200 Release 1.12. --- ANNOUNCE | 1398 ++++++++++++++++++----------------- ChangeLog.md | 153 ++++ Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 6 +- libs/vkd3d/state.c | 6 +- programs/vkd3d-compiler/main.c | 2 +- tests/shader_runner_gl.c | 2 +- tests/shader_runner_vulkan.c | 2 +- 13 files changed, 901 insertions(+), 682 deletions(-)

1 0

Tag vkd3d-1.12 : Alexandre Julliard : Release 1.12
by Alexandre Julliard 29 May '24

29 May '24

Module: vkd3d Branch: refs/tags/vkd3d-1.12 Tag: db51675aad3bc48ecce94881c728149d1c699dc4 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/db51675aad3bc48ecce94881c728149… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 22:08:03 2024 +0200 Release 1.12

1 0