winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2017
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
838 discussions
Start a n
N
ew thread
Józef Kucia : wined3d: Record sampler usage for ld_structured.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: 5392835f2992eb43b45e40de425ebd9d3f0d42e7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5392835f2992eb43b45e40de4…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:37 2017 +0100 wined3d: Record sampler usage for ld_structured. 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/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3085248..37c4352 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1385,6 +1385,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); } + else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED + && ins.src[2].reg.type == WINED3DSPR_RESOURCE) + { + shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, + WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); + } if (ins.predicate) if (!shader_record_register_usage(shader, reg_maps, &ins.predicate->reg,
1
0
0
0
Józef Kucia : wined3d: Use string_buffer_sprintf() in shader_glsl_sprintf_cast().
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: bff1ecac3bcd357d508a2c8a5587a11ed4c6a54b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bff1ecac3bcd357d508a2c8a5…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:36 2017 +0100 wined3d: Use string_buffer_sprintf() in shader_glsl_sprintf_cast(). 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 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8bdba0..eefc248 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2955,12 +2955,12 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); } -static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_str, +static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) { if (dst_data_type == src_data_type) { - sprintf(dst_param_str, "%s", src_param_str); + string_buffer_sprintf(dst_param, "%s", src_param); return; } @@ -2969,12 +2969,12 @@ static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_ switch (dst_data_type) { case WINED3D_DATA_INT: - sprintf(dst_param_str, "floatBitsToInt(%s)", src_param_str); + string_buffer_sprintf(dst_param, "floatBitsToInt(%s)", src_param); return; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(dst_param_str, "floatBitsToUint(%s)", src_param_str); + string_buffer_sprintf(dst_param, "floatBitsToUint(%s)", src_param); return; default: break; @@ -2983,18 +2983,18 @@ static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_ if (src_data_type == WINED3D_DATA_UINT && dst_data_type == WINED3D_DATA_FLOAT) { - sprintf(dst_param_str, "uintBitsToFloat(%s)", src_param_str); + string_buffer_sprintf(dst_param, "uintBitsToFloat(%s)", src_param); return; } if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) { - sprintf(dst_param_str, "intBitsToFloat(%s)", src_param_str); + string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); return; } FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); - sprintf(dst_param_str, "%s", src_param_str); + string_buffer_sprintf(dst_param, "%s", src_param); } /* From a given parameter token, generate the corresponding GLSL string. @@ -3004,10 +3004,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, enum wined3d_data_type data_type) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; - char reg_name[200]; glsl_src->reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; @@ -3036,7 +3037,9 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio } shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name->buffer, swizzle_str, glsl_src->param_str); + + string_buffer_release(priv->string_buffers, reg_name); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins,
1
0
0
0
Józef Kucia : wined3d: Extract common code to validate_shader_resource_view().
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: f0bff11738b0858d370e2e7eefff03de0488df72 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f0bff11738b0858d370e2e7ee…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:35 2017 +0100 wined3d: Extract common code to validate_shader_resource_view(). 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/view.c | 214 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 131 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b64b5e7..a74a2ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -68,6 +68,82 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, return texture->target; } +static const struct wined3d_format *validate_shader_resource_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, BOOL mip_slice) +{ + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + const struct wined3d_format *format; + + format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + if (resource->type == WINED3D_RTYPE_BUFFER && (desc->flags & WINED3D_VIEW_BUFFER_RAW)) + { + if (format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(format->id)); + return NULL; + } + + format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } + + if (wined3d_format_is_typeless(format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(format->id)); + return NULL; + } + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int buffer_size, element_size; + + if (buffer->desc.structure_byte_stride) + { + if (desc->format_id != WINED3DFMT_UNKNOWN) + { + WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); + return NULL; + } + + format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + element_size = buffer->desc.structure_byte_stride; + } + else + { + element_size = format->byte_count; + } + + if (!element_size) + return NULL; + + buffer_size = buffer->resource.size / element_size; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return NULL; + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (mip_slice && resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (!desc->u.texture.level_count + || (mip_slice && desc->u.texture.level_count != 1) + || desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx + || !desc->u.texture.layer_count + || desc->u.texture.layer_idx >= depth_or_layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) + return NULL; + } + + return format; +} + static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) @@ -524,76 +600,16 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - const struct wined3d_format *view_format; - - view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - if (view_format->id != WINED3DFMT_R32_TYPELESS) - { - WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view_format->id)); - return E_INVALIDARG; - } - - view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - } - - if (wined3d_format_is_typeless(view_format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); - return E_INVALIDARG; - } - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int buffer_size, element_size; - - if (buffer->desc.structure_byte_stride) - { - if (desc->format_id != WINED3DFMT_UNKNOWN) - { - WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); - return E_INVALIDARG; - } - - view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; - } - else - { - element_size = view_format->byte_count; - } - - if (!element_size) - return E_INVALIDARG; - - buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) - return E_INVALIDARG; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - - if (!desc->u.texture.level_count - || desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx - || !desc->u.texture.layer_count - || desc->u.texture.layer_idx >= texture->layer_count - || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; - } - view->refcount = 1; - wined3d_resource_incref(view->resource = resource); view->parent = parent; view->parent_ops = parent_ops; - view->format = view_format; + + if (!(view->format = validate_shader_resource_view(desc, resource, FALSE))) + return E_INVALIDARG; view->desc = *desc; + wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); return WINED3D_OK; @@ -746,78 +762,14 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - view->refcount = 1; view->parent = parent; view->parent_ops = parent_ops; - view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - view->desc = *desc; - - if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - if (view->format->id != WINED3DFMT_R32_TYPELESS) - { - WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view->format->id)); - return E_INVALIDARG; - } - - view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - } - - if (wined3d_format_is_typeless(view->format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + if (!(view->format = validate_shader_resource_view(desc, resource, TRUE))) return E_INVALIDARG; - } - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int buffer_size, element_size; - - if (buffer->desc.structure_byte_stride) - { - if (desc->format_id != WINED3DFMT_UNKNOWN) - { - WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); - return E_INVALIDARG; - } - - view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; - } - else - { - element_size = view->format->byte_count; - } - - if (!element_size) - return E_INVALIDARG; - - buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) - return E_INVALIDARG; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int depth_or_layer_count; - - if (resource->type == WINED3D_RTYPE_TEXTURE_3D) - depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); - else - depth_or_layer_count = texture->layer_count; + view->desc = *desc; - if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count != 1 - || desc->u.texture.layer_idx >= depth_or_layer_count - || !desc->u.texture.layer_count - || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; - } wined3d_resource_incref(view->resource = resource); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);
1
0
0
0
Nikolay Sivov : d2d1: Use DrawLine() to draw underlines.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: d51c60e11dbe4c85feed37df36dc98be1f8478ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d51c60e11dbe4c85feed37df3…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 14:11:33 2017 +0300 d2d1: Use DrawLine() to draw underlines. 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 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a9f7485..cc705ee 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1818,24 +1818,24 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend 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_POINT_2F start, end; ID2D1Brush *brush; - D2D1_RECT_F rect; + float thickness; 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); /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ - min_thickness = 96.0f / (render_target->desc.dpiY * 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); + thickness = max(96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)), + underline->thickness); brush = d2d_draw_get_text_brush(context, effect); - ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, brush); + start.x = baseline_origin_x; + start.y = baseline_origin_y + underline->offset + thickness / 2.0f; + end.x = start.x + underline->width; + end.y = start.y; + d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); ID2D1Brush_Release(brush);
1
0
0
0
Hugh McMaster : reg/tests: Test import with non-standard registry file headers.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: c3a46653e1e91e5922a77470eba9619df911c1d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c3a46653e1e91e5922a77470e…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 24 11:34:02 2017 +0000 reg/tests: Test import with non-standard registry file headers. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8786b0f..7c79b31 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -875,6 +875,84 @@ static void test_import(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_str("REGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test1"); + + test_import_str("regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test2"); + + test_import_str("Regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test3"); + + test_import_str("REGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test4"); + + test_import_str("REGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test5"); + + test_import_str("REGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test6"); + + test_import_str("REGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test7"); + + test_import_str("REGEDIT9\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test8"); + + test_import_str("Windows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test9"); + + test_import_str("Windows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test10"); + + test_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test11"); + + test_import_str("Windows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test12"); + test_import_str("REGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value1\"\n", &r); @@ -1159,6 +1237,56 @@ static void test_import(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test1"); + + test_import_wstr("\xef\xbb\xbfregedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test2"); + + test_import_wstr("\xef\xbb\xbfRegedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test3"); + + test_import_wstr("\xef\xbb\xbfREGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test4"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test5"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test6"); + + test_import_wstr("\xef\xbb\xbfREGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test7"); + + test_import_wstr("\xef\xbb\xbfREGEDIT9\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test8"); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode1\"=\"Value1\"\n", &r); @@ -1209,6 +1337,34 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test9"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test10"); + + test_import_wstr("\xef\xbb\xbfWINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test11"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test12"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode4\"=\"Value4\"\n", &r);
1
0
0
0
Hugh McMaster : regedit/tests: Test import with non-standard registry file headers.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: 00bd109e1f7adf4018df29947b07a2e68ac85a30 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=00bd109e1f7adf4018df29947…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 24 11:33:49 2017 +0000 regedit/tests: Test import with non-standard registry file headers. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f369b59..c82dfe3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -415,6 +415,62 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "MixedQuotes"); verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + /* Test import with non-standard registry file headers */ + exec_import_str("REGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test1"); + + exec_import_str("regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test2"); + + exec_import_str("Regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test3"); + + exec_import_str("REGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test4"); + + exec_import_str("REGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test5"); + + exec_import_str("REGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test6"); + + exec_import_str("REGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test7"); + + exec_import_str("Windows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test8"); + + exec_import_str("Windows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test9"); + + exec_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test10"); + + exec_import_str("Windows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test11"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
1
0
0
0
Alistair Leslie-Hughes : dpnet: Handle unknown service GUID in enum_services_providers.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: 83cce966f4cc4692035b18bf0766caa630702b28 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=83cce966f4cc4692035b18bf0…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 24 06:45:29 2017 +0000 dpnet: Handle unknown service GUID in enum_services_providers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 4 ++-- dlls/dpnet/tests/client.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 91a7e3e..e8a60c3 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -147,10 +147,10 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER if(!returned || !buf_size) return E_POINTER; - *returned = 0; - if(!service) { + *returned = 0; + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); if(res == ERROR_FILE_NOT_FOUND) return DPNERR_DOESNOTEXIST; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index ee2722b..6503bc3 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -211,6 +211,12 @@ static void test_enum_service_providers(void) } ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Client_EnumServiceProviders(client, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); } static void test_enum_hosts(void) @@ -571,6 +577,12 @@ static void test_enum_service_providers_peer(void) serv_prov_info -= items; /* set pointer back */ ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); } static void test_enum_hosts_peer(void)
1
0
0
0
Zebediah Figura : storage.dll16: Fix get_nth_next_small_blocknr.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: e3781c84ab24772b84dc8e0f9e92581ba44c1daa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e3781c84ab24772b84dc8e0f9…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 23 13:34:07 2017 -0600 storage.dll16: Fix get_nth_next_small_blocknr. Dividing the initial value of -1 by 128 yields 0, causing the assertion to fail whenever the function is called with nr > 0 and blocknr < 128. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 5969333..865411f 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -600,7 +600,7 @@ STORAGE_get_next_small_blocknr(stream_access16 *str,int blocknr) { */ static int STORAGE_get_nth_next_small_blocknr(stream_access16*str,int blocknr,int nr) { - int lastblocknr=-1; + int lastblocknr=-129; BYTE block[BIGSIZE]; LPINT sbd = (LPINT)block; struct storage_header sth;
1
0
0
0
Alex Henrie : user32: Include space for ampersands when determining MessageBox size.
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: 0a2f9f54ebfef4adc3e0438ffcb9cf531ac1ba73 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0a2f9f54ebfef4adc3e0438ff…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 01:08:36 2017 -0700 user32: Include space for ampersands when determining MessageBox size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/msgbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 2ba98c9..0839f97 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -261,8 +261,8 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the text size */ GetClientRect(GetDlgItem(hwnd, MSGBOX_IDTEXT), &rect); rect.top = rect.left = rect.bottom = 0; - DrawTextW( hdc, lpszText, -1, &rect, - DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT); + DrawTextW(hdc, lpszText, -1, &rect, + DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT | DT_NOPREFIX); /* Min text width corresponds to space for the buttons */ tleft = ileft; if (iwidth) tleft += ileft + iwidth;
1
0
0
0
Henri Verbeet : ddraw/tests: Test depth fill results in test_color_fill().
by Alexandre Julliard
24 Feb '17
24 Feb '17
Module: wine Branch: master Commit: 2cc9b854b10a973424c89d246d048612d77a4418 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2cc9b854b10a973424c89d246…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:33 2017 +0100 ddraw/tests: Test depth fill results in test_color_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 36 ++++++++++++++++++++++++++++++++++-- 4 files changed, 144 insertions(+), 6 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc9b854b10a973424c89…
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
84
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
Results per page:
10
25
50
100
200