October 2016 - Wine-commits

Andrey Gusev : wined3d: Add missing '\n' to FIXME() messages.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 9fb120563564c3871c0451c7b0cd6253f923de18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb120563564c3871c0451c7b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 7 17:01:22 2016 +0300 wined3d: Add missing '\n' to FIXME() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4455416..61509d9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1663,7 +1663,7 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, default: shader_addline(buffer, "<unknown_semantic(%#x)>", semantic->usage); - FIXME("unknown_semantics(0x%08x)", semantic->usage); + FIXME("Unrecognised semantic usage %#x.\n", semantic->usage); } } } @@ -2087,7 +2087,7 @@ static void shader_dump_ins_modifiers(struct wined3d_string_buffer *buffer, if (mmask & WINED3DSPDM_MSAMPCENTROID) shader_addline(buffer, "_centroid"); mmask &= ~(WINED3DSPDM_SATURATE | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_MSAMPCENTROID); - if (mmask) FIXME("_unrecognized_modifier(%#x)", mmask); + if (mmask) FIXME("Unrecognised modifier %#x.\n", mmask); } static void shader_dump_primitive_type(struct wined3d_string_buffer *buffer,

1 0

Kimmo Myllyvirta : wined3d: Clear texture flag from correct format when color fixup is not supported.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: a6911a13b8e016e4d3ff0c6f7e1f49a6f1cf1bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6911a13b8e016e4d3ff0c6f7… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Mon Oct 10 09:29:07 2016 +0300 wined3d: Clear texture flag from correct format when color fixup is not supported. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8e83040..2d86b51 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3245,7 +3245,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (!adapter->shader_backend->shader_color_fixup_supported(format->color_fixup) || !adapter->fragment_pipe->color_fixup_supported(format->color_fixup)) - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers

1 0

Józef Kucia : wined3d: Get wined3d creation flags from d3d_info.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 9f85ec5082a55ac430ea548bacecdaf4997d425c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f85ec5082a55ac430ea548ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:33 2016 +0200 wined3d: Get wined3d creation flags from d3d_info. 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 | 6 +++--- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d5e03f..4d9d9e7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1160,7 +1160,7 @@ static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_con return; get_modelview_matrix(context, state, 0, &mv); - if (context->device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING) + if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING) invert_matrix_3d(&mv, &mv); else invert_matrix(&mv, &mv); @@ -2203,7 +2203,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { - if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", ps_args->render_offscreen ? "" : "origin_upper_left, "); else if (!ps_args->render_offscreen) @@ -5948,7 +5948,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "vpos = gl_FragCoord;\n"); - else if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + else if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 71f47d6..9c1ddb0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1712,7 +1712,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - if (context->device->wined3d->flags & WINED3D_LEGACY_DEPTH_BIAS) + if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) { float bias = -(float)const_bias.d; gl_info->gl_ops.gl.p_glPolygonOffset(bias, bias); @@ -4655,7 +4655,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; /* See get_projection_matrix() in utils.c for a discussion about those * values. */ - float pixel_center_offset = context->device->wined3d->flags + float pixel_center_offset = context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2d86b51..2171611 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4513,7 +4513,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ - if (!clip_control && context->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (!clip_control && context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3887f91..45701cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3524,7 +3524,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte { float center_offset; - if (context->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f;

1 0

Józef Kucia : wined3d: Call GL functions through gl_info.gl_ops in ffp_blit_blit_surface().
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 26a9c3a4e67c8bdcea58ad8068c0d5046f60d44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a9c3a4e67c8bdcea58ad806… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:34 2016 +0200 wined3d: Call GL functions through gl_info.gl_ops in ffp_blit_blit_surface(). 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/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 522874b..d44d0ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3266,6 +3266,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; /* Blit from offscreen surface to render target */ @@ -3277,15 +3278,16 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); context = context_acquire(device, dst_surface); + gl_info = context->gl_info; if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) - glEnable(GL_ALPHA_TEST); + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); surface_blt_to_drawable(device, context, filter, !!color_key, src_surface, src_rect, dst_surface, dst_rect); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) - glDisable(GL_ALPHA_TEST); + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); context_release(context);

1 0

Józef Kucia : wined3d: Call glGetIntegerv() through gl_info.gl_ops.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 055d3ff571c3fcb65266583a22a32772b1582395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055d3ff571c3fcb65266583a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:35 2016 +0200 wined3d: Call glGetIntegerv() through gl_info.gl_ops. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 98b05c1..6cd8535 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2546,7 +2546,7 @@ static void enumerate_gl_extensions(struct wined3d_gl_info *gl_info, unsigned int i, j; GLint extensions_count; - glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); for (i = 0; i < extensions_count; ++i) { gl_extension_name = (const char *)GL_EXTCALL(glGetStringi(GL_EXTENSIONS, i));

1 0

Józef Kucia : wined3d: Call glFlush() through gl_info.gl_ops.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 83544c4cc243b78771ba4d868de9c693d694e4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83544c4cc243b78771ba4d868… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:36 2016 +0200 wined3d: Call glFlush() through gl_info.gl_ops. 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/context.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 98516f8..25a3ac6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1296,8 +1296,9 @@ BOOL context_set_current(struct wined3d_context *ctx) { if (wglGetCurrentContext()) { + const struct wined3d_gl_info *gl_info = old->gl_info; TRACE("Flushing context %p before switching to %p.\n", old, ctx); - glFlush(); + gl_info->gl_ops.gl.p_glFlush(); } old->current = 0; } @@ -1316,7 +1317,7 @@ BOOL context_set_current(struct wined3d_context *ctx) return FALSE; ctx->current = 1; } - else if(wglGetCurrentContext()) + else if (wglGetCurrentContext()) { TRACE("Clearing current D3D context.\n"); if (!wglMakeCurrent(NULL, NULL))

1 0

Józef Kucia : wined3d: Call GL functions through gl_info.gl_ops in context_dump_fbo_attachment() .
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 4116d72078ef7bca677254070f0eeb3c2d450123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4116d72078ef7bca677254070… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:37 2016 +0200 wined3d: Call GL functions through gl_info.gl_ops in context_dump_fbo_attachment(). 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/context.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 25a3ac6..87d417c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,10 +266,10 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G { gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &old_texture); - glBindTexture(GL_TEXTURE_CUBE_MAP, name); - glGetTexLevelParameteriv(face, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - glGetTexLevelParameteriv(face, level, GL_TEXTURE_WIDTH, &width); - glGetTexLevelParameteriv(face, level, GL_TEXTURE_HEIGHT, &height); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, name); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(face, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(face, level, GL_TEXTURE_WIDTH, &width); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(face, level, GL_TEXTURE_HEIGHT, &height); tex_target = GL_TEXTURE_CUBE_MAP; tex_type_str = "cube"; @@ -287,14 +287,14 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); while (gl_info->gl_ops.gl.p_glGetError()); - glBindTexture(texture_type[i].target, name); + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); if (!gl_info->gl_ops.gl.p_glGetError()) { tex_target = texture_type[i].target; tex_type_str = texture_type[i].str; break; } - glBindTexture(texture_type[i].target, old_texture); + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); } if (!tex_type_str) { @@ -302,15 +302,15 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G return; } - glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); - glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); } FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), tex_type_str, name, width, height, fmt); - glBindTexture(tex_target, old_texture); + gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); checkGLcall("Guess texture type"); } else if (type == GL_NONE)

1 0

Huw Davies : riched20: Add support for arabic number labelled lists.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: db783986dcbad4f9f4c25db7bfda893148e5acab URL: http://source.winehq.org/git/wine.git/?a=commit;h=db783986dcbad4f9f4c25db7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:02 2016 +0100 riched20: Add support for arabic number labelled lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/riched20/string.c | 6 +-- 3 files changed, 100 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7d46692..237036c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -101,6 +101,7 @@ void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringConst(const WCHAR *str, int len) DECLSPEC_HIDDEN; +ME_String *ME_MakeStringEmpty(int len) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 3c62da2..ffd0a1d 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -128,6 +128,59 @@ static void ME_UpdateTableFlags(ME_DisplayItem *para) para->member.para.fmt.wEffects &= ~PFE_TABLE; } +static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) +{ + return item->wNumbering == base->wNumbering && + item->wNumberingStart == base->wNumberingStart && + item->wNumberingStyle == base->wNumberingStyle && + !(item->wNumberingStyle & PFNS_NEWNUMBER); +} + +static int para_num_get_num( ME_Paragraph *para ) +{ + ME_DisplayItem *prev; + int num = para->fmt.wNumberingStart; + + for (prev = para->prev_para; prev->type == diParagraph; + para = &prev->member.para, prev = prev->member.para.prev_para, num++) + { + if (!para_num_same_list( &prev->member.para.fmt, &para->fmt )) break; + } + return num; +} + +static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) +{ + /* max 5 digits + '(' + ')' */ + ME_String *str = ME_MakeStringEmpty( 5 + 2 ); + WCHAR *p = str->szData; + static const WCHAR fmtW[] = {'%', 'd', 0}; + + if (!str) return NULL; + + if ((para->fmt.wNumberingStyle & 0xf00) == PFNS_PARENS) + *p++ = '('; + + p += sprintfW( p, fmtW, num ); + + switch (para->fmt.wNumberingStyle & 0xf00) + { + case PFNS_PARENS: + case PFNS_PAREN: + *p++ = ')'; + *p = 0; + break; + + case PFNS_PERIOD: + *p++ = '.'; + *p = 0; + break; + } + + str->nLen = p - str->szData; + return str; +} + void para_num_init( ME_Context *c, ME_Paragraph *para ) { ME_Style *style; @@ -144,18 +197,28 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { style = para->eop_run->style; - cf.cbSize = sizeof(cf); - cf.dwMask = CFM_FACE | CFM_CHARSET; - memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); - cf.bCharSet = SYMBOL_CHARSET; - style = ME_ApplyStyle( c->editor, style, &cf ); + if (para->fmt.wNumbering == PFN_BULLET) + { + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_FACE | CFM_CHARSET; + memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); + cf.bCharSet = SYMBOL_CHARSET; + style = ME_ApplyStyle( c->editor, style, &cf ); + } + else + { + ME_AddRefStyle( style ); + } para->para_num.style = style; } if (!para->para_num.text) { - para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); + if (para->fmt.wNumbering != PFN_BULLET) + para->para_num.text = para_num_get_str( para, para_num_get_num( para ) ); + else + para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); } old_font = ME_SelectStyleFont( c, para->para_num.style ); @@ -177,6 +240,17 @@ void para_num_clear( struct para_num *pn ) pn->text = NULL; } +static void para_num_clear_list( ME_Paragraph *para, const PARAFORMAT2 *orig_fmt ) +{ + do + { + para->nFlags |= MEPF_REWRAP; + para_num_clear( &para->para_num ); + if (para->next_para->type != diParagraph) break; + para = &para->next_para->member.para; + } while (para_num_same_list( &para->fmt, orig_fmt )); +} + static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PARAFORMAT2 *pFmt) { PARAFORMAT2 copy; @@ -244,7 +318,15 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA #undef COPY_FIELD if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) + { para->nFlags |= MEPF_REWRAP; + if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || + ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || + ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) + { + para_num_clear_list( para, &copy ); + } + } return TRUE; } @@ -277,6 +359,10 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, run_para = ME_GetParagraph(run); assert(run_para->member.para.fmt.cbSize == sizeof(PARAFORMAT2)); + /* Clear any cached para numbering following this paragraph */ + if (run_para->member.para.fmt.wNumbering) + para_num_clear_list( &run_para->member.para, &run_para->member.para.fmt ); + new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); end_run = ME_MakeRun(style, run_flags); @@ -399,6 +485,10 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, assert(tp->member.para.next_para); assert(tp->member.para.next_para->type == diParagraph); + /* Clear any cached para numbering following this paragraph */ + if (tp->member.para.fmt.wNumbering) + para_num_clear_list( &tp->member.para, &tp->member.para.fmt ); + pNext = tp->member.para.next_para; /* Need to locate end-of-paragraph run here, in order to know end_len */ diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 47aceca..cfb149a 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -55,7 +55,7 @@ static void heap_string_free(ME_String *s) } /* Create a buffer (uninitialized string) of size nMaxChars */ -static ME_String *ME_MakeStringB(int nMaxChars) +ME_String *ME_MakeStringEmpty(int nMaxChars) { ME_String *s = make_string( heap_string_free ); @@ -74,7 +74,7 @@ static ME_String *ME_MakeStringB(int nMaxChars) ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) { - ME_String *s = ME_MakeStringB(nMaxChars); + ME_String *s = ME_MakeStringEmpty(nMaxChars); if (!s) return NULL; memcpy(s->szData, szText, s->nLen * sizeof(WCHAR)); @@ -85,7 +85,7 @@ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) { int i; - ME_String *s = ME_MakeStringB(nMaxChars); + ME_String *s = ME_MakeStringEmpty(nMaxChars); if (!s) return NULL; for (i = 0; i < nMaxChars; i++)

1 0

Huw Davies : riched20: Add support for letter labelled lists.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 9265a9151375565e10a9e2cc2aaf10f2ab6c9896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9265a9151375565e10a9e2cc2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:03 2016 +0100 riched20: Add support for letter labelled lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ffd0a1d..b762df7 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -155,13 +155,46 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) ME_String *str = ME_MakeStringEmpty( 5 + 2 ); WCHAR *p = str->szData; static const WCHAR fmtW[] = {'%', 'd', 0}; + static const WORD letter_base[] = { 1, 26, 26 * 26, 26 * 26 * 26 }; + int i, len; + WORD letter, total, char_offset = 0; if (!str) return NULL; if ((para->fmt.wNumberingStyle & 0xf00) == PFNS_PARENS) *p++ = '('; - p += sprintfW( p, fmtW, num ); + switch (para->fmt.wNumbering) + { + case PFN_ARABIC: + default: + p += sprintfW( p, fmtW, num ); + break; + + case PFN_LCLETTER: + char_offset = 'a' - 'A'; + /* fall through */ + case PFN_UCLETTER: + if (!num) num = 1; + + /* This is not base-26 (or 27) as zeros don't count unless they are leading zeros. + It's simplest to start with the least significant letter, so first calculate how many letters are needed. */ + for (i = 0, total = 0; i < sizeof(letter_base) / sizeof(letter_base[0]); i++) + { + total += letter_base[i]; + if (num < total) break; + } + len = i; + for (i = 0; i < len; i++) + { + num -= letter_base[i]; + letter = (num / letter_base[i]) % 26; + p[len - i - 1] = letter + 'A' + char_offset; + } + p += len; + *p = 0; + break; + } switch (para->fmt.wNumberingStyle & 0xf00) {

1 0

Huw Davies : riched20: Add support for roman numeral labelled lists.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 0df058d84739689a9ddfdf71dc6eb55f2a7f09f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df058d84739689a9ddfdf71d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:04 2016 +0100 riched20: Add support for roman numeral labelled lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index b762df7..d94e213 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -151,11 +151,24 @@ static int para_num_get_num( ME_Paragraph *para ) static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { - /* max 5 digits + '(' + ')' */ - ME_String *str = ME_MakeStringEmpty( 5 + 2 ); + /* max 4 Roman letters (representing '8') / decade + '(' + ')' */ + ME_String *str = ME_MakeStringEmpty( 20 + 2 ); WCHAR *p = str->szData; static const WCHAR fmtW[] = {'%', 'd', 0}; static const WORD letter_base[] = { 1, 26, 26 * 26, 26 * 26 * 26 }; + /* roman_base should start on a '5' not a '1', otherwise the 'total' code will need adjusting. + 'N' and 'O' are what MS uses for 5000 and 10000, their version doesn't work well above 30000, + but we'll use 'P' as the obvious extension, this gets us up to 2^16, which is all we care about. */ + static const struct + { + int base; + char letter; + } + roman_base[] = + { + {50000, 'P'}, {10000, 'O'}, {5000, 'N'}, {1000, 'M'}, + {500, 'D'}, {100, 'C'}, {50, 'L'}, {10, 'X'}, {5, 'V'}, {1, 'I'} + }; int i, len; WORD letter, total, char_offset = 0; @@ -194,6 +207,40 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) p += len; *p = 0; break; + + case PFN_LCROMAN: + char_offset = 'a' - 'A'; + /* fall through */ + case PFN_UCROMAN: + if (!num) num = 1; + + for (i = 0; i < sizeof(roman_base) / sizeof(roman_base[0]); i++) + { + if (i > 0) + { + if (i % 2 == 0) /* eg 5000, check for 9000 */ + total = roman_base[i].base + 4 * roman_base[i + 1].base; + else /* eg 1000, check for 4000 */ + total = 4 * roman_base[i].base; + + if (num / total) + { + *p++ = roman_base[(i & ~1) + 1].letter + char_offset; + *p++ = roman_base[i - 1].letter + char_offset; + num -= total; + continue; + } + } + + len = num / roman_base[i].base; + while (len--) + { + *p++ = roman_base[i].letter + char_offset; + num -= roman_base[i].base; + } + } + *p = 0; + break; } switch (para->fmt.wNumberingStyle & 0xf00)

1 0