January 2016 - Wine-Commits

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

Jan. 25, 2016

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

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

Jan. 25, 2016

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

Jactry Zeng : winecfg: Use better shortcut keys.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: f80a3f6c25bbba3348611149e6c3a48dfdeaeeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80a3f6c25bbba3348611149e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 18 16:59:45 2016 +0800 winecfg: Use better shortcut keys. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 40 +++++++++++++++++++++++++++++----------- po/bg.po | 37 +++++++++++++++++++++++++++---------- po/ca.po | 40 +++++++++++++++++++++++++++++----------- po/cs.po | 40 +++++++++++++++++++++++++++++----------- po/da.po | 38 ++++++++++++++++++++++++++++---------- po/de.po | 40 +++++++++++++++++++++++++++++----------- po/el.po | 25 +++++++++++++++---------- po/en.po | 38 +++++++++++++++++++++----------------- po/en_US.po | 38 +++++++++++++++++++++----------------- po/eo.po | 38 +++++++++++++++++++++++++++----------- po/es.po | 40 +++++++++++++++++++++++++++++----------- po/fa.po | 22 +++++++++++++--------- po/fi.po | 40 +++++++++++++++++++++++++++++----------- po/fr.po | 40 +++++++++++++++++++++++++++++----------- po/he.po | 24 ++++++++++++++---------- po/hi.po | 22 +++++++++++++--------- po/hr.po | 40 +++++++++++++++++++++++++++++----------- po/hu.po | 37 +++++++++++++++++++++++++++---------- po/it.po | 37 +++++++++++++++++++++++++++---------- po/ja.po | 38 +++++++++++++++++++++----------------- po/ko.po | 38 +++++++++++++++++++++----------------- po/lt.po | 40 +++++++++++++++++++++++++++++----------- po/ml.po | 22 +++++++++++++--------- po/nb_NO.po | 40 +++++++++++++++++++++++++++++----------- po/nl.po | 40 +++++++++++++++++++++++++++++----------- po/or.po | 22 +++++++++++++--------- po/pa.po | 22 +++++++++++++--------- po/pl.po | 40 +++++++++++++++++++++++++++++----------- po/pt_BR.po | 40 +++++++++++++++++++++++++++++----------- po/pt_PT.po | 40 +++++++++++++++++++++++++++++----------- po/rm.po | 25 +++++++++++++++---------- po/ro.po | 40 +++++++++++++++++++++++++++++----------- po/ru.po | 40 +++++++++++++++++++++++++++++----------- po/sk.po | 40 ++++++++++++++++++++++++++++------------ po/sl.po | 37 +++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 25 +++++++++++++++---------- po/sr_RS(a)latin.po | 37 +++++++++++++++++++++++++++---------- po/sv.po | 40 +++++++++++++++++++++++++++++----------- po/te.po | 22 +++++++++++++--------- po/th.po | 25 +++++++++++++++---------- po/tr.po | 38 ++++++++++++++++++++++++++++---------- po/uk.po | 40 +++++++++++++++++++++++++++++----------- po/wa.po | 22 +++++++++++++--------- po/wine.pot | 22 +++++++++++++--------- po/zh_CN.po | 38 +++++++++++++++++++++----------------- po/zh_TW.po | 38 +++++++++++++++++++++----------------- programs/winecfg/winecfg.rc | 18 +++++++++--------- 47 files changed, 1081 insertions(+), 524 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f80a3f6c25bbba3348611…

1 0

Nikolay Sivov : d2d1: Support underlined text in DrawTextLayout().
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 43664072457b16e7351f6599200a6b7c12cc8875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43664072457b16e7351f65992… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 22:29:51 2016 +0300 d2d1: Support underlined text in DrawTextLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ec2fec1..7c8a43f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1661,10 +1661,25 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) { - FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; + struct d2d_draw_text_layout_ctx *context = ctx; + float min_thickness; + D2D1_RECT_F rect; + + TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n", iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); - return E_NOTIMPL; + /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ + min_thickness = 96.0f / (render_target->dpi_y * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)); + + rect.left = baseline_origin_x; + rect.top = baseline_origin_y + underline->offset; + rect.right = baseline_origin_x + underline->width; + rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness); + + ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, context->brush); + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx,

1 0

Francois Gouget : bcrypt/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 1b403596f6f892b001c424483133d2e488233595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b403596f6f892b001c424483… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 24 19:50:49 2016 +0100 bcrypt/tests: Add a trailing '\n' to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 721221c..edf478c 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -92,7 +92,7 @@ static void test_sha1(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); @@ -171,7 +171,7 @@ static void test_sha256(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); @@ -250,7 +250,7 @@ static void test_sha384(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); @@ -330,7 +330,7 @@ static void test_sha512(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);

1 0

Nikolay Sivov : dwrite: Fix underline/ strikethrough position adjustment caused by text alignment.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: a62a9fcc1f856ded124c4ba3026730f7823921a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62a9fcc1f856ded124c4ba30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:11:02 2016 +0300 dwrite: Fix underline/strikethrough position adjustment caused by text alignment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9842746..b6f4a65 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3151,7 +3151,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawUnderline(renderer, context, /* horizontal underline always grows from left to right, width is always added to origin regardless of run direction */ - (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + run->align_dx + origin_x, + (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + u->run->align_dx + origin_x, SNAP_COORD(u->run->origin_y + origin_y), &u->u, u->run->effect); @@ -3161,7 +3161,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, LIST_FOR_EACH_ENTRY(s, &This->strikethrough, struct layout_strikethrough, entry) { IDWriteTextRenderer_DrawStrikethrough(renderer, context, - s->run->origin_x + run->align_dx + origin_x, + s->run->origin_x + s->run->align_dx + origin_x, SNAP_COORD(s->run->origin_y + origin_y), &s->s, s->run->effect);

1 0

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

Jan. 25, 2016

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

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

Jan. 25, 2016

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

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

Jan. 25, 2016

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

Austin English : msdrm: Add stub dll.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 9a75a2f7eb5038842c37f5aa16becf8492801d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a75a2f7eb5038842c37f5aa1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 5 22:07:46 2016 -0600 msdrm: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msdrm/Makefile.in | 4 +++ dlls/msdrm/main.c | 40 +++++++++++++++++++++++ dlls/msdrm/msdrm.spec | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 136 insertions(+) diff --git a/configure b/configure index 0bcb3af..6edecf6 100755 --- a/configure +++ b/configure @@ -1176,6 +1176,7 @@ enable_msctfp enable_msdaps enable_msdelta enable_msdmo +enable_msdrm enable_msftedit enable_msg711_acm enable_msgsm32_acm @@ -17667,6 +17668,7 @@ wine_fn_config_dll msdaps enable_msdaps clean wine_fn_config_dll msdelta enable_msdelta wine_fn_config_dll msdmo enable_msdmo implib wine_fn_config_test dlls/msdmo/tests msdmo_test +wine_fn_config_dll msdrm enable_msdrm wine_fn_config_dll msftedit enable_msftedit wine_fn_config_dll msg711.acm enable_msg711_acm wine_fn_config_dll msgsm32.acm enable_msgsm32_acm diff --git a/configure.ac b/configure.ac index 2c18819..853277f 100644 --- a/configure.ac +++ b/configure.ac @@ -3036,6 +3036,7 @@ WINE_CONFIG_DLL(msdaps,,[clean]) WINE_CONFIG_DLL(msdelta) WINE_CONFIG_DLL(msdmo,,[implib]) WINE_CONFIG_TEST(dlls/msdmo/tests) +WINE_CONFIG_DLL(msdrm) WINE_CONFIG_DLL(msftedit) WINE_CONFIG_DLL(msg711.acm) WINE_CONFIG_DLL(msgsm32.acm) diff --git a/dlls/msdrm/Makefile.in b/dlls/msdrm/Makefile.in new file mode 100644 index 0000000..ada79d5 --- /dev/null +++ b/dlls/msdrm/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msdrm.dll + +C_SRCS = \ + main.c diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c new file mode 100644 index 0000000..9e6d2e9 --- /dev/null +++ b/dlls/msdrm/main.c @@ -0,0 +1,40 @@ +/* + * msdrm.dll + * + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec new file mode 100644 index 0000000..5d4d3d6 --- /dev/null +++ b/dlls/msdrm/msdrm.spec @@ -0,0 +1,89 @@ +@ stub DRMAcquireAdvisories +@ stub DRMAcquireIssuanceLicenseTemplate +@ stub DRMAcquireLicense +@ stub DRMActivate +@ stub DRMAddLicense +@ stub DRMAddRightWithUser +@ stub DRMAttest +@ stub DRMCheckSecurity +@ stub DRMClearAllRights +@ stub DRMCloseEnvironmentHandle +@ stub DRMCloseHandle +@ stub DRMClosePubHandle +@ stub DRMCloseQueryHandle +@ stub DRMCloseSession +@ stub DRMConstructCertificateChain +@ stub DRMCreateBoundLicense +@ stub DRMCreateClientSession +@ stub DRMCreateEnablingBitsDecryptor +@ stub DRMCreateEnablingBitsEncryptor +@ stub DRMCreateEnablingPrincipal +@ stub DRMCreateIssuanceLicense +@ stub DRMCreateLicenseStorageSession +@ stub DRMCreateRight +@ stub DRMCreateUser +@ stub DRMDecode +@ stub DRMDeconstructCertificateChain +@ stub DRMDecrypt +@ stub DRMDeleteLicense +@ stub DRMDuplicateEnvironmentHandle +@ stub DRMDuplicateHandle +@ stub DRMDuplicatePubHandle +@ stub DRMDuplicateSession +@ stub DRMEncode +@ stub DRMEncrypt +@ stub DRMEnumerateLicense +@ stub DRMGetApplicationSpecificData +@ stub DRMGetBoundLicenseAttribute +@ stub DRMGetBoundLicenseAttributeCount +@ stub DRMGetBoundLicenseObject +@ stub DRMGetBoundLicenseObjectCount +@ stub DRMGetCertificateChainCount +@ stub DRMGetClientVersion +@ stub DRMGetEnvironmentInfo +@ stub DRMGetInfo +@ stub DRMGetIntervalTime +@ stub DRMGetIssuanceLicenseInfo +@ stub DRMGetIssuanceLicenseTemplate +@ stub DRMGetMetaData +@ stub DRMGetNameAndDescription +@ stub DRMGetOwnerLicense +@ stub DRMGetProcAddress +@ stub DRMGetRevocationPoint +@ stub DRMGetRightExtendedInfo +@ stub DRMGetRightInfo +@ stub DRMGetSecurityProvider +@ stub DRMGetServiceLocation +@ stub DRMGetSignedIssuanceLicense +@ stub DRMGetSignedIssuanceLicenseEx +@ stub DRMGetTime +@ stub DRMGetUnboundLicenseAttribute +@ stub DRMGetUnboundLicenseAttributeCount +@ stub DRMGetUnboundLicenseObject +@ stub DRMGetUnboundLicenseObjectCount +@ stub DRMGetUsagePolicy +@ stub DRMGetUserInfo +@ stub DRMGetUserRights +@ stub DRMGetUsers +@ stub DRMInitEnvironment +@ stub DRMIsActivated +@ stub DRMIsWindowProtected +@ stub DRMLoadLibrary +@ stub DRMParseUnboundLicense +@ stub DRMRegisterContent +@ stub DRMRegisterProtectedWindow +@ stub DRMRegisterRevocationList +@ stub DRMRepair +@ stub DRMSetApplicationSpecificData +@ stub DRMSetGlobalOptions +@ stub DRMSetIntervalTime +@ stub DRMSetMetaData +@ stub DRMSetNameAndDescription +@ stub DRMSetRevocationPoint +@ stub DRMSetUsagePolicy +@ stub DRMVerify +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub __AddMachineCertToLicenseStore

1 0