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
March 2018
----- 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
785 discussions
Start a n
N
ew thread
Mark Jansen : comctl32/tests: Prevent a possible nullptr dereference.
by Alexandre Julliard
19 Mar '18
19 Mar '18
Module: wine Branch: master Commit: f94d0e7b3aa9cb9af17e7c36212d95f20fbbce54 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f94d0e7b3aa9cb9af17e7c36…
Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Mar 16 22:57:15 2018 +0100 comctl32/tests: Prevent a possible nullptr dereference. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3838563..1c307e4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2047,9 +2047,9 @@ static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT i ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed && bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen && bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) || - broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && + (broken_expect && broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen && - bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue), + bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue)), "%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n", depth, name, i, bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen, bmi->bmiColors[i].rgbBlue, expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue);
1
0
0
0
Alistair Leslie-Hughes : pidgen: Add PIDGenSimpA stub.
by Alexandre Julliard
19 Mar '18
19 Mar '18
Module: wine Branch: master Commit: df408ba3abd75c10af35d647728087cf447d29b0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=df408ba3abd75c10af35d647…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 10:19:17 2018 +0000 pidgen: Add PIDGenSimpA stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 3aa3e84..cf165ea 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -43,3 +43,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index ad5c369..8b7e778 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,6 +1,6 @@ @ stub PIDGenA @ stub PIDGenW -@ stub PIDGenSimpA +@ stdcall PIDGenSimpA(str long long long long long long long long) @ stub PIDGenSimpW @ stub SetupPIDGenA @ stub SetupPIDGenW
1
0
0
0
Henri Verbeet : wined3d: Pass the destination x/ y coordinates as separate parameters to wined3d_surface_upload_data().
by Alexandre Julliard
19 Mar '18
19 Mar '18
Module: wine Branch: master Commit: d4b0249c48e0601bdb3ed38b20113b364c93b298 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d4b0249c48e0601bdb3ed38b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:10 2018 +0330 wined3d: Pass the destination x/y coordinates as separate parameters to wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 51 +++++++++++++++++++----------------------- dlls/wined3d/texture.c | 10 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 29 insertions(+), 34 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4b0249c48e0601bdb3e…
1
0
0
0
Henri Verbeet : wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data().
by Alexandre Julliard
19 Mar '18
19 Mar '18
Module: wine Branch: master Commit: 89cd64bcb7fe4f9fb791a542a82ef9868252d628 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=89cd64bcb7fe4f9fb791a542…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:09 2018 +0330 wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data(). For consistency with wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++++------------------- dlls/wined3d/texture.c | 18 ++++++++------- dlls/wined3d/wined3d_private.h | 6 ++--- 3 files changed, 42 insertions(+), 34 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=89cd64bcb7fe4f9fb791…
1
0
0
0
Henri Verbeet : wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture().
by Alexandre Julliard
19 Mar '18
19 Mar '18
Module: wine Branch: master Commit: 614102c013842efb2f17b704dc8b39cbb29492d1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=614102c013842efb2f17b704…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:08 2018 +0330 wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 126 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 46 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ba0fa63..124aa31 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -441,7 +441,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * const struct wined3d_gl_info *gl_info) { unsigned int level, level_count, layer, layer_count; - GLsizei width, height; + GLsizei width, height, depth; GLenum target; level_count = texture->level_count; @@ -464,10 +464,12 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", texture, layer, level, target, width, height); - if (texture->target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY) { + depth = wined3d_texture_get_level_depth(texture, level); GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); + target == GL_TEXTURE_2D_ARRAY ? texture->layer_count : depth, 0, + format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else @@ -491,6 +493,10 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture switch (texture->target) { + case GL_TEXTURE_3D: + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, + gl_internal_format, width, height, wined3d_texture_get_level_depth(texture, 0))); + break; case GL_TEXTURE_2D_ARRAY: GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, width, height, texture->layer_count)); @@ -1556,10 +1562,17 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) } } +/* Context activation is done by the caller. */ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + const struct wined3d_format *format = texture->resource.format; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_color_key_conversion *conversion; + GLenum internal; + + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); if (!d3d_info->shader_color_key && !(texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) @@ -1574,7 +1587,36 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - texture->texture_ops->texture_prepare_texture(texture, context, srgb); + if (format->conv_byte_count) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + } + else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); + } + + wined3d_texture_bind_and_dirtify(texture, context, srgb); + + if (srgb) + internal = format->glGammaInternal; + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) + internal = format->rtInternal; + else + internal = format->glInternal; + + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + + TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); + + if (wined3d_texture_use_immutable_storage(texture, gl_info)) + wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); + else + wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); texture->flags |= alloc_flag; } @@ -1771,53 +1813,10 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in } } -/* Context activation is done by the caller. */ -static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_color_key_conversion *conversion; - GLenum internal; - - TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); - - if (format->conv_byte_count) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - } - else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); - TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); - } - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; - - if (!internal) - FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); - - TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); - else - wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); -} - static const struct wined3d_texture_ops texture2d_ops = { texture2d_upload_data, texture2d_load_location, - texture2d_prepare_texture, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2646,43 +2645,10 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in return TRUE; } -static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - GLenum internal = srgb ? format->glGammaInternal : format->glInternal; - unsigned int sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - { - GL_EXTCALL(glTexStorage3D(GL_TEXTURE_3D, texture->level_count, internal, - wined3d_texture_get_level_width(texture, 0), - wined3d_texture_get_level_height(texture, 0), - wined3d_texture_get_level_depth(texture, 0))); - checkGLcall("glTexStorage3D"); - } - else - { - for (i = 0; i < sub_count; ++i) - { - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, i, internal, - wined3d_texture_get_level_width(texture, i), - wined3d_texture_get_level_height(texture, i), - wined3d_texture_get_level_depth(texture, i), - 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - } -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_upload_data, texture3d_load_location, - texture3d_prepare_texture, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 718ee63..302b6ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3088,8 +3088,6 @@ struct wined3d_texture_ops const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); - void (*texture_prepare_texture)(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001
1
0
0
0
Henri Verbeet : wined3d: Resource size should always be non-zero in resource_init().
by Alexandre Julliard
19 Mar '18
19 Mar '18
Module: wine Branch: master Commit: d3baf0355af7520144449a9ac098ee5c380661c1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d3baf0355af7520144449a9a…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:07 2018 +0330 wined3d: Resource size should always be non-zero in resource_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 97f7aec..8968c16 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -91,6 +91,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } + if (!size) + ERR("Attempting to create a zero-sized resource.\n"); + for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { if (resource_types[i].type != type @@ -188,17 +191,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - if (size) - { - if (!wined3d_resource_allocate_sysmem(resource)) - { - ERR("Failed to allocate system memory.\n"); - return E_OUTOFMEMORY; - } - } - else + if (!wined3d_resource_allocate_sysmem(resource)) { - resource->heap_memory = NULL; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } if (!(usage & WINED3DUSAGE_PRIVATE))
1
0
0
0
Alexandre Julliard : Wine release 2.0.5
by Alexandre Julliard
18 Mar '18
18 Mar '18
Module: website Branch: master Commit: 26866d63248c5209e8181440370e79440197ecfb URL:
https://source.winehq.org/git/website.git/?a=commit;h=26866d63248c5209e8181…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 18 15:02:43 2018 +0100 Wine release 2.0.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018031801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018031801.xml b/news/en/2018031801.xml new file mode 100644 index 0000000..85d969b --- /dev/null +++ b/news/en/2018031801.xml @@ -0,0 +1,12 @@ +<news> +<date>March 18, 2018</date> +<title>Wine 2.0.5 Released</title> +<body> +<p> The Wine maintenance release 2.0.5 is now available.</p> +<p> <a href="{$root}/announce/2.0.5">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>
1
0
0
0
Tag wine-2.0.5 : Alexandre Julliard : Release 2.0.5
by Alexandre Julliard
18 Mar '18
18 Mar '18
Module: wine Branch: refs/tags/wine-2.0.5 Tag: dc253d6b7e758e684083ccaa1422197fd99da550 URL:
https://source.winehq.org/git/wine.git/?a=tag;h=dc253d6b7e758e684083ccaa142…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 18 15:00:00 2018 +0100 Release 2.0.5
1
0
0
0
Michael Stefaniuc : Release 2.0.5
by Alexandre Julliard
18 Mar '18
18 Mar '18
Module: wine Branch: oldstable Commit: 89bd18ab6f23e05e013bc12b5bc862a172e6eacb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=89bd18ab6f23e05e013bc12b…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 18 23:40:58 2018 +0100 Release 2.0.5 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 375 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 190 insertions(+), 209 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=89bd18ab6f23e05e013b…
1
0
0
0
Sebastian Lackner : configure: Support for recent versions of OSMesa.
by Alexandre Julliard
18 Mar '18
18 Mar '18
Module: wine Branch: oldstable Commit: 42d017be9282231e3ed49f7536f1f63ef233e216 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=42d017be9282231e3ed49f75…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 24 01:20:15 2017 +0200 configure: Support for recent versions of OSMesa. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f625707ffc38c58cc296c8a27ac6c2b3e1c38249) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- dlls/gdi32/dibdrv/opengl.c | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/configure b/configure index b77245f..1c5c2c9 100755 --- a/configure +++ b/configure @@ -10806,11 +10806,11 @@ LIBS="-lOSMesa $X_LIBS -lm $X_EXTRA_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char glAccum (); +char OSMesaGetProcAddress (); int main () { -return glAccum (); +return OSMesaGetProcAddress (); ; return 0; } diff --git a/configure.ac b/configure.ac index 9b75b4f..8c57db9 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,7 +1149,7 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c if test "x$with_osmesa" != "xno" then - WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(OSMesa,OSMesaGetProcAddress,,,[$X_LIBS -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) fi diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 4133116..77d6320 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -113,14 +113,6 @@ static BOOL init_opengl(void) return FALSE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) - { - if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], buffer, sizeof(buffer) ))) - { - ERR( "%s not found in %s (%s), disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA, buffer ); - goto failed; - } - } #define LOAD_FUNCPTR(f) do if (!(p##f = wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ @@ -134,6 +126,15 @@ static BOOL init_opengl(void) LOAD_FUNCPTR(OSMesaPixelStore); #undef LOAD_FUNCPTR + for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + { + if (!(((void **)&opengl_funcs.gl)[i] = pOSMesaGetProcAddress( opengl_func_names[i] ))) + { + ERR( "%s not found in %s, disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA ); + goto failed; + } + } + return TRUE; failed:
1
0
0
0
← Newer
1
...
29
30
31
32
33
34
35
...
79
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
Results per page:
10
25
50
100
200