April 2021 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Free the program variants array in shader_spirv_destroy() (Valgrind).
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 55795588f45be11c296214cfb1e60b3fb51e81bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=55795588f45be11c296214cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 19:06:03 2021 +0200 wined3d: Free the program variants array in shader_spirv_destroy() (Valgrind). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index eb2647db12d..7617ee9d6ef 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1019,6 +1019,7 @@ static void shader_spirv_destroy(struct wined3d_shader *shader) shader_spirv_invalidate_contexts_graphics_program_variant(&device_vk->d, variant_vk); VK_CALL(vkDestroyShaderModule(device_vk->vk_device, variant_vk->vk_module, NULL)); } + heap_free(program_vk->variants); vkd3d_shader_free_scan_descriptor_info(&program_vk->descriptor_info); shader->backend_data = NULL;

1 0

Henri Verbeet : d3d11/tests: Initialise "constant" in test_device_context_state() (Valgrind).
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: e7ebe3d8d24c872e44dd9f62b001fec8e4014d0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ebe3d8d24c872e44dd9f62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 19:06:04 2021 +0200 d3d11/tests: Initialise "constant" in test_device_context_state() (Valgrind). We're mostly just using this to make sure the value we read back is that same as the one we set, so in that sense the actual value is inconsequential. Nevertheless, randomness is generally undesirable in the tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca60170d080..191df67a41d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6775,6 +6775,7 @@ static void test_device_context_state(void) 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000020, 0x00050050, 0x00000008, 0x0100086a, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x0100003e, }; + static const struct vec4 constant = {1.257f, 1.885f, 2.513f, 3.770f}; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; @@ -6814,7 +6815,6 @@ static void test_device_context_state(void) ID3D11Texture2D *texture; enum DXGI_FORMAT format; float blend_factor[4]; - struct vec4 constant; DWORD data_size; BOOL pred_value; ULONG refcount;

1 0

Henri Verbeet : wined3d: Only read "*rect_count" when "rects" is non-NULL in wined3d_device_context_get_scissor_rects() (Valgrind).
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: ca03802a456e7cf4efd834edfeddc483ac72e4b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca03802a456e7cf4efd834ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 19:06:05 2021 +0200 wined3d: Only read "*rect_count" when "rects" is non-NULL in wined3d_device_context_get_scissor_rects() (Valgrind). When "rects" is NULL, "*rect_count" is potentially uninitialised. That's fairly benign because the resulting "count" value is inconsequential in that case, but it's also unnecessary, and easy to avoid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f3d7cff74bf..813ee773478 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1722,8 +1722,7 @@ void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_ TRACE("context %p, rect_count %p, rects %p.\n", context, rect_count, rects); - count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1; - if (count && rects) + if (rects && (count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1)) memcpy(rects, state->scissor_rects, count * sizeof(*rects)); if (rect_count) *rect_count = state->scissor_rect_count;

1 0

Piotr Caban : msvcrt: Import lround implementation from musl.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 69ad3c11cfb00b518c78103525e3452502173195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ad3c11cfb00b518c781035… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:38 2021 +0200 msvcrt: Import lround implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 794a3e09c29..2251a30af72 100755 --- a/configure +++ b/configure @@ -19641,7 +19641,6 @@ for ac_func in \ log2f \ lrint \ lrintf \ - lround \ nearbyint \ nearbyintf \ nexttoward \ diff --git a/configure.ac b/configure.ac index 3bfa2885002..20ec971b5bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2684,7 +2684,6 @@ AC_CHECK_FUNCS(\ log2f \ lrint \ lrintf \ - lround \ nearbyint \ nearbyintf \ nexttoward \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e1251ba7115..018a8ae47e4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4360,10 +4360,17 @@ float CDECL roundf(float x) /********************************************************************* * lround (MSVCR120.@) + * + * Copied from musl: src/math/lround.c */ __msvcrt_long CDECL lround(double x) { - return unix_funcs->lround( x ); + double d = round(x); + if (d != (double)(__msvcrt_long)d) { + *_errno() = EDOM; + return 0; + } + return d; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 3bf99c09c24..a7c7202c516 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -765,18 +765,6 @@ static double CDECL unix_round(double x) #endif } -/********************************************************************* - * lround - */ -static int CDECL unix_lround(double x) -{ -#ifdef HAVE_LROUND - return lround(x); -#else - return unix_round(x); -#endif -} - /********************************************************************* * sin */ @@ -944,7 +932,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_lrint, unix_lrintf, - unix_lround, unix_modf, unix_modff, unix_nearbyint, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index c74115bc76c..89972ed669f 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -74,7 +74,6 @@ struct unix_funcs float (CDECL *logbf)(float x); int (CDECL *lrint)(double x); int (CDECL *lrintf)(float x); - int (CDECL *lround)(double x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num); diff --git a/include/config.h.in b/include/config.h.in index 544fe85b248..387c8b718ff 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -477,9 +477,6 @@ /* Define to 1 if you have the `lrintf' function. */ #undef HAVE_LRINTF -/* Define to 1 if you have the `lround' function. */ -#undef HAVE_LROUND - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT

1 0

Piotr Caban : msvcrt: Import round implementation from musl.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: f4de92a4ed5c8d8d8c1b57222ad3d10e7bd63229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4de92a4ed5c8d8d8c1b5722… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:41 2021 +0200 msvcrt: Import round implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 33 ++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 2251a30af72..ca517b1d31a 100755 --- a/configure +++ b/configure @@ -19651,7 +19651,6 @@ for ac_func in \ remquof \ rint \ rintf \ - round \ tgamma \ tgammaf \ trunc \ diff --git a/configure.ac b/configure.ac index 20ec971b5bb..46bbb8a70f8 100644 --- a/configure.ac +++ b/configure.ac @@ -2694,7 +2694,6 @@ AC_CHECK_FUNCS(\ remquof \ rint \ rintf \ - round \ tgamma \ tgammaf \ trunc \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 018a8ae47e4..a29ed5786e2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -87,6 +87,14 @@ static inline float fp_barrierf(float x) return y; } +#if _MSVCR_VER>=120 +static inline double fp_barrier(double x) +{ + volatile double y = x; + return y; +} +#endif + static inline double CDECL ret_nan( BOOL update_sw ) { double x = 1.0; @@ -4321,10 +4329,33 @@ short CDECL _dclass(double x) /********************************************************************* * round (MSVCR120.@) + * + * Copied from musl: src/math/round.c */ double CDECL round(double x) { - return unix_funcs->round(x); + static const double toint = 1 / DBL_EPSILON; + + ULONGLONG llx = *(ULONGLONG*)&x; + int e = llx >> 52 & 0x7ff; + double y; + + if (e >= 0x3ff + 52) + return x; + if (llx >> 63) + x = -x; + if (e < 0x3ff - 1) + return 0 * *(double*)&llx; + y = fp_barrier(x + toint) - toint - x; + if (y > 0.5) + y = y + x - 1; + else if (y <= -0.5) + y = y + x + 1; + else + y = y + x; + if (llx >> 63) + y = -y; + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a7c7202c516..33c25ef8d40 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -753,18 +753,6 @@ static float CDECL unix_rintf(float x) #endif } -/********************************************************************* - * round - */ -static double CDECL unix_round(double x) -{ -#ifdef HAVE_ROUND - return round(x); -#else - return unix_rint(x); -#endif -} - /********************************************************************* * sin */ @@ -948,7 +936,6 @@ static const struct unix_funcs funcs = unix_remquof, unix_rint, unix_rintf, - unix_round, unix_sin, unix_sinf, unix_sinh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 89972ed669f..c96eda3c3a0 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -90,7 +90,6 @@ struct unix_funcs float (CDECL *remquof)(float x, float y, int *quo); double (CDECL *rint)(double x); float (CDECL *rintf)(float x); - double (CDECL *round)(double x); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); diff --git a/include/config.h.in b/include/config.h.in index 387c8b718ff..a0bc1b4b247 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -690,9 +690,6 @@ /* Define to 1 if you have the `rintf' function. */ #undef HAVE_RINTF -/* Define to 1 if you have the `round' function. */ -#undef HAVE_ROUND - /* Define to 1 if you have the <sasl/sasl.h> header file. */ #undef HAVE_SASL_SASL_H

1 0

Henri Verbeet : wined3d: Avoid accessing the bo_user list from outside the command stream thread (Valgrind).
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 7e64eba5b343e6ad2487c691911b0430c422bb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e64eba5b343e6ad2487c691… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 19:06:02 2021 +0200 wined3d: Avoid accessing the bo_user list from outside the command stream thread (Valgrind). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 69 ++++++++++++++++++++---------------------- dlls/wined3d/adapter_vk.c | 77 ++++++++++++++++++++++------------------------- 2 files changed, 68 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e64eba5b343e6ad2487…

1 0

Piotr Caban : msvcrt: Import y1 implementation from musl.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: e10bd6f46f6ae174cfe9ea4550dc367877f1581e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10bd6f46f6ae174cfe9ea45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:19 2021 +0200 msvcrt: Import y1 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 46 ++++++++++++++++++++++++++++++++++++---------- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/configure b/configure index cdc0342b066..3c12aa85227 100755 --- a/configure +++ b/configure @@ -19662,7 +19662,6 @@ for ac_func in \ tgammaf \ trunc \ truncf \ - y1 \ yn do : diff --git a/configure.ac b/configure.ac index 03915d384f2..65661d89263 100644 --- a/configure.ac +++ b/configure.ac @@ -2705,7 +2705,6 @@ AC_CHECK_FUNCS(\ tgammaf \ trunc \ truncf \ - y1 \ yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0ebe7b91cb7..aa5f4b1af7b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2971,18 +2971,44 @@ double CDECL _y0(double x) /********************************************************************* * _y1 (MSVCRT.@) */ -double CDECL _y1(double num) +double CDECL _y1(double x) { - double retval; + static const double tpi = 6.36619772367581382433e-01, + u00 = -1.96057090646238940668e-01, + u01 = 5.04438716639811282616e-02, + u02 = -1.91256895875763547298e-03, + u03 = 2.35252600561610495928e-05, + u04 = -9.19099158039878874504e-08, + v00 = 1.99167318236649903973e-02, + v01 = 2.02552581025135171496e-04, + v02 = 1.35608801097516229404e-06, + v03 = 6.22741452364621501295e-09, + v04 = 1.66559246207992079114e-11; - if (!isfinite(num)) *_errno() = EDOM; - retval = unix_funcs->y1( num ); - if (_fpclass(retval) == _FPCLASS_NINF) - { - *_errno() = EDOM; - retval = NAN; - } - return retval; + double z, u, v; + unsigned int ix, lx; + + ix = *(ULONGLONG*)&x >> 32; + lx = *(ULONGLONG*)&x; + + /* y1(nan)=nan, y1(<0)=nan, y1(0)=-inf, y1(inf)=0 */ + if ((ix << 1 | lx) == 0) + return math_error(_OVERFLOW, "_y1", x, 0, -INFINITY); + if (isnan(x)) + return x; + if (ix >> 31) + return math_error(_DOMAIN, "_y1", x, 0, 0 / (x - x)); + if (ix >= 0x7ff00000) + return 1 / x; + + if (ix >= 0x40000000) /* x >= 2 */ + return j1_y1_approx(ix, x, TRUE, 0); + if (ix < 0x3c900000) /* x < 2**-54 */ + return -tpi / x; + z = x * x; + u = u00 + z * (u01 + z * (u02 + z * (u03 + z * u04))); + v = 1 + z * (v00 + z * (v01 + z * (v02 + z * (v03 + z * v04)))); + return x * (u / v) + tpi * (j1(x) * log(x) - 1 / x); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 6b33eed223a..597d0ed7f64 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -952,19 +952,6 @@ static float CDECL unix_tgammaf(float x) #endif } -/********************************************************************* - * y1 - */ -static double CDECL unix_y1(double num) -{ -#ifdef HAVE_Y1 - return y1(num); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * yn */ @@ -1066,7 +1053,6 @@ static const struct unix_funcs funcs = unix_tgammaf, unix_trunc, unix_truncf, - unix_y1, unix_yn }; diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d7b1827e08e..21caa036498 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -109,7 +109,6 @@ struct unix_funcs float (CDECL *tgammaf)(float x); double (CDECL *trunc)(double x); float (CDECL *truncf)(float x); - double (CDECL *y1)(double num); double (CDECL *yn)(int order, double num); }; diff --git a/include/config.h.in b/include/config.h.in index 8985cf6b474..266d8cec8d9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1169,9 +1169,6 @@ /* Define if Xrandr has the XRRGetProviderResources function */ #undef HAVE_XRRGETPROVIDERRESOURCES -/* Define to 1 if you have the `y1' function. */ -#undef HAVE_Y1 - /* Define to 1 if you have the `yn' function. */ #undef HAVE_YN

1 0

Piotr Caban : msvcrt: Import j1 implementation from musl.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 3911ac3f45b8b1372f8677c8ee69c16d9848cd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3911ac3f45b8b1372f8677c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:15 2021 +0200 msvcrt: Import j1 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 229 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3911ac3f45b8b1372f86…

1 0

Piotr Caban : msvcrt: Import roundf implementation from musl.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 833e8cdd42a59df471f493e906efa3501adcd142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=833e8cdd42a59df471f493e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:27 2021 +0200 msvcrt: Import roundf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 25 ++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 429d97ebfdc..1ff743f0328 100755 --- a/configure +++ b/configure @@ -19656,7 +19656,6 @@ for ac_func in \ rint \ rintf \ round \ - roundf \ tgamma \ tgammaf \ trunc \ diff --git a/configure.ac b/configure.ac index e9dde0f9781..8ce76f1d645 100644 --- a/configure.ac +++ b/configure.ac @@ -2699,7 +2699,6 @@ AC_CHECK_FUNCS(\ rint \ rintf \ round \ - roundf \ tgamma \ tgammaf \ trunc \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5a0c0874ee5..586f8950e0a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4329,10 +4329,33 @@ double CDECL round(double x) /********************************************************************* * roundf (MSVCR120.@) + * + * Copied from musl: src/math/roundf.c */ float CDECL roundf(float x) { - return unix_funcs->roundf(x); + static const float toint = 1 / FLT_EPSILON; + + unsigned int ix = *(unsigned int*)&x; + int e = ix >> 23 & 0xff; + float y; + + if (e >= 0x7f + 23) + return x; + if (ix >> 31) + x = -x; + if (e < 0x7f - 1) + return 0 * *(float*)&ix; + y = fp_barrierf(x + toint) - toint - x; + if (y > 0.5f) + y = y + x - 1; + else if (y <= -0.5f) + y = y + x + 1; + else + y = y + x; + if (ix >> 31) + y = -y; + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index d62110c0006..456cb3de574 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -765,18 +765,6 @@ static double CDECL unix_round(double x) #endif } -/********************************************************************* - * roundf - */ -static float CDECL unix_roundf(float x) -{ -#ifdef HAVE_ROUNDF - return roundf(x); -#else - return unix_round(x); -#endif -} - /********************************************************************* * lround */ @@ -1013,7 +1001,6 @@ static const struct unix_funcs funcs = unix_rint, unix_rintf, unix_round, - unix_roundf, unix_sin, unix_sinf, unix_sinh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 5f1f79d5e4b..2841a28f478 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -95,7 +95,6 @@ struct unix_funcs double (CDECL *rint)(double x); float (CDECL *rintf)(float x); double (CDECL *round)(double x); - float (CDECL *roundf)(float x); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); diff --git a/include/config.h.in b/include/config.h.in index 11f29fcf8bc..749b79e1092 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -705,9 +705,6 @@ /* Define to 1 if you have the `round' function. */ #undef HAVE_ROUND -/* Define to 1 if you have the `roundf' function. */ -#undef HAVE_ROUNDF - /* Define to 1 if you have the <sasl/sasl.h> header file. */ #undef HAVE_SASL_SASL_H

1 0

Piotr Caban : msvcrt: Import lroundf implementation from musl.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 7fa8b03cd3ff16664bd3bfb3286dff1346e5dc08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa8b03cd3ff16664bd3bfb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:35 2021 +0200 msvcrt: Import lroundf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 690f9333f14..794a3e09c29 100755 --- a/configure +++ b/configure @@ -19642,7 +19642,6 @@ for ac_func in \ lrint \ lrintf \ lround \ - lroundf \ nearbyint \ nearbyintf \ nexttoward \ diff --git a/configure.ac b/configure.ac index b0977c112b4..3bfa2885002 100644 --- a/configure.ac +++ b/configure.ac @@ -2685,7 +2685,6 @@ AC_CHECK_FUNCS(\ lrint \ lrintf \ lround \ - lroundf \ nearbyint \ nearbyintf \ nexttoward \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c8dd53cf095..e1251ba7115 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4368,10 +4368,17 @@ __msvcrt_long CDECL lround(double x) /********************************************************************* * lroundf (MSVCR120.@) + * + * Copied from musl: src/math/lroundf.c */ __msvcrt_long CDECL lroundf(float x) { - return unix_funcs->lroundf( x ); + float f = roundf(x); + if (f != (float)(__msvcrt_long)f) { + *_errno() = EDOM; + return 0; + } + return f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index e3ddd486e93..3bf99c09c24 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -777,18 +777,6 @@ static int CDECL unix_lround(double x) #endif } -/********************************************************************* - * lroundf - */ -static int CDECL unix_lroundf(float x) -{ -#ifdef HAVE_LROUNDF - return lroundf(x); -#else - return unix_lround(x); -#endif -} - /********************************************************************* * sin */ @@ -957,7 +945,6 @@ static const struct unix_funcs funcs = unix_lrint, unix_lrintf, unix_lround, - unix_lroundf, unix_modf, unix_modff, unix_nearbyint, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 49ec319d219..c74115bc76c 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -75,7 +75,6 @@ struct unix_funcs int (CDECL *lrint)(double x); int (CDECL *lrintf)(float x); int (CDECL *lround)(double x); - int (CDECL *lroundf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num); diff --git a/include/config.h.in b/include/config.h.in index 71f9f4350b0..544fe85b248 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -480,9 +480,6 @@ /* Define to 1 if you have the `lround' function. */ #undef HAVE_LROUND -/* Define to 1 if you have the `lroundf' function. */ -#undef HAVE_LROUNDF - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT

1 0