wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Andrey Gusev : Ukrainian translation for release 1.7.42
by Jeremy Newman 29 May '15

29 May '15

Module: website Branch: master Commit: 649530ff7c0e072eac87eab65d4fcab4f6dfa2e3 URL: http://source.winehq.org/git/website.git/?a=commit;h=649530ff7c0e072eac87ea… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri May 29 13:00:45 2015 +0300 Ukrainian translation for release 1.7.42 --- news/uk/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/uk/2015050101.xml b/news/uk/2015050101.xml new file mode 100644 index 0000000..54b957c --- /dev/null +++ b/news/uk/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>1 травня 2015</date> +<title>Випущено Wine 1.7.42</title> +<body> + Розробницький реліз Wine 1.7.42 наразі доступний. + <a href="{$root}/announce/1.7.42">Що нового</a> в цьому релізі: +<ul> + <li>Підтримка димамічної відомості часового поясу.</li> + <li>Початкова підтримка оболонки робочого столу.</li> + <li>Більша підтримка для Direct2D.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.43
by Jeremy Newman 29 May '15

29 May '15

Module: website Branch: master Commit: 4b58238dc4fce23390ff2ff0bb950c966a1ba420 URL: http://source.winehq.org/git/website.git/?a=commit;h=4b58238dc4fce23390ff2f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri May 29 13:01:14 2015 +0300 Ukrainian translation for release 1.7.43 --- news/uk/2015051501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2015051501.xml b/news/uk/2015051501.xml new file mode 100644 index 0000000..9540a47 --- /dev/null +++ b/news/uk/2015051501.xml @@ -0,0 +1,17 @@ +<news> +<date>15 травня 2015</date> +<title>Випущено Wine 1.7.43</title> +<body> + Розробницький реліз Wine 1.7.43 наразі доступний. + <a href="{$root}/announce/1.7.43">Що нового</a> в цьому релізі: +<ul> + <li>Покращена підтримка вікон Shell Browser.</li> + <li>Більше бібліотек API Sets.</li> + <li>Підтримка операцій читання та запису з вбудованими пристроями.</li> + <li>Значно оновлено переклад каталонською мовою.</li> + <li>Підтримка режиму WoW64 на системах з архітектурою ARM64.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.43.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.44
by Alexandre Julliard 29 May '15

29 May '15

Module: website Branch: master Commit: 7817d9d0d6f5d338ad9dbdcd045e05018c584d0d URL: http://source.winehq.org/git/website.git/?a=commit;h=7817d9d0d6f5d338ad9dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 20:57:52 2015 +0900 Wine release 1.7.44 --- news/en/2015052901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015052901.xml b/news/en/2015052901.xml new file mode 100644 index 0000000..469fa77 --- /dev/null +++ b/news/en/2015052901.xml @@ -0,0 +1,16 @@ +<news> +<date>May 29, 2015</date> +<title>Wine 1.7.44 Released</title> +<body> + The Wine development release 1.7.44 is now available. + <a href="{$root}/announce/1.7.44">What's new</a> in this release: +<ul> + <li>More support for the COM interfaces of the RichEdit control.</li> + <li>Initial version of a SmartTee filter.</li> + <li>Some more support for the ARM64 platform.</li> + <li>Support for the null device kernel object.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.44.tar.bz2">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>. +</body></news>

1 0

Tag wine-1.7.44 : Alexandre Julliard : Release 1.7.44
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: refs/tags/wine-1.7.44 Tag: c754f5bef76d6149f3a92373a127a437fbac1c09 URL: http://source.winehq.org/git/wine.git/?a=tag;h=c754f5bef76d6149f3a92373a127… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 20:56:03 2015 +0900 Release 1.7.44

1 0

Alexandre Julliard : Release 1.7.44.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 7efe31d9294275f2505361c19afa4e8e50be2c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efe31d9294275f2505361c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 20:56:03 2015 +0900 Release 1.7.44. --- ANNOUNCE | 600 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 339 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7efe31d9294275f250536…

1 0

Matteo Bruni : wined3d: Avoid the builtin uniforms for point size when using the fixed function vertex pipeline.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 90af08c3b148c37d074c38c2861a8672032c020b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90af08c3b148c37d074c38c28… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:05 2015 +0200 wined3d: Avoid the builtin uniforms for point size when using the fixed function vertex pipeline. --- dlls/wined3d/glsl_shader.c | 103 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 29 ++++++------ 2 files changed, 110 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90af08c3b148c37d074c3…

1 0

Matteo Bruni : wined3d: Introduce a get_pointsize() function.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 953a45303c28d23d2edb9c3e96ce549d72590919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953a45303c28d23d2edb9c3e9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:04 2015 +0200 wined3d: Introduce a get_pointsize() function. --- dlls/wined3d/state.c | 31 ++++--------------------------- dlls/wined3d/utils.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c0a87d3..37f4498 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1458,33 +1458,10 @@ void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_st void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - /* TODO: Group this with the viewport */ - /* - * POINTSCALEENABLE controls how point size value is treated. If set to - * true, the point size is scaled with respect to height of viewport. - * When set to false point size is in pixels. - */ - - /* Default values */ - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - union { - DWORD d; - float f; - } pointSize, A, B, C; + float att[3]; + float pointsize; - pointSize.d = state->render_states[WINED3D_RS_POINTSIZE]; - A.d = state->render_states[WINED3D_RS_POINTSCALE_A]; - B.d = state->render_states[WINED3D_RS_POINTSCALE_B]; - C.d = state->render_states[WINED3D_RS_POINTSCALE_C]; - - if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) - { - float scale_factor = state->viewport.height * state->viewport.height; - - att[0] = A.f / scale_factor; - att[1] = B.f / scale_factor; - att[2] = C.f / scale_factor; - } + get_pointsize(context, state, &pointsize, att); if (gl_info->supported[ARB_POINT_PARAMETERS]) { @@ -1501,7 +1478,7 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s WARN("POINT_PARAMETERS not supported in this version of opengl\n"); } - gl_info->gl_ops.gl.p_glPointSize(max(pointSize.f, FLT_MIN)); + gl_info->gl_ops.gl.p_glPointSize(max(pointsize, FLT_MIN)); checkGLcall("glPointSize(...);"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9084626..5ad82bd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3622,6 +3622,38 @@ void get_pointsize_minmax(const struct wined3d_context *context, const struct wi *out_max = max.f; } +void get_pointsize(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_pointsize, float *out_att) +{ + /* POINTSCALEENABLE controls how point size value is treated. If set to + * true, the point size is scaled with respect to height of viewport. + * When set to false point size is in pixels. */ + union + { + DWORD d; + float f; + } pointsize, a, b, c; + + out_att[0] = 1.0f; + out_att[1] = 0.0f; + out_att[2] = 0.0f; + + pointsize.d = state->render_states[WINED3D_RS_POINTSIZE]; + a.d = state->render_states[WINED3D_RS_POINTSCALE_A]; + b.d = state->render_states[WINED3D_RS_POINTSCALE_B]; + c.d = state->render_states[WINED3D_RS_POINTSCALE_C]; + + if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) + { + float scale_factor = state->viewport.height * state->viewport.height; + + out_att[0] = a.f / scale_factor; + out_att[1] = b.f / scale_factor; + out_att[2] = c.f / scale_factor; + } + *out_pointsize = pointsize.f; +} + /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a79d8b0..7f85317 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3072,6 +3072,8 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine unsigned int tex, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, float *out_min, float *out_max) DECLSPEC_HIDDEN; +void get_pointsize(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_pointsize, float *out_att) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : wined3d: Introduce a get_pointsize_minmax() function.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 36520c3e9def099173be8bd90a328d54081ced08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36520c3e9def099173be8bd90… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:03 2015 +0200 wined3d: Introduce a get_pointsize_minmax() function. --- dlls/wined3d/state.c | 56 +++++++++++------------------------------- dlls/wined3d/utils.c | 19 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 40b04e7..c0a87d3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1419,67 +1419,39 @@ static void state_normalize(struct wined3d_context *context, const struct wined3 void state_psizemin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - union { - DWORD d; - float f; - } tmpvalue; + float min, max; - tmpvalue.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; - if (tmpvalue.f != 1.0f) - { - FIXME("WINED3D_RS_POINTSIZE_MIN not supported on this opengl, value is %f\n", tmpvalue.f); - } - tmpvalue.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; - if (tmpvalue.f != 64.0f) - { - FIXME("WINED3D_RS_POINTSIZE_MAX not supported on this opengl, value is %f\n", tmpvalue.f); - } + get_pointsize_minmax(context, state, &min, &max); + if (min != 1.0f) + FIXME("WINED3D_RS_POINTSIZE_MIN value %.8e not supported on this OpenGL implementation.\n", min); + if (max != 64.0f) + FIXME("WINED3D_RS_POINTSIZE_MAX value %.8e not supported on this OpenGL implementation.\n", max); } void state_psizemin_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - union - { - DWORD d; - float f; - } min, max; + float min, max; - min.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; - max.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; + get_pointsize_minmax(context, state, &min, &max); - /* Max point size trumps min point size */ - if(min.f > max.f) { - min.f = max.f; - } - - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, min.f); + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, min); checkGLcall("glPointParameterfEXT(...)"); - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, max.f); + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, max); checkGLcall("glPointParameterfEXT(...)"); } void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - union - { - DWORD d; - float f; - } min, max; + float min, max; - min.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; - max.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; - - /* Max point size trumps min point size */ - if(min.f > max.f) { - min.f = max.f; - } + get_pointsize_minmax(context, state, &min, &max); - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, min.f); + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, min); checkGLcall("glPointParameterfARB(...)"); - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, max.f); + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, max); checkGLcall("glPointParameterfARB(...)"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd9b710..9084626 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3603,6 +3603,25 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine } } +void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_min, float *out_max) +{ + union + { + DWORD d; + float f; + } min, max; + + min.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; + max.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; + + if (min.f > max.f) + min.f = max.f; + + *out_min = min.f; + *out_max = max.f; +} + /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8215eac..a79d8b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3070,6 +3070,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_texture_matrix(const struct wined3d_context *context, const struct wined3d_state *state, unsigned int tex, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; +void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_min, float *out_max) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : wined3d: Remove point size scaling hack.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: b551da8eef4aaeea27207969c6f9065882f3f6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b551da8eef4aaeea27207969c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:02 2015 +0200 wined3d: Remove point size scaling hack. Not sure how this was supposed to work, according to the GL spec the clamping to POINT_SIZE_RANGE happens after the scaling is applied. --- dlls/wined3d/state.c | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 28e26ab..40b04e7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1507,40 +1507,11 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) { - DWORD h = state->viewport.height; - GLfloat scaleFactor; + float scale_factor = state->viewport.height * state->viewport.height; - if (pointSize.f < gl_info->limits.pointsize_min) - { - /* Minimum valid point size for OpenGL is driver specific. For Direct3D it is - * 0.0f. This means that OpenGL will clamp really small point sizes to the - * driver minimum. To correct for this we need to multiply by the scale factor when sizes - * are less than 1.0f. scale_factor = 1.0f / point_size. - */ - scaleFactor = pointSize.f / gl_info->limits.pointsize_min; - /* Clamp the point size, don't rely on the driver to do it. MacOS says min point size - * is 1.0, but then accepts points below that and draws too small points - */ - pointSize.f = gl_info->limits.pointsize_min; - } - else if(pointSize.f > gl_info->limits.pointsize_max) - { - /* gl already scales the input to glPointSize, - * d3d scales the result after the point size scale. - * If the point size is bigger than the max size, use the - * scaling to scale it bigger, and set the gl point size to max - */ - scaleFactor = pointSize.f / gl_info->limits.pointsize_max; - TRACE("scale: %f\n", scaleFactor); - pointSize.f = gl_info->limits.pointsize_max; - } else { - scaleFactor = 1.0f; - } - scaleFactor = powf(h * scaleFactor, 2); - - att[0] = A.f / scaleFactor; - att[1] = B.f / scaleFactor; - att[2] = C.f / scaleFactor; + att[0] = A.f / scale_factor; + att[1] = B.f / scale_factor; + att[2] = C.f / scale_factor; } if (gl_info->supported[ARB_POINT_PARAMETERS]) @@ -1558,7 +1529,7 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s WARN("POINT_PARAMETERS not supported in this version of opengl\n"); } - gl_info->gl_ops.gl.p_glPointSize(pointSize.f); + gl_info->gl_ops.gl.p_glPointSize(max(pointSize.f, FLT_MIN)); checkGLcall("glPointSize(...);"); }

1 0

Iván Matellanes : msvcirt: Share exceptions implementation with msvcp.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: e35e107e5eda2c64c2da8265a4b7ca5eceecaeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e107e5eda2c64c2da8265a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue May 26 13:08:39 2015 +0200 msvcirt: Share exceptions implementation with msvcp. --- dlls/msvcirt/Makefile.in | 3 ++ dlls/msvcirt/msvcirt.c | 40 ++++++++--------- dlls/msvcirt/msvcirt.h | 25 +++++++++++ dlls/msvcirt/msvcirt.spec | 52 +++++++++++----------- dlls/msvcp90/exception.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt40/msvcrt40.spec | 22 ++++----- 6 files changed, 181 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e35e107e5eda2c64c2da8…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015