April 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the nextafter()/nextafterf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 85e655445bb0d8aa5951f9c53eebaf3c4c37897a URL: https://gitlab.winehq.org/wine/wine/-/commit/85e655445bb0d8aa5951f9c53eebaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 16:48:53 2023 +0200 msvcrt: Use the nextafter()/nextafterf() implementation from the bundled musl library. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 10 ++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/math.c | 89 +---------------------------------------- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 20 ++++----- libs/musl/src/math/nextafter.c | 14 +++++-- libs/musl/src/math/nextafterf.c | 14 +++++-- 14 files changed, 52 insertions(+), 123 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the nexttoward()/nexttowardf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 8252be560eb836755157bf07876b447e6bf36957 URL: https://gitlab.winehq.org/wine/wine/-/commit/8252be560eb836755157bf07876b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 17:35:07 2023 +0200 msvcrt: Use the nexttoward()/nexttowardf() implementation from the bundled musl library. Rename the musl functions to avoid compiler warnings about the signature mismatch (double vs. long double). --- dlls/msvcr120/msvcr120.spec | 6 ++--- dlls/msvcrt/math.c | 53 ---------------------------------------- dlls/ucrtbase/ucrtbase.spec | 12 ++++----- libs/musl/src/math/nexttoward.c | 2 +- libs/musl/src/math/nexttowardf.c | 10 +++++--- 5 files changed, 17 insertions(+), 66 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index cdd5848f7e9..102d6319f47 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2303,9 +2303,9 @@ @ cdecl nextafter(double double) @ cdecl nextafterf(float float) @ cdecl nextafterl(double double) nextafter -@ cdecl nexttoward(double double) MSVCRT_nexttoward -@ cdecl nexttowardf(float double) MSVCRT_nexttowardf -@ cdecl nexttowardl(double double) MSVCRT_nexttoward +@ cdecl nexttoward(double double) __nexttoward +@ cdecl nexttowardf(float double) __nexttowardf +@ cdecl nexttowardl(double double) __nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dbd9bde4d32..68218b7007b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4076,59 +4076,6 @@ float CDECL nearbyintf(float x) return x; } -/********************************************************************* - * nexttoward (MSVCR120.@) - */ -double CDECL MSVCRT_nexttoward(double num, double next) -{ - return nextafter(num, next); -} - -/********************************************************************* - * nexttowardf (MSVCR120.@) - * - * Copied from musl: src/math/nexttowardf.c - */ -float CDECL MSVCRT_nexttowardf(float x, double y) -{ - unsigned int ix = *(unsigned int*)&x; - unsigned int e; - float ret; - - if (isnan(x) || isnan(y)) - return x + y; - if (x == y) - return y; - if (x == 0) { - ix = 1; - if (signbit(y)) - ix |= 0x80000000; - } else if (x < y) { - if (signbit(x)) - ix--; - else - ix++; - } else { - if (signbit(x)) - ix++; - else - ix--; - } - e = ix & 0x7f800000; - /* raise overflow if ix is infinite and x is finite */ - if (e == 0x7f800000) { - fp_barrierf(x + x); - *_errno() = ERANGE; - } - ret = *(float*)&ix; - /* raise underflow if ret is subnormal or zero */ - if (e == 0) { - fp_barrierf(x * x + ret * ret); - *_errno() = ERANGE; - } - return ret; -} - #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a6db1a60c5d..a476681fc43 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1733,9 +1733,9 @@ @ cdecl _o_nextafter(double double) nextafter @ cdecl _o_nextafterf(float float) nextafterf @ cdecl _o_nextafterl(double double) nextafter -@ cdecl _o_nexttoward(double double) MSVCRT_nexttoward -@ cdecl _o_nexttowardf(float double) MSVCRT_nexttowardf -@ cdecl _o_nexttowardl(double double) MSVCRT_nexttoward +@ cdecl _o_nexttoward(double double) __nexttoward +@ cdecl _o_nexttowardf(float double) __nexttowardf +@ cdecl _o_nexttowardl(double double) __nexttoward @ cdecl _o_pow(double double) pow @ cdecl -arch=!i386 _o_powf(float float) powf @ cdecl _o_putc(long ptr) putc @@ -2441,9 +2441,9 @@ @ cdecl nextafter(double double) @ cdecl nextafterf(float float) @ cdecl nextafterl(double double) nextafter -@ cdecl nexttoward(double double) MSVCRT_nexttoward -@ cdecl nexttowardf(float double) MSVCRT_nexttowardf -@ cdecl nexttowardl(double double) MSVCRT_nexttoward +@ cdecl nexttoward(double double) __nexttoward +@ cdecl nexttowardf(float double) __nexttowardf +@ cdecl nexttowardl(double double) __nexttoward @ stub norm @ stub normf @ stub norml diff --git a/libs/musl/src/math/nexttoward.c b/libs/musl/src/math/nexttoward.c index e4cef9535c3..85fbb486129 100644 --- a/libs/musl/src/math/nexttoward.c +++ b/libs/musl/src/math/nexttoward.c @@ -1,7 +1,7 @@ #include "libm.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 -double __cdecl nexttoward(double x, long double y) +double __cdecl __nexttoward(double x, double y) { return nextafter(x, y); } diff --git a/libs/musl/src/math/nexttowardf.c b/libs/musl/src/math/nexttowardf.c index 6c32f6c6733..5be52b882d1 100644 --- a/libs/musl/src/math/nexttowardf.c +++ b/libs/musl/src/math/nexttowardf.c @@ -1,6 +1,6 @@ #include "libm.h" -float __cdecl nexttowardf(float x, long double y) +float __cdecl __nexttowardf(float x, double y) { union {float f; uint32_t i;} ux = {x}; uint32_t e; @@ -26,10 +26,14 @@ float __cdecl nexttowardf(float x, long double y) } e = ux.i & 0x7f800000; /* raise overflow if ux.f is infinite and x is finite */ - if (e == 0x7f800000) + if (e == 0x7f800000) { FORCE_EVAL(x+x); + errno = ERANGE; + } /* raise underflow if ux.f is subnormal or zero */ - if (e == 0) + if (e == 0) { FORCE_EVAL(x*x + ux.f*ux.f); + errno = ERANGE; + } return ux.f; }

1 0

Alexandre Julliard : msvcrt: Use the __rem_pio2()/__rem_pio2f() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: b9b19ea2db2266b3cb35d20882e286dc117d04c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9b19ea2db2266b3cb35d20882e286… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:36:09 2023 +0200 msvcrt: Use the __rem_pio2()/__rem_pio2f() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 424 +-------------------------------------- libs/musl/src/math/__rem_pio2.c | 2 +- libs/musl/src/math/__rem_pio2f.c | 2 +- 3 files changed, 10 insertions(+), 418 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the __sindf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: b46bf3ffb14d193c430f1707aa0480b92057c029 URL: https://gitlab.winehq.org/wine/wine/-/commit/b46bf3ffb14d193c430f1707aa0480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 13:36:49 2023 +0200 msvcrt: Use the __sindf() implementation from the bundled musl library. With the changes from ee7b5ebc3a7843fc2997d5cc5f7784c4d51b4f8d. --- dlls/msvcrt/math.c | 20 +------------------- libs/musl/src/math/__sindf.c | 10 ++++++---- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index befd05e9ad0..8fa904b1cc9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -219,25 +219,7 @@ float CDECL _chgsignf( float num ) #endif #ifndef __i386__ -/* Copied from musl: src/math/__sindf.c */ -static float __sindf(double x) -{ - static const double S1 = -0x1.5555555555555p-3, - S2 = 0x1.1111111111111p-7, - S3 = -0x1.a01a01a01a01ap-13, - S4 = 0x1.71de3a556c734p-19; - - double r, s, w, z; - - z = x * x; - if (x > -7.8175831586122513e-03 && x < 7.8175831586122513e-03) - return x * (1 + S1 * z); - - w = z * z; - r = S3 + z * S4; - s = z * x; - return (x + s * (S1 + z * S2)) + s * w * r; -} +extern float __sindf(double x); /* Copied from musl: src/math/__cosdf.c */ static float __cosdf(double x) diff --git a/libs/musl/src/math/__sindf.c b/libs/musl/src/math/__sindf.c index 8fec2a3f660..fda8a247621 100644 --- a/libs/musl/src/math/__sindf.c +++ b/libs/musl/src/math/__sindf.c @@ -18,10 +18,10 @@ /* |sin(x)/x - s(x)| < 2**-37.5 (~[-4.89e-12, 4.824e-12]). */ static const double -S1 = -0x15555554cbac77.0p-55, /* -0.166666666416265235595 */ -S2 = 0x111110896efbb2.0p-59, /* 0.0083333293858894631756 */ -S3 = -0x1a00f9e2cae774.0p-65, /* -0.000198393348360966317347 */ -S4 = 0x16cd878c3b46a7.0p-71; /* 0.0000027183114939898219064 */ +S1 = -0x1.5555555555555p-3, +S2 = 0x1.1111111111111p-7, +S3 = -0x1.a01a01a01a01ap-13, +S4 = 0x1.71de3a556c734p-19; float __sindf(double x) { @@ -29,6 +29,8 @@ float __sindf(double x) /* Try to optimize for parallel evaluation as in __tandf.c. */ z = x*x; + if (x > -7.8175831586122513e-03 && x < 7.8175831586122513e-03) + return x * (1 + S1 * z); w = z*z; r = S3 + z*S4; s = z*x;

1 0

Alexandre Julliard : msvcrt: Use the __cosdf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 90c61c7cd2d120ebc48e262bc47186ce23cd233e URL: https://gitlab.winehq.org/wine/wine/-/commit/90c61c7cd2d120ebc48e262bc47186… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 13:37:39 2023 +0200 msvcrt: Use the __cosdf() implementation from the bundled musl library. With the changes from 9008cd2f2437650ad41ce8a8924ed1828ca21889. --- dlls/msvcrt/math.c | 17 +---------------- libs/musl/src/math/__cosdf.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8fa904b1cc9..684a4807489 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -220,22 +220,7 @@ float CDECL _chgsignf( float num ) #ifndef __i386__ extern float __sindf(double x); - -/* Copied from musl: src/math/__cosdf.c */ -static float __cosdf(double x) -{ - static const double C0 = -0x1.0000000000000p-1, - C1 = 0x1.5555555555555p-5, - C2 = -0x1.6c16c16c16c17p-10, - C3 = 0x1.a01a01a01a01ap-16, - C4 = -0x1.27e4fb7789f5cp-22; - double z; - - z = x * x; - if (x > -7.8163146972656250e-03 && x < 7.8163146972656250e-03) - return 1 + C0 * z; - return 1.0 + z * (C0 + z * (C1 + z * (C2 + z * (C3 + z * C4)))); -} +extern float __cosdf(double x); static const UINT64 exp2f_T[] = { 0x3ff0000000000000ULL, 0x3fefd9b0d3158574ULL, 0x3fefb5586cf9890fULL, 0x3fef9301d0125b51ULL, diff --git a/libs/musl/src/math/__cosdf.c b/libs/musl/src/math/__cosdf.c index 2124989b329..a84a50c6980 100644 --- a/libs/musl/src/math/__cosdf.c +++ b/libs/musl/src/math/__cosdf.c @@ -18,18 +18,18 @@ /* |cos(x) - c(x)| < 2**-34.1 (~[-5.37e-11, 5.295e-11]). */ static const double -C0 = -0x1ffffffd0c5e81.0p-54, /* -0.499999997251031003120 */ -C1 = 0x155553e1053a42.0p-57, /* 0.0416666233237390631894 */ -C2 = -0x16c087e80f1e27.0p-62, /* -0.00138867637746099294692 */ -C3 = 0x199342e0ee5069.0p-68; /* 0.0000243904487962774090654 */ +C0 = -0x1.0000000000000p-1, +C1 = 0x1.5555555555555p-5, +C2 = -0x1.6c16c16c16c17p-10, +C3 = 0x1.a01a01a01a01ap-16, +C4 = -0x1.27e4fb7789f5cp-22; float __cosdf(double x) { - double_t r, w, z; + double_t z; - /* Try to optimize for parallel evaluation as in __tandf.c. */ z = x*x; - w = z*z; - r = C2+z*C3; - return ((1.0+z*C0) + w*C1) + (w*z)*r; + if (x > -7.8163146972656250e-03 && x < 7.8163146972656250e-03) + return 1 + C0 * z; + return 1.0 + z * (C0 + z * (C1 + z * (C2 + z * (C3 + z * C4)))); }

1 0

Alexandre Julliard : msvcrt: Use the sin()/sinf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 5ddd46592d4623a623390e9f13256bf85bd65818 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ddd46592d4623a623390e9f13256b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 14:51:27 2023 +0200 msvcrt: Use the sin()/sinf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 103 ---------------------------------------------- libs/musl/src/math/sin.c | 2 + libs/musl/src/math/sinf.c | 2 + 3 files changed, 4 insertions(+), 103 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 684a4807489..d676f813055 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -787,69 +787,6 @@ float CDECL powf( float x, float y ) return powf_exp2(ylogx, sign_bias); } -/********************************************************************* - * sinf (MSVCRT.@) - * - * Copied from musl: src/math/sinf.c - */ -float CDECL sinf( float x ) -{ - static const double s1pio2 = 1*M_PI_2, - s2pio2 = 2*M_PI_2, - s3pio2 = 3*M_PI_2, - s4pio2 = 4*M_PI_2; - - double y; - UINT32 ix; - int n, sign; - - ix = *(UINT32*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - - if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ - if (ix < 0x39800000) { /* |x| < 2**-12 */ - /* raise inexact if x!=0 and underflow if subnormal */ - fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f); - return x; - } - return __sindf(x); - } - if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ - if (ix <= 0x4016cbe3) { /* |x| ~<= 3pi/4 */ - if (sign) - return -__cosdf(x + s1pio2); - else - return __cosdf(x - s1pio2); - } - return __sindf(sign ? -(x + s2pio2) : -(x - s2pio2)); - } - if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ - if (ix <= 0x40afeddf) { /* |x| ~<= 7*pi/4 */ - if (sign) - return __cosdf(x + s3pio2); - else - return -__cosdf(x - s3pio2); - } - return __sindf(sign ? x + s4pio2 : x - s4pio2); - } - - /* sin(Inf or NaN) is NaN */ - if (isinf(x)) - return math_error(_DOMAIN, "sinf", x, 0, x - x); - if (ix >= 0x7f800000) - return x - x; - - /* general argument reduction needed */ - n = __rem_pio2f(x, &y); - switch (n&3) { - case 0: return __sindf(y); - case 1: return __cosdf(y); - case 2: return __sindf(-y); - default: return -__cosdf(y); - } -} - static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -2117,46 +2054,6 @@ double CDECL pow( double x, double y ) return pow_exp(x, y, ehi, elo, sign_bias); } -/********************************************************************* - * sin (MSVCRT.@) - * - * Copied from musl: src/math/sin.c - */ -double CDECL sin( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e500000) { /* |x| < 2**-26 */ - /* raise inexact if x != 0 and underflow if subnormal*/ - fp_barrier(ix < 0x00100000 ? x/0x1p120f : x+0x1p120f); - return x; - } - return __sin(x, 0.0, 0); - } - - /* sin(Inf or NaN) is NaN */ - if (isinf(x)) - return math_error(_DOMAIN, "sin", x, 0, x - x); - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction needed */ - n = __rem_pio2(x, y); - switch (n&3) { - case 0: return __sin(y[0], y[1], 1); - case 1: return __cos(y[0], y[1]); - case 2: return -__sin(y[0], y[1], 1); - default: return -__cos(y[0], y[1]); - } -} - static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); diff --git a/libs/musl/src/math/sin.c b/libs/musl/src/math/sin.c index fac84f2b27f..4bbc2ee6d85 100644 --- a/libs/musl/src/math/sin.c +++ b/libs/musl/src/math/sin.c @@ -63,6 +63,8 @@ double __cdecl sin(double x) } /* sin(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "sin", x, 0, x - x); if (ix >= 0x7ff00000) return x - x; diff --git a/libs/musl/src/math/sinf.c b/libs/musl/src/math/sinf.c index de0745649c8..5565b7760ab 100644 --- a/libs/musl/src/math/sinf.c +++ b/libs/musl/src/math/sinf.c @@ -61,6 +61,8 @@ float __cdecl sinf(float x) } /* sin(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "sinf", x, 0, x - x); if (ix >= 0x7f800000) return x - x;

1 0

Alexandre Julliard : msvcrt: Use the cos()/cosf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 6ec636f288d98fdf8f1cb15ff1d9a13dbc61f55f URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec636f288d98fdf8f1cb15ff1d9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 14:53:15 2023 +0200 msvcrt: Use the cos()/cosf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 147 ---------------------------------------------- libs/musl/src/math/cos.c | 2 + libs/musl/src/math/cosf.c | 2 + 3 files changed, 4 insertions(+), 147 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d676f813055..8b5f8ee3099 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -219,9 +219,6 @@ float CDECL _chgsignf( float num ) #endif #ifndef __i386__ -extern float __sindf(double x); -extern float __cosdf(double x); - static const UINT64 exp2f_T[] = { 0x3ff0000000000000ULL, 0x3fefd9b0d3158574ULL, 0x3fefb5586cf9890fULL, 0x3fef9301d0125b51ULL, 0x3fef72b83c7d517bULL, 0x3fef54873168b9aaULL, 0x3fef387a6e756238ULL, 0x3fef1e9df51fdee1ULL, @@ -494,70 +491,6 @@ float CDECL atanf( float x ) extern int __rem_pio2f(float x, double *y); -/********************************************************************* - * cosf (MSVCRT.@) - * - * Copied from musl: src/math/cosf.c - */ -float CDECL cosf( float x ) -{ - static const double c1pio2 = 1*M_PI_2, - c2pio2 = 2*M_PI_2, - c3pio2 = 3*M_PI_2, - c4pio2 = 4*M_PI_2; - - double y; - UINT32 ix; - unsigned n, sign; - - ix = *(UINT32*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - - if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ - if (ix < 0x39800000) { /* |x| < 2**-12 */ - /* raise inexact if x != 0 */ - fp_barrierf(x + 0x1p120f); - return 1.0f; - } - return __cosdf(x); - } - if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ - if (ix > 0x4016cbe3) /* |x| ~> 3*pi/4 */ - return -__cosdf(sign ? x + c2pio2 : x - c2pio2); - else { - if (sign) - return __sindf(x + c1pio2); - else - return __sindf(c1pio2 - x); - } - } - if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ - if (ix > 0x40afeddf) /* |x| ~> 7*pi/4 */ - return __cosdf(sign ? x + c4pio2 : x - c4pio2); - else { - if (sign) - return __sindf(-x - c3pio2); - else - return __sindf(x - c3pio2); - } - } - - /* cos(Inf or NaN) is NaN */ - if (isinf(x)) return math_error(_DOMAIN, "cosf", x, 0, x - x); - if (ix >= 0x7f800000) - return x - x; - - /* general argument reduction needed */ - n = __rem_pio2f(x, &y); - switch (n & 3) { - case 0: return __cosdf(y); - case 1: return __sindf(-y); - case 2: return -__cosdf(y); - default: return __sindf(y); - } -} - /********************************************************************* * expf (MSVCRT.@) */ @@ -1309,86 +1242,6 @@ double CDECL rint(double x) extern int __rem_pio2(double x, double *y); -/* Copied from musl: src/math/__sin.c */ -static double __sin(double x, double y, int iy) -{ - static const double S1 = -1.66666666666666324348e-01, - S2 = 8.33333333332248946124e-03, - S3 = -1.98412698298579493134e-04, - S4 = 2.75573137070700676789e-06, - S5 = -2.50507602534068634195e-08, - S6 = 1.58969099521155010221e-10; - - double z, r, v, w; - - z = x * x; - w = z * z; - r = S2 + z * (S3 + z * S4) + z * w * (S5 + z * S6); - v = z * x; - if (iy == 0) - return x + v * (S1 + z * r); - else - return x - ((z * (0.5 * y - v * r) - y) - v * S1); -} - -/* Copied from musl: src/math/__cos.c */ -static double __cos(double x, double y) -{ - static const double C1 = 4.16666666666666019037e-02, - C2 = -1.38888888888741095749e-03, - C3 = 2.48015872894767294178e-05, - C4 = -2.75573143513906633035e-07, - C5 = 2.08757232129817482790e-09, - C6 = -1.13596475577881948265e-11; - double hz, z, r, w; - - z = x * x; - w = z * z; - r = z * (C1 + z * (C2 + z * C3)) + w * w * (C4 + z * (C5 + z * C6)); - hz = 0.5 * z; - w = 1.0 - hz; - return w + (((1.0 - w) - hz) + (z * r - x * y)); -} - -/********************************************************************* - * cos (MSVCRT.@) - * - * Copied from musl: src/math/cos.c - */ -double CDECL cos( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e46a09e) { /* |x| < 2**-27 * sqrt(2) */ - /* raise inexact if x!=0 */ - fp_barrier(x + 0x1p120f); - return 1.0; - } - return __cos(x, 0); - } - - /* cos(Inf or NaN) is NaN */ - if (isinf(x)) return math_error(_DOMAIN, "cos", x, 0, x - x); - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction */ - n = __rem_pio2(x, y); - switch (n & 3) { - case 0: return __cos(y[0], y[1]); - case 1: return -__sin(y[0], y[1], 1); - case 2: return -__cos(y[0], y[1]); - default: return __sin(y[0], y[1], 1); - } -} - /* Copied from musl: src/math/exp_data.c */ static const UINT64 exp_T[] = { 0x0ULL, 0x3ff0000000000000ULL, diff --git a/libs/musl/src/math/cos.c b/libs/musl/src/math/cos.c index 0fae2287270..eb5c2a475e9 100644 --- a/libs/musl/src/math/cos.c +++ b/libs/musl/src/math/cos.c @@ -62,6 +62,8 @@ double __cdecl cos(double x) } /* cos(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "cos", x, 0, x - x); if (ix >= 0x7ff00000) return x-x; diff --git a/libs/musl/src/math/cosf.c b/libs/musl/src/math/cosf.c index 25f4da07409..a2d7b149c02 100644 --- a/libs/musl/src/math/cosf.c +++ b/libs/musl/src/math/cosf.c @@ -63,6 +63,8 @@ float __cdecl cosf(float x) } /* cos(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "cosf", x, 0, x - x); if (ix >= 0x7f800000) return x-x;

1 0

Alexandre Julliard : msvcrt: Use the tan()/tanf() implementation from the bundled musl library.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 25c233ece4fec09ad37aa79c4ce49dbb4a50a515 URL: https://gitlab.winehq.org/wine/wine/-/commit/25c233ece4fec09ad37aa79c4ce49d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 14:56:08 2023 +0200 msvcrt: Use the tan()/tanf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 171 ---------------------------------------------- libs/musl/src/math/tan.c | 2 + libs/musl/src/math/tanf.c | 2 + 3 files changed, 4 insertions(+), 171 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8b5f8ee3099..71d193290de 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -489,8 +489,6 @@ float CDECL atanf( float x ) return sign ? -z : z; } -extern int __rem_pio2f(float x, double *y); - /********************************************************************* * expf (MSVCRT.@) */ @@ -813,82 +811,6 @@ float CDECL sqrtf( float x ) #endif } -/* Copied from musl: src/math/__tandf.c */ -static float __tandf(double x, int odd) -{ - static const double T[] = { - 0x15554d3418c99f.0p-54, - 0x1112fd38999f72.0p-55, - 0x1b54c91d865afe.0p-57, - 0x191df3908c33ce.0p-58, - 0x185dadfcecf44e.0p-61, - 0x1362b9bf971bcd.0p-59, - }; - - double z, r, w, s, t, u; - - z = x * x; - r = T[4] + z * T[5]; - t = T[2] + z * T[3]; - w = z * z; - s = z * x; - u = T[0] + z * T[1]; - r = (x + s * u) + (s * w) * (t + w * r); - return odd ? -1.0 / r : r; -} - -/********************************************************************* - * tanf (MSVCRT.@) - * - * Copied from musl: src/math/tanf.c - */ -float CDECL tanf( float x ) -{ - static const double t1pio2 = 1*M_PI_2, - t2pio2 = 2*M_PI_2, - t3pio2 = 3*M_PI_2, - t4pio2 = 4*M_PI_2; - - double y; - UINT32 ix; - unsigned n, sign; - - ix = *(UINT32*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - - if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ - if (ix < 0x39800000) { /* |x| < 2**-12 */ - /* raise inexact if x!=0 and underflow if subnormal */ - fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f); - return x; - } - return __tandf(x, 0); - } - if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ - if (ix <= 0x4016cbe3) /* |x| ~<= 3pi/4 */ - return __tandf((sign ? x + t1pio2 : x - t1pio2), 1); - else - return __tandf((sign ? x + t2pio2 : x - t2pio2), 0); - } - if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ - if (ix <= 0x40afeddf) /* |x| ~<= 7*pi/4 */ - return __tandf((sign ? x + t3pio2 : x - t3pio2), 1); - else - return __tandf((sign ? x + t4pio2 : x - t4pio2), 0); - } - - /* tan(Inf or NaN) is NaN */ - if (isinf(x)) - return math_error(_DOMAIN, "tanf", x, 0, x - x); - if (ix >= 0x7f800000) - return x - x; - - /* argument reduction */ - n = __rem_pio2f(x, &y); - return __tandf(y, n & 1); -} - /********************************************************************* * tanhf (MSVCRT.@) */ @@ -1240,8 +1162,6 @@ double CDECL rint(double x) return y; } -extern int __rem_pio2(double x, double *y); - /* Copied from musl: src/math/exp_data.c */ static const UINT64 exp_T[] = { 0x0ULL, 0x3ff0000000000000ULL, @@ -2068,97 +1988,6 @@ double CDECL sqrt( double x ) #endif } -/* Copied from musl: src/math/__tan.c */ -static double __tan(double x, double y, int odd) -{ - static const double T[] = { - 3.33333333333334091986e-01, - 1.33333333333201242699e-01, - 5.39682539762260521377e-02, - 2.18694882948595424599e-02, - 8.86323982359930005737e-03, - 3.59207910759131235356e-03, - 1.45620945432529025516e-03, - 5.88041240820264096874e-04, - 2.46463134818469906812e-04, - 7.81794442939557092300e-05, - 7.14072491382608190305e-05, - -1.85586374855275456654e-05, - 2.59073051863633712884e-05, - }; - static const double pio4 = 7.85398163397448278999e-01; - static const double pio4lo = 3.06161699786838301793e-17; - - double z, r, v, w, s, a, w0, a0; - UINT32 hx; - int big, sign; - - hx = *(ULONGLONG*)&x >> 32; - big = (hx & 0x7fffffff) >= 0x3FE59428; /* |x| >= 0.6744 */ - if (big) { - sign = hx >> 31; - if (sign) { - x = -x; - y = -y; - } - x = (pio4 - x) + (pio4lo - y); - y = 0.0; - } - z = x * x; - w = z * z; - r = T[1] + w * (T[3] + w * (T[5] + w * (T[7] + w * (T[9] + w * T[11])))); - v = z * (T[2] + w * (T[4] + w * (T[6] + w * (T[8] + w * (T[10] + w * T[12]))))); - s = z * x; - r = y + z * (s * (r + v) + y) + s * T[0]; - w = x + r; - if (big) { - s = 1 - 2 * odd; - v = s - 2.0 * (x + (r - w * w / (w + s))); - return sign ? -v : v; - } - if (!odd) - return w; - /* -1.0/(x+r) has up to 2ulp error, so compute it accurately */ - w0 = w; - *(LONGLONG*)&w0 = *(LONGLONG*)&w0 & 0xffffffff00000000ULL; - v = r - (w0 - x); /* w0+v = r+x */ - a0 = a = -1.0 / w; - *(LONGLONG*)&a0 = *(LONGLONG*)&a0 & 0xffffffff00000000ULL; - return a0 + a * (1.0 + a0 * w0 + a0 * v); -} - -/********************************************************************* - * tan (MSVCRT.@) - * - * Copied from musl: src/math/tan.c - */ -double CDECL tan( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - if (ix <= 0x3fe921fb) { /* |x| ~< pi/4 */ - if (ix < 0x3e400000) { /* |x| < 2**-27 */ - /* raise inexact if x!=0 and underflow if subnormal */ - fp_barrier(ix < 0x00100000 ? x / 0x1p120f : x + 0x1p120f); - return x; - } - return __tan(x, 0.0, 0); - } - - if (isinf(x)) - return math_error(_DOMAIN, "tan", x, 0, x - x); - if (ix >= 0x7ff00000) - return x - x; - - n = __rem_pio2(x, y); - return __tan(y[0], y[1], n & 1); -} - /********************************************************************* * tanh (MSVCRT.@) */ diff --git a/libs/musl/src/math/tan.c b/libs/musl/src/math/tan.c index 22f06f14603..895976d8327 100644 --- a/libs/musl/src/math/tan.c +++ b/libs/musl/src/math/tan.c @@ -61,6 +61,8 @@ double __cdecl tan(double x) } /* tan(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "tan", x, 0, x - x); if (ix >= 0x7ff00000) return x - x; diff --git a/libs/musl/src/math/tanf.c b/libs/musl/src/math/tanf.c index d3849734e08..99e2a5c8bac 100644 --- a/libs/musl/src/math/tanf.c +++ b/libs/musl/src/math/tanf.c @@ -55,6 +55,8 @@ float __cdecl tanf(float x) } /* tan(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "tanf", x, 0, x - x); if (ix >= 0x7f800000) return x - x;

1 0

Zebediah Figura : d3dx10/tests: Port some additional D3DX10GetImageInfoFromMemory() tests from d3dx11.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 2666d020dedc2a8866f21567200659b73690a40b URL: https://gitlab.winehq.org/wine/wine/-/commit/2666d020dedc2a8866f21567200659… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 31 17:10:11 2023 -0500 d3dx10/tests: Port some additional D3DX10GetImageInfoFromMemory() tests from d3dx11. --- dlls/d3dx10_43/tests/d3dx10.c | 303 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 297 insertions(+), 6 deletions(-)

1 0

Zebediah Figura : windowscodecs: Map GUID_WICPixelFormat32bppRGBA1010102 to DXGI_FORMAT_R10G10B10A2_UNORM as well.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 2d9b61d0394f3d5ed1d10740933de9bd895b06ca URL: https://gitlab.winehq.org/wine/wine/-/commit/2d9b61d0394f3d5ed1d10740933de9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 31 18:19:43 2023 -0500 windowscodecs: Map GUID_WICPixelFormat32bppRGBA1010102 to DXGI_FORMAT_R10G10B10A2_UNORM as well. --- dlls/d3dx10_43/tests/d3dx10.c | 1 + dlls/windowscodecs/ddsformat.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 1253ca0dd73..d4b64455913 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2921,6 +2921,7 @@ static void test_get_image_info(void) check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, DXGI_FORMAT_R8G8B8A8_UNORM); check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, DXGI_FORMAT_R8G8B8A8_UNORM); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, DXGI_FORMAT_R10G10B10A2_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, DXGI_FORMAT_R10G10B10A2_UNORM); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, DXGI_FORMAT_R8G8B8A8_UNORM); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, DXGI_FORMAT_R8G8B8A8_UNORM); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, DXGI_FORMAT_R8G8B8A8_UNORM); diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 62cd0dc3f7c..d7bc010a1c8 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -248,7 +248,7 @@ static struct dds_format { { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF00000,0xFFC00,0x3FF,0xC0000000 }, &GUID_WICPixelFormat32bppR10G10B10A2, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF,0xFFC00,0x3FF00000,0xC0000000 }, - &GUID_WICPixelFormat32bppRGBA1010102, 32, DXGI_FORMAT_UNKNOWN }, + &GUID_WICPixelFormat32bppRGBA1010102, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFF,0xFFFF0000,0,0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R16G16_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFFFFFF,0,0,0 },

1 0