January 2016 - Wine-commits

Józef Kucia : wined3d: Add EXT_texture_integer extension.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 5b9400ff77d905a68ccaf42c35a6b0453b0ee92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9400ff77d905a68ccaf42c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 25 10:57:20 2016 +0100 wined3d: Add EXT_texture_integer extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1b90854..4928647 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -194,6 +194,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, + {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, @@ -3408,6 +3409,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, + {EXT_TEXTURE_INTEGER, MAKEDWORD_VERSION(3, 0)}, /* We don't want to enable EXT_GPU_SHADER4: even though similar * functionality is available in core GL 3.0 / GLSL 1.30, it's different * enough that reusing the same flag for the new features hurts more diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index eabea36..b13c551 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -128,6 +128,7 @@ enum wined3d_gl_extension EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC, + EXT_TEXTURE_INTEGER, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SNORM,

1 0

Józef Kucia : wined3d: Set default sampler filtering to NEAREST.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 519717459d29d5e8419e4b45c0ffdcecd004a05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=519717459d29d5e8419e4b45c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 25 10:57:23 2016 +0100 wined3d: Set default sampler filtering to NEAREST. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c058881..046b04d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -790,11 +790,13 @@ static void create_default_sampler(struct wined3d_device *device) { GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); checkGLcall("glGenSamplers"); + GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); + GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST)); if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT)); - checkGLcall("glSamplerParamteri"); } + checkGLcall("glSamplerParamteri"); } else {

1 0

Józef Kucia : wined3d: Add support for integer samplers.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: be84caf85c0dcf3d59b2d5f073cb6a316e4456c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be84caf85c0dcf3d59b2d5f07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 25 10:57:24 2016 +0100 wined3d: Add support for integer samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8dc97b9..f08cc02 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1734,8 +1734,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < reg_maps->sampler_map.count; ++i) { struct wined3d_shader_sampler_map_entry *entry; + const char *sampler_type_prefix, *sampler_type; BOOL shadow_sampler, tex_rect; - const char *sampler_type; entry = &reg_maps->sampler_map.entries[i]; @@ -1745,6 +1745,28 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont continue; } + switch (reg_maps->resource_info[entry->resource_idx].data_type) + { + case WINED3D_DATA_FLOAT: + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: + sampler_type_prefix = ""; + break; + + case WINED3D_DATA_INT: + sampler_type_prefix = "i"; + break; + + case WINED3D_DATA_UINT: + sampler_type_prefix = "u"; + break; + + default: + sampler_type_prefix = ""; + ERR("Unhandled resource data type %#x.\n", reg_maps->resource_info[i].data_type); + break; + } + shadow_sampler = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->shadow & (1u << entry->sampler_idx)); switch (reg_maps->resource_info[entry->resource_idx].type) { @@ -1792,7 +1814,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[i].type); break; } - shader_addline(buffer, "uniform %s %s_sampler%u;\n", sampler_type, prefix, entry->bind_idx); + shader_addline(buffer, "uniform %s%s %s_sampler%u;\n", + sampler_type_prefix, sampler_type, prefix, entry->bind_idx); } /* Declare uniforms for NP2 texcoord fixup:

1 0

Józef Kucia : wined3d: Make distinction between sampler index and sampler bind index.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: d575e0afe304d0096f8014f7f411bf28c126cc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d575e0afe304d0096f8014f7f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 25 10:57:27 2016 +0100 wined3d: Make distinction between sampler index and sampler bind index. For SM4+ sampler index is not necessarily equal to sampler bind index. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f08cc02..4d8cac1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2832,7 +2832,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction } static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_shader_instruction *ins, - DWORD sampler, const struct glsl_sample_function *sample_function, DWORD swizzle, + unsigned int sampler_bind_idx, const struct glsl_sample_function *sample_function, DWORD swizzle, const char *dx, const char *dy, const char *bias, const char *coord_reg_fmt, ...) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -2850,9 +2850,9 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (version->type == WINED3D_SHADER_TYPE_PIXEL && version->major < 4) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - fixup = priv->cur_ps_args->color_fixup[sampler]; + fixup = priv->cur_ps_args->color_fixup[sampler_bind_idx]; - if (priv->cur_ps_args->np2_fixup & (1u << sampler)) + if (priv->cur_ps_args->np2_fixup & (1u << sampler_bind_idx)) np2_fixup = TRUE; } else @@ -2866,7 +2866,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_addline(ins->ctx->buffer, "vec4("); shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", - sample_function->name->buffer, shader_glsl_get_prefix(version->type), sampler); + sample_function->name->buffer, shader_glsl_get_prefix(version->type), sampler_bind_idx); for (;;) { @@ -2882,7 +2882,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (np2_fixup) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; + const unsigned char idx = priv->cur_np2fixup_info->idx[sampler_bind_idx]; switch (shader_glsl_get_write_mask_size(sample_function->coord_mask)) { @@ -4281,7 +4281,7 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; enum wined3d_shader_resource_type resource_type; - unsigned int resource_idx, sampler_idx, i; + unsigned int resource_idx, sampler_bind_idx, i; enum wined3d_data_type dst_data_type; struct glsl_src_param lod_param; char dst_swizzle[6]; @@ -4299,7 +4299,7 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) resource_idx = ins->src[1].reg.idx[0].offset; resource_type = ins->ctx->reg_maps->resource_info[resource_idx].type; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &lod_param); - sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); if (resource_type >= ARRAY_SIZE(texture_size_component_count)) @@ -4314,7 +4314,7 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "vec4("); shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", - shader_glsl_get_prefix(version->type), sampler_idx, lod_param.param_str); + shader_glsl_get_prefix(version->type), sampler_bind_idx, lod_param.param_str); for (i = 0; i < 3 - texture_size_component_count[resource_type]; ++i) shader_addline(ins->ctx->buffer, "0, "); @@ -4322,7 +4322,7 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) { shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", - shader_glsl_get_prefix(version->type), sampler_idx); + shader_glsl_get_prefix(version->type), sampler_bind_idx); } else { @@ -4338,15 +4338,15 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - unsigned int sampler_idx; + unsigned int sampler_bind_idx; shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, WINED3D_GLSL_SAMPLE_LOAD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4355,13 +4355,13 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) { struct glsl_sample_function sample_function; struct glsl_src_param coord_param; - unsigned int sampler_idx; + unsigned int sampler_bind_idx; shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, 0, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); - sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, NULL, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4370,15 +4370,15 @@ static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins) { struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - unsigned int sampler_idx; + unsigned int sampler_bind_idx; shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, WINED3D_GLSL_SAMPLE_LOD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); - sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Stefan Dösinger : ddraw/tests: Port test_lockrect_invalid to other versions.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 4fac292ee83f9e2cf4f2817282ee68f2efd3d799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fac292ee83f9e2cf4f281728… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jan 21 16:40:13 2016 +0100 ddraw/tests: Port test_lockrect_invalid to other versions. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 148 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 152 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 151 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 165 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 121 -------------------------------- 5 files changed, 616 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fac292ee83f9e2cf4f28…

1 0

Nikolay Sivov : dwrite: Cluster text position is relative to initial run.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 91df67df0c1804c81e242e5281f1835e06f0fbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=91df67df0c1804c81e242e528… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:57 2016 +0300 dwrite: Cluster text position is relative to initial run. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9109924..b5f6aa8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -601,7 +601,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, } metrics->length = length; - position = stop_position; + position = run->descr.textPosition + stop_position; if (stop_glyph == run->glyphcount) breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; else {

1 0

Nikolay Sivov : dwrite: Fix off by one issue in line breaking rule LB21a.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 68c45de6ae48743bf813c35b4e2c9c0fbb8891d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c45de6ae48743bf813c35b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:58 2016 +0300 dwrite: Fix off by one issue in line breaking rule LB21a. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index af034d1..a55b27f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -524,7 +524,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB21a */ case b_HL: - if (i < count-2) + if (i < count-1) switch (break_class[i+1]) { case b_HY:

1 0

Nikolay Sivov : dwrite: Update line breaking logic with Unicode 8.0.0 modifications.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 10b843bb22fa21e73943a19adb3109d1291899a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b843bb22fa21e73943a19ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:59 2016 +0300 dwrite: Update line breaking logic with Unicode 8.0.0 modifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a55b27f..094fb69 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -522,8 +522,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_BB: set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; - /* LB21a */ + /* LB21a, LB21b */ case b_HL: + /* LB21a */ if (i < count-1) switch (break_class[i+1]) { @@ -531,6 +532,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_BA: set_break_condition(i+1, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); } + /* LB21b */ + if (i > 0 && break_class[i-1] == b_SY) + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; /* LB22 */ case b_IN: @@ -540,6 +544,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B { case b_AL: case b_HL: + case b_EX: case b_ID: case b_IN: case b_NU:

1 0

Nikolay Sivov : dwrite: Don' t check for line overflow for DWRITE_WORD_WRAPPING_NO_WRAP mode.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 2626f80b011754bff36ac756e136d566bbaacd64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2626f80b011754bff36ac756e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:11:00 2016 +0300 dwrite: Don't check for line overflow for DWRITE_WORD_WRAPPING_NO_WRAP mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 ++- dlls/dwrite/tests/layout.c | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b5f6aa8..d0d6b3f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1606,7 +1606,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } overflow = layout->clustermetrics[i].canWrapLineAfter && - (width + layout->clustermetrics[i].width > layout->metrics.layoutWidth); + (width + layout->clustermetrics[i].width > layout->metrics.layoutWidth) && + (layout->format.wrapping != DWRITE_WORD_WRAPPING_NO_WRAP); /* check if we got new */ if (overflow || layout->clustermetrics[i].isNewline || /* always wrap on new line */ diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c112ebd..cbc222f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1084,7 +1084,6 @@ if (0) {/* crashes on native */ metrics.supportsSideways = TRUE; hr = IDWriteInlineObject_GetMetrics(sign, &metrics); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(metrics.width > 0.0, "got %.2f\n", metrics.width); ok(metrics.height == 0.0, "got %.2f\n", metrics.height); ok(metrics.baseline == 0.0, "got %.2f\n", metrics.baseline); @@ -1786,7 +1785,6 @@ todo_wine hr = IDWriteInlineObject_GetMetrics(trimm, &inline_metrics); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(inline_metrics.width > 0.0 && inline_metrics.width == metrics[0].width, "got %.2f, expected %.2f\n", inline_metrics.width, metrics[0].width); @@ -3314,7 +3312,6 @@ static void test_SetTextAlignment(void) hr = IDWriteTextLayout_GetMetrics(layout, &metrics); ok(hr == S_OK, "got 0x%08x\n", hr); ok(metrics.left == metrics.layoutWidth - metrics.width, "got %.2f\n", metrics.left); -todo_wine ok(metrics.width == 5*clusters[0].width, "got %.2f\n", metrics.width); ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); IDWriteTextLayout_Release(layout); @@ -3705,11 +3702,13 @@ static void test_pixelsnapping(void) static void test_SetWordWrapping(void) { - static const WCHAR strW[] = {'a',0}; + static const WCHAR strW[] = {'a',' ','s','o','m','e',' ','t','e','x','t',' ','a','n','d', + ' ','a',' ','b','i','t',' ','m','o','r','e','\n','b'}; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; DWRITE_WORD_WRAPPING v; + UINT32 count; HRESULT hr; factory = create_factory(); @@ -3721,7 +3720,7 @@ static void test_SetWordWrapping(void) v = IDWriteTextFormat_GetWordWrapping(format); ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, strW, sizeof(strW)/sizeof(WCHAR), format, 10.0f, 100.0f, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); v = IDWriteTextLayout_GetWordWrapping(layout); @@ -3736,6 +3735,24 @@ static void test_SetWordWrapping(void) v = IDWriteTextFormat_GetWordWrapping(format); ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); + /* disable wrapping, text has explicit newline */ + hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, NULL, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); +todo_wine + ok(count == 2, "got %u\n", count); + + hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, NULL, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count > 2, "got %u\n", count); + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Remove useless assignment (Coverity).
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 3fa5ebd014d0f06b59f417c195b922c08624fc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa5ebd014d0f06b59f417c19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:11:01 2016 +0300 dwrite: Remove useless assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d0d6b3f..9842746 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1485,7 +1485,6 @@ static BOOL is_same_u_splitting(struct layout_underline_splitting_params *left, static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct layout_effective_run *first, struct layout_effective_run *last) { - struct layout_underline_splitting_params params, prev_params; struct layout_effective_run *cur; DWRITE_FONT_METRICS metrics; FLOAT thickness, offset; @@ -1517,8 +1516,8 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay } cur = first; - prev_params = params; do { + struct layout_underline_splitting_params params, prev_params; struct layout_effective_run *next, *w; struct layout_underline *u;

1 0