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

Alexandre Julliard : msvcrt: Use the acos() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 938acddb9fa7396a717820a8a718f7aa767d9fd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/938acddb9fa7396a717820a8a718f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:01:12 2023 +0200 msvcrt: Use the acos() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 73 ----------------------------------------------- libs/musl/src/math/acos.c | 3 +- 2 files changed, 2 insertions(+), 74 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ba89c8446ba..32ee44fa246 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -443,79 +443,6 @@ float CDECL tanhf( float x ) #endif -/********************************************************************* - * acos (MSVCRT.@) - * - * Copied from musl: src/math/acos.c - */ -static double acos_R(double z) -{ - static const double pS0 = 1.66666666666666657415e-01, - pS1 = -3.25565818622400915405e-01, - pS2 = 2.01212532134862925881e-01, - pS3 = -4.00555345006794114027e-02, - pS4 = 7.91534994289814532176e-04, - pS5 = 3.47933107596021167570e-05, - qS1 = -2.40339491173441421878e+00, - qS2 = 2.02094576023350569471e+00, - qS3 = -6.88283971605453293030e-01, - qS4 = 7.70381505559019352791e-02; - - double p, q; - p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); - q = 1.0 + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); - return p/q; -} - -double CDECL acos( double x ) -{ - static const double pio2_hi = 1.57079632679489655800e+00, - pio2_lo = 6.12323399573676603587e-17; - - double z, w, s, c, df; - unsigned int hx, ix; - ULONGLONG llx; - - hx = *(ULONGLONG*)&x >> 32; - ix = hx & 0x7fffffff; - /* |x| >= 1 or nan */ - if (ix >= 0x3ff00000) { - unsigned int lx; - - lx = *(ULONGLONG*)&x; - if (((ix - 0x3ff00000) | lx) == 0) { - /* acos(1)=0, acos(-1)=pi */ - if (hx >> 31) - return 2 * pio2_hi + 7.5231638452626401e-37; - return 0; - } - if (isnan(x)) return x; - return math_error(_DOMAIN, "acos", x, 0, 0 / (x - x)); - } - /* |x| < 0.5 */ - if (ix < 0x3fe00000) { - if (ix <= 0x3c600000) /* |x| < 2**-57 */ - return pio2_hi + 7.5231638452626401e-37; - return pio2_hi - (x - (pio2_lo - x * acos_R(x * x))); - } - /* x < -0.5 */ - if (hx >> 31) { - z = (1.0 + x) * 0.5; - s = sqrt(z); - w = acos_R(z) * s - pio2_lo; - return 2 * (pio2_hi - (s + w)); - } - /* x > 0.5 */ - z = (1.0 - x) * 0.5; - s = sqrt(z); - df = s; - llx = (*(ULONGLONG*)&df >> 32) << 32; - df = *(double*)&llx; - c = (z - df * df) / (s + df); - w = acos_R(z) * s + c; - return 2 * (df + w); -} - /********************************************************************* * asin (MSVCRT.@) * diff --git a/libs/musl/src/math/acos.c b/libs/musl/src/math/acos.c index 950fe8e816c..405599e3bbd 100644 --- a/libs/musl/src/math/acos.c +++ b/libs/musl/src/math/acos.c @@ -75,7 +75,8 @@ double __cdecl acos(double x) return 2*pio2_hi + 0x1p-120f; return 0; } - return 0/(x-x); + if (isnan(x)) return x; + return math_error(_DOMAIN, "acos", x, 0, 0 / (x - x)); } /* |x| < 0.5 */ if (ix < 0x3fe00000) {

1 0

Alexandre Julliard : msvcrt: Use the acosh()/acoshf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: e2924fafdf161102903dde9e48f832f5ea80132b URL: https://gitlab.winehq.org/wine/wine/-/commit/e2924fafdf161102903dde9e48f832… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:47:56 2023 +0200 msvcrt: Use the acosh()/acoshf() implementation from the bundled musl library. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcrt/math.c | 28 ++++------------------------ dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 33bd6efb73e..f536aba9ba3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2012,9 +2012,9 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl -arch=!i386 acosf(float) -@ cdecl acosh(double) -@ cdecl acoshf(float) -@ cdecl acoshl(double) acosh +@ cdecl acosh(double) MSVCRT_acosh +@ cdecl acoshf(float) MSVCRT_acoshf +@ cdecl acoshl(double) MSVCRT_acosh @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) @ cdecl asin(double) MSVCRT_asin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ea72ca2f01c..4f95a4747a9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3349,50 +3349,30 @@ int CDECL _fdpcomp(float x, float y) /********************************************************************* * acosh (MSVCR120.@) - * - * Copied from musl: src/math/acosh.c */ -double CDECL acosh(double x) +double CDECL MSVCRT_acosh(double x) { - int e = *(UINT64*)&x >> 52 & 0x7ff; - if (x < 1) { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - - if (e < 0x3ff + 1) /* |x| < 2, up to 2ulp error in [1,1.125] */ - return log1p(x - 1 + sqrt((x - 1) * (x - 1) + 2 * (x - 1))); - if (e < 0x3ff + 26) /* |x| < 0x1p26 */ - return log(2 * x - 1 / (x + sqrt(x * x - 1))); - /* |x| >= 0x1p26 or nan */ - return log(x) + 0.693147180559945309417232121458176568; + return acosh( x ); } /********************************************************************* * acoshf (MSVCR120.@) - * - * Copied from musl: src/math/acoshf.c */ -float CDECL acoshf(float x) +float CDECL MSVCRT_acoshf(float x) { - UINT32 a = *(UINT32*)&x & 0x7fffffff; - if (x < 1) { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - - if (a < 0x3f800000 + (1 << 23)) /* |x| < 2, up to 2ulp error in [1,1.125] */ - return log1pf(x - 1 + sqrtf((x - 1) * (x - 1) + 2 * (x - 1))); - if (*(UINT32*)&x < 0x3f800000 + (12 << 23)) /* 2 <= x < 0x1p12 */ - return logf(2 * x - 1 / (x + sqrtf(x * x - 1))); - /* x >= 0x1p12 or x <= -2 or nan */ - return logf(x) + 0.693147180559945309417232121458176568f; + return acoshf( x ); } /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 45d883d410c..5bea04dad62 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1562,9 +1562,9 @@ @ cdecl _o_abort() abort @ cdecl _o_acos(double) acos @ cdecl -arch=!i386 _o_acosf(float) acosf -@ cdecl _o_acosh(double) acosh -@ cdecl _o_acoshf(float) acoshf -@ cdecl _o_acoshl(double) acosh +@ cdecl _o_acosh(double) MSVCRT_acosh +@ cdecl _o_acoshf(float) MSVCRT_acoshf +@ cdecl _o_acoshl(double) MSVCRT_acosh @ cdecl _o_asctime(ptr) asctime @ cdecl _o_asctime_s(ptr long ptr) asctime_s @ cdecl _o_asin(double) MSVCRT_asin @@ -2156,9 +2156,9 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl -arch=!i386 acosf(float) -@ cdecl acosh(double) -@ cdecl acoshf(float) -@ cdecl acoshl(double) acosh +@ cdecl acosh(double) MSVCRT_acosh +@ cdecl acoshf(float) MSVCRT_acoshf +@ cdecl acoshl(double) MSVCRT_acosh @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) @ cdecl asin(double) MSVCRT_asin

1 0

Alexandre Julliard : msvcrt: Use the atan() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: ecfbd5971ecfae09b5c50619df1277cf51e66856 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecfbd5971ecfae09b5c50619df1277… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 14:43:44 2023 +0200 msvcrt: Use the atan() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 93 +++++-------------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 9 insertions(+), 86 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 69dfca332af..2a523b589ae 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -78,11 +78,13 @@ void msvcrt_init_math( void *module ) } /* Copied from musl: src/internal/libm.h */ +#if !defined(__i386__) || _MSVCR_VER>=120 static inline float fp_barrierf(float x) { volatile float y = x; return y; } +#endif static inline double fp_barrier(double x) { @@ -489,93 +491,14 @@ double CDECL MSVCRT_asin( double x ) /********************************************************************* * atan (MSVCRT.@) - * - * Copied from musl: src/math/atan.c - */ -double CDECL atan( double x ) -{ - static const double atanhi[] = { - 4.63647609000806093515e-01, - 7.85398163397448278999e-01, - 9.82793723247329054082e-01, - 1.57079632679489655800e+00, - }; - static const double atanlo[] = { - 2.26987774529616870924e-17, - 3.06161699786838301793e-17, - 1.39033110312309984516e-17, - 6.12323399573676603587e-17, - }; - static const double aT[] = { - 3.33333333333329318027e-01, - -1.99999999998764832476e-01, - 1.42857142725034663711e-01, - -1.11111104054623557880e-01, - 9.09088713343650656196e-02, - -7.69187620504482999495e-02, - 6.66107313738753120669e-02, - -5.83357013379057348645e-02, - 4.97687799461593236017e-02, - -3.65315727442169155270e-02, - 1.62858201153657823623e-02, - }; - - double w, s1, s2, z; - unsigned int ix, sign; - int id; - -#if _MSVCR_VER == 0 + */ +#if _MSVCR_VER == 0 /* other versions call atan() directly */ +double CDECL MSVCRT_atan( double x ) +{ if (isnan(x)) return math_error(_DOMAIN, "atan", x, 0, x); -#endif - - ix = *(ULONGLONG*)&x >> 32; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x44100000) { /* if |x| >= 2^66 */ - if (isnan(x)) - return x; - z = atanhi[3] + 7.5231638452626401e-37; - return sign ? -z : z; - } - if (ix < 0x3fdc0000) { /* |x| < 0.4375 */ - if (ix < 0x3e400000) { /* |x| < 2^-27 */ - if (ix < 0x00100000) - /* raise underflow for subnormal x */ - fp_barrierf((float)x); - return x; - } - id = -1; - } else { - x = fabs(x); - if (ix < 0x3ff30000) { /* |x| < 1.1875 */ - if (ix < 0x3fe60000) { /* 7/16 <= |x| < 11/16 */ - id = 0; - x = (2.0 * x - 1.0) / (2.0 + x); - } else { /* 11/16 <= |x| < 19/16 */ - id = 1; - x = (x - 1.0) / (x + 1.0); - } - } else { - if (ix < 0x40038000) { /* |x| < 2.4375 */ - id = 2; - x = (x - 1.5) / (1.0 + 1.5 * x); - } else { /* 2.4375 <= |x| < 2^66 */ - id = 3; - x = -1.0 / x; - } - } - } - /* end of argument reduction */ - z = x * x; - w = z * z; - /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ - s1 = z * (aT[0] + w * (aT[2] + w * (aT[4] + w * (aT[6] + w * (aT[8] + w * aT[10]))))); - s2 = w * (aT[1] + w * (aT[3] + w * (aT[5] + w * (aT[7] + w * aT[9])))); - if (id < 0) - return x - x * (s1 + s2); - z = atanhi[id] - (x * (s1 + s2) - atanlo[id] - x); - return sign ? -z : z; + return atan( x ); } +#endif /********************************************************************* * exp (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2d3e27be81a..c7facd39df1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1254,7 +1254,7 @@ @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) @ cdecl asin(double) MSVCRT_asin -@ cdecl atan(double) +@ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) @ cdecl -arch=!i386 asinf(float) @ cdecl -arch=!i386 atanf(float) MSVCRT_atanf

1 0

Alexandre Julliard : msvcrt: Use the atanf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: e525730cc1d929ebd17c99ceb704476ea7f693ff URL: https://gitlab.winehq.org/wine/wine/-/commit/e525730cc1d929ebd17c99ceb70447… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 14:44:04 2023 +0200 msvcrt: Use the atanf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 81 +++---------------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 5 insertions(+), 78 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d8eab014e42..b44bc051453 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -292,87 +292,14 @@ int CDECL _isnanf( float num ) /********************************************************************* * atanf (MSVCRT.@) - * - * Copied from musl: src/math/atanf.c */ -float CDECL atanf( float x ) +#if _MSVCR_VER == 0 /* other versions call atanf() directly */ +float CDECL MSVCRT_atanf( float x ) { - static const float atanhi[] = { - 4.6364760399e-01, - 7.8539812565e-01, - 9.8279368877e-01, - 1.5707962513e+00, - }; - static const float atanlo[] = { - 5.0121582440e-09, - 3.7748947079e-08, - 3.4473217170e-08, - 7.5497894159e-08, - }; - static const float aT[] = { - 3.3333328366e-01, - -1.9999158382e-01, - 1.4253635705e-01, - -1.0648017377e-01, - 6.1687607318e-02, - }; - - float w, s1, s2, z; - unsigned int ix, sign; - int id; - -#if _MSVCR_VER == 0 if (isnan(x)) return math_error(_DOMAIN, "atanf", x, 0, x); -#endif - - ix = *(unsigned int*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x4c800000) { /* if |x| >= 2**26 */ - if (isnan(x)) - return x; - z = atanhi[3] + 7.5231638453e-37; - return sign ? -z : z; - } - if (ix < 0x3ee00000) { /* |x| < 0.4375 */ - if (ix < 0x39800000) { /* |x| < 2**-12 */ - if (ix < 0x00800000) - /* raise underflow for subnormal x */ - fp_barrierf(x*x); - return x; - } - id = -1; - } else { - x = fabsf(x); - if (ix < 0x3f980000) { /* |x| < 1.1875 */ - if (ix < 0x3f300000) { /* 7/16 <= |x| < 11/16 */ - id = 0; - x = (2.0f * x - 1.0f) / (2.0f + x); - } else { /* 11/16 <= |x| < 19/16 */ - id = 1; - x = (x - 1.0f) / (x + 1.0f); - } - } else { - if (ix < 0x401c0000) { /* |x| < 2.4375 */ - id = 2; - x = (x - 1.5f) / (1.0f + 1.5f * x); - } else { /* 2.4375 <= |x| < 2**26 */ - id = 3; - x = -1.0f / x; - } - } - } - /* end of argument reduction */ - z = x * x; - w = z * z; - /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ - s1 = z * (aT[0] + w * (aT[2] + w * aT[4])); - s2 = w * (aT[1] + w * aT[3]); - if (id < 0) - return x - x * (s1 + s2); - z = atanhi[id] - ((x * (s1 + s2) - atanlo[id]) - x); - return sign ? -z : z; + return atanf( x ); } +#endif static BOOL sqrtf_validate( float *x ) { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0b88ba97135..8bf1c87d73c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1257,7 +1257,7 @@ @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -arch=!i386 asinf(float) -@ cdecl -arch=!i386 atanf(float) +@ cdecl -arch=!i386 atanf(float) MSVCRT_atanf @ cdecl -arch=!i386 atan2f(float float) @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str)

1 0

Alexandre Julliard : msvcrt: Use the rint()/rintf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 554e7aee729df9dca7a84deb559c49749f25f069 URL: https://gitlab.winehq.org/wine/wine/-/commit/554e7aee729df9dca7a84deb559c49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 17:55:50 2023 +0200 msvcrt: Use the rint()/rintf() implementation from the bundled musl library. --- dlls/msvcr120/msvcr120.spec | 4 +-- dlls/msvcrt/math.c | 79 ++++++++++++--------------------------------- dlls/ucrtbase/ucrtbase.spec | 8 ++--- libs/musl/src/math/rint.c | 4 +-- libs/musl/src/math/rintf.c | 4 +-- 5 files changed, 30 insertions(+), 69 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 102d6319f47..ec1fd48dce5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2334,9 +2334,9 @@ @ cdecl remquol(double double ptr) remquo @ cdecl rename(str str) @ cdecl rewind(ptr) -@ cdecl rint(double) +@ cdecl rint(double) MSVCRT_rint @ cdecl rintf(float) -@ cdecl rintl(double) rint +@ cdecl rintl(double) MSVCRT_rint @ cdecl round(double) @ cdecl roundf(float) @ cdecl roundl(double) round diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1e67ced4360..b1cdb6efb64 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -953,37 +953,6 @@ double CDECL atan( double x ) return sign ? -z : z; } -/********************************************************************* - * rint (MSVCR120.@) - * - * Copied from musl: src/math/rint.c - */ -double CDECL rint(double x) -{ - static const double toint = 1 / DBL_EPSILON; - - ULONGLONG llx = *(ULONGLONG*)&x; - int e = llx >> 52 & 0x7ff; - int s = llx >> 63; - unsigned cw; - double y; - - if (e >= 0x3ff+52) - return x; - cw = _controlfp(0, 0); - if ((cw & _MCW_PC) != _PC_53) - _controlfp(_PC_53, _MCW_PC); - if (s) - y = fp_barrier(x - toint) + toint; - else - y = fp_barrier(x + toint) - toint; - if ((cw & _MCW_PC) != _PC_53) - _controlfp(cw, _MCW_PC); - if (y == 0) - return s ? -0.0 : 0; - return y; -} - /* Copied from musl: src/math/exp_data.c */ static const UINT64 exp_T[] = { 0x0ULL, 0x3ff0000000000000ULL, @@ -2567,6 +2536,23 @@ int CDECL _isnan(double num) #if _MSVCR_VER>=120 +/********************************************************************* + * rint (MSVCR120.@) + */ +double CDECL MSVCRT_rint(double x) +{ + unsigned cw; + double y; + + cw = _controlfp(0, 0); + if ((cw & _MCW_PC) != _PC_53) + _controlfp(_PC_53, _MCW_PC); + y = rint(x); + if ((cw & _MCW_PC) != _PC_53) + _controlfp(cw, _MCW_PC); + return y; +} + /********************************************************************* * _nearbyint (MSVCR120.@) * @@ -2585,7 +2571,7 @@ double CDECL nearbyint(double x) cw |= _EM_INEXACT; _setfp(&cw, _EM_INEXACT, NULL, 0); } - x = rint(x); + x = MSVCRT_rint(x); if (update_cw || update_sw) { sw = 0; @@ -3511,31 +3497,6 @@ void __cdecl __libm_sse2_sqrt_precise(void) #if _MSVCR_VER>=120 -/********************************************************************* - * rintf (MSVCR120.@) - * - * Copied from musl: src/math/rintf.c - */ -float CDECL rintf(float x) -{ - static const float toint = 1 / FLT_EPSILON; - - unsigned int ix = *(unsigned int*)&x; - int e = ix >> 23 & 0xff; - int s = ix >> 31; - float y; - - if (e >= 0x7f + 23) - return x; - if (s) - y = fp_barrierf(x - toint) + toint; - else - y = fp_barrierf(x + toint) - toint; - if (y == 0) - return s ? -0.0f : 0.0f; - return y; -} - /********************************************************************* * lrint (MSVCR120.@) */ @@ -3543,7 +3504,7 @@ __msvcrt_long CDECL lrint(double x) { double d; - d = rint(x); + d = MSVCRT_rint(x); if ((d < 0 && d != (double)(__msvcrt_long)d) || (d >= 0 && d != (double)(__msvcrt_ulong)d)) { *_errno() = EDOM; @@ -3575,7 +3536,7 @@ __int64 CDECL llrint(double x) { double d; - d = rint(x); + d = MSVCRT_rint(x); if ((d < 0 && d != (double)(__int64)d) || (d >= 0 && d != (double)(unsigned __int64)d)) { *_errno() = EDOM; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a476681fc43..a05023b9f3e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1758,9 +1758,9 @@ @ cdecl _o_remquol(double double ptr) remquo @ cdecl _o_rename(str str) rename @ cdecl _o_rewind(ptr) rewind -@ cdecl _o_rint(double) rint +@ cdecl _o_rint(double) MSVCRT_rint @ cdecl _o_rintf(float) rintf -@ cdecl _o_rintl(double) rint +@ cdecl _o_rintl(double) MSVCRT_rint @ cdecl _o_round(double) round @ cdecl _o_roundf(float) roundf @ cdecl _o_roundl(double) round @@ -2471,9 +2471,9 @@ @ cdecl remquol(double double ptr) remquo @ cdecl rename(str str) @ cdecl rewind(ptr) -@ cdecl rint(double) +@ cdecl rint(double) MSVCRT_rint @ cdecl rintf(float) -@ cdecl rintl(double) rint +@ cdecl rintl(double) MSVCRT_rint @ cdecl round(double) @ cdecl roundf(float) @ cdecl roundl(double) round diff --git a/libs/musl/src/math/rint.c b/libs/musl/src/math/rint.c index 2de4ff0a99e..ad35201b266 100644 --- a/libs/musl/src/math/rint.c +++ b/libs/musl/src/math/rint.c @@ -20,9 +20,9 @@ double __cdecl rint(double x) if (e >= 0x3ff+52) return x; if (s) - y = x - toint + toint; + y = fp_barrier(x - toint) + toint; else - y = x + toint - toint; + y = fp_barrier(x + toint) - toint; if (y == 0) return s ? -0.0 : 0; return y; diff --git a/libs/musl/src/math/rintf.c b/libs/musl/src/math/rintf.c index 9e03461404d..455f9e3980f 100644 --- a/libs/musl/src/math/rintf.c +++ b/libs/musl/src/math/rintf.c @@ -22,9 +22,9 @@ float __cdecl rintf(float x) if (e >= 0x7f+23) return x; if (s) - y = x - toint + toint; + y = fp_barrierf(x - toint) + toint; else - y = x + toint - toint; + y = fp_barrierf(x + toint) - toint; if (y == 0) return s ? -0.0f : 0.0f; return y;

1 0

Alexandre Julliard : msvcrt: Use the acosf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: c9399ae7d510c64114a9b650e8d1bc37eb5ac2d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9399ae7d510c64114a9b650e8d1bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:40:21 2023 +0200 msvcrt: Use the acosf() implementation from the bundled musl library. With the changes from 9c8f8e715f4fd3a35924e4e9d32eb42fa8b56a18. --- dlls/msvcrt/math.c | 47 ---------------------------------------------- libs/musl/src/math/acosf.c | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 57 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ca95f51873a..b8a3fae663f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -305,53 +305,6 @@ static float asinf_R(float z) return p / q; } -/********************************************************************* - * acosf (MSVCRT.@) - * - * Copied from musl: src/math/acosf.c - */ -float CDECL acosf( float x ) -{ - static const double pio2_lo = 6.12323399573676603587e-17; - static const double pio2_hi = 1.57079632679489655800e+00; - - float z, w, s, c, df; - unsigned int hx, ix; - - hx = *(unsigned int*)&x; - ix = hx & 0x7fffffff; - /* |x| >= 1 or nan */ - if (ix >= 0x3f800000) { - if (ix == 0x3f800000) { - if (hx >> 31) - return M_PI; - return 0; - } - if (isnan(x)) return x; - return math_error(_DOMAIN, "acosf", x, 0, 0 / (x - x)); - } - /* |x| < 0.5 */ - if (ix < 0x3f000000) { - if (ix <= 0x32800000) /* |x| < 2**-26 */ - return M_PI_2; - return pio2_hi - (x - (pio2_lo - x * asinf_R(x * x))); - } - /* x < -0.5 */ - if (hx >> 31) { - z = (1 + x) * 0.5f; - s = sqrtf(z); - return 2*(pio2_hi - (s + (asinf_R(z) * s - pio2_lo))); - } - /* x > 0.5 */ - z = (1 - x) * 0.5f; - s = sqrtf(z); - hx = *(unsigned int*)&s & 0xffff0000; - df = *(float*)&hx; - c = (z - df * df) / (s + df); - w = asinf_R(z) * s + c; - return 2 * (df + w); -} - /********************************************************************* * asinf (MSVCRT.@) * diff --git a/libs/musl/src/math/acosf.c b/libs/musl/src/math/acosf.c index 0da275bf459..bf37332ab52 100644 --- a/libs/musl/src/math/acosf.c +++ b/libs/musl/src/math/acosf.c @@ -18,15 +18,16 @@ static const float pio2_hi = 1.5707962513e+00, /* 0x3fc90fda */ pio2_lo = 7.5497894159e-08, /* 0x33a22168 */ -pS0 = 1.6666586697e-01, -pS1 = -4.2743422091e-02, -pS2 = -8.6563630030e-03, -qS1 = -7.0662963390e-01; +pS0 = 1.66666672e-01, +pS1 = -5.11644611e-02, +pS2 = -1.21124933e-02, +pS3 = -3.58742251e-03, +qS1 = -7.56982703e-01; static float R(float z) { float_t p, q; - p = z*(pS0+z*(pS1+z*pS2)); + p = z*(pS0+z*(pS1+z*(pS2+z*pS3))); q = 1.0f+z*qS1; return p/q; } @@ -42,23 +43,23 @@ float __cdecl acosf(float x) if (ix >= 0x3f800000) { if (ix == 0x3f800000) { if (hx >> 31) - return 2*pio2_hi + 0x1p-120f; + return M_PI; return 0; } - return 0/(x-x); + if (isnan(x)) return x; + return math_error(_DOMAIN, "acosf", x, 0, 0 / (x - x)); } /* |x| < 0.5 */ if (ix < 0x3f000000) { if (ix <= 0x32800000) /* |x| < 2**-26 */ - return pio2_hi + 0x1p-120f; + return M_PI_2; return pio2_hi - (x - (pio2_lo-x*R(x*x))); } /* x < -0.5 */ if (hx >> 31) { z = (1+x)*0.5f; s = sqrtf(z); - w = R(z)*s-pio2_lo; - return 2*(pio2_hi - (s+w)); + return 2*(pio2_hi - (s + (R(z)*s-pio2_lo))); } /* x > 0.5 */ z = (1-x)*0.5f;

1 0

Alexandre Julliard : msvcrt: Use the asinf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 472d7ec76db02865294c77bd67f7570b50905e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/472d7ec76db02865294c77bd67f757… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:53:07 2023 +0200 msvcrt: Use the asinf() implementation from the bundled musl library. With the changes from 0b8db612713d6a92109396951d6ac53fd23d6039. --- dlls/msvcrt/math.c | 55 ---------------------------------------------- libs/musl/src/math/asinf.c | 26 +++++++++++++--------- 2 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b8a3fae663f..d8eab014e42 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -290,61 +290,6 @@ int CDECL _isnanf( float num ) return (u.i & 0x7fffffff) > 0x7f800000; } -static float asinf_R(float z) -{ - /* coefficients for R(x^2) */ - static const float p1 = 1.66666672e-01, - p2 = -5.11644611e-02, - p3 = -1.21124933e-02, - p4 = -3.58742251e-03, - q1 = -7.56982703e-01; - - float p, q; - p = z * (p1 + z * (p2 + z * (p3 + z * p4))); - q = 1.0f + z * q1; - return p / q; -} - -/********************************************************************* - * asinf (MSVCRT.@) - * - * Copied from musl: src/math/asinf.c - */ -float CDECL asinf( float x ) -{ - static const double pio2 = 1.570796326794896558e+00; - static const float pio4_hi = 0.785398125648; - static const float pio2_lo = 7.54978941586e-08; - - float s, z, f, c; - unsigned int hx, ix; - - hx = *(unsigned int*)&x; - ix = hx & 0x7fffffff; - if (ix >= 0x3f800000) { /* |x| >= 1 */ - if (ix == 0x3f800000) /* |x| == 1 */ - return x * pio2 + 7.5231638453e-37; /* asin(+-1) = +-pi/2 with inexact */ - if (isnan(x)) return x; - return math_error(_DOMAIN, "asinf", x, 0, 0 / (x - x)); - } - if (ix < 0x3f000000) { /* |x| < 0.5 */ - /* if 0x1p-126 <= |x| < 0x1p-12, avoid raising underflow */ - if (ix < 0x39800000 && ix >= 0x00800000) - return x; - return x + x * asinf_R(x * x); - } - /* 1 > |x| >= 0.5 */ - z = (1 - fabsf(x)) * 0.5f; - s = sqrtf(z); - /* f+c = sqrt(z) */ - *(unsigned int*)&f = *(unsigned int*)&s & 0xffff0000; - c = (z - f * f) / (s + f); - x = pio4_hi - (2 * s * asinf_R(z) - (pio2_lo - 2 * c) - (pio4_hi - 2 * f)); - if (hx >> 31) - return -x; - return x; -} - /********************************************************************* * atanf (MSVCRT.@) * diff --git a/libs/musl/src/math/asinf.c b/libs/musl/src/math/asinf.c index b13f80307a5..d4a312e90a3 100644 --- a/libs/musl/src/math/asinf.c +++ b/libs/musl/src/math/asinf.c @@ -18,24 +18,26 @@ static const double pio2 = 1.570796326794896558e+00; static const float +pio4_hi = 0.785398125648, +pio2_lo = 7.54978941586e-08, /* coefficients for R(x^2) */ -pS0 = 1.6666586697e-01, -pS1 = -4.2743422091e-02, -pS2 = -8.6563630030e-03, -qS1 = -7.0662963390e-01; +pS0 = 1.66666672e-01, +pS1 = -5.11644611e-02, +pS2 = -1.21124933e-02, +pS3 = -3.58742251e-03, +qS1 = -7.56982703e-01; static float R(float z) { float_t p, q; - p = z*(pS0+z*(pS1+z*pS2)); + p = z*(pS0+z*(pS1+z*(pS2+z*pS3))); q = 1.0f+z*qS1; return p/q; } float __cdecl asinf(float x) { - double s; - float z; + float s, z, f, c; uint32_t hx,ix; GET_FLOAT_WORD(hx, x); @@ -43,7 +45,8 @@ float __cdecl asinf(float x) if (ix >= 0x3f800000) { /* |x| >= 1 */ if (ix == 0x3f800000) /* |x| == 1 */ return x*pio2 + 0x1p-120f; /* asin(+-1) = +-pi/2 with inexact */ - return 0/(x-x); /* asin(|x|>1) is NaN */ + if (isnan(x)) return x; + return math_error(_DOMAIN, "asinf", x, 0, 0 / (x - x)); } if (ix < 0x3f000000) { /* |x| < 0.5 */ /* if 0x1p-126 <= |x| < 0x1p-12, avoid raising underflow */ @@ -53,8 +56,11 @@ float __cdecl asinf(float x) } /* 1 > |x| >= 0.5 */ z = (1 - fabsf(x))*0.5f; - s = sqrt(z); - x = pio2 - 2*(s+s*R(z)); + s = sqrtf(z); + /* f+c = sqrt(z) */ + *(unsigned int*)&f = *(unsigned int*)&s & 0xffff0000; + c = (z - f * f) / (s + f); + x = pio4_hi - (2*s*R(z) - (pio2_lo - 2*c) - (pio4_hi - 2*f)); if (hx >> 31) return -x; return x;

1 0

Alexandre Julliard : msvcrt: Use the expf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 221f891848a5f6107c548133418af4583a5db8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/221f891848a5f6107c548133418af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 18:24:56 2023 +0200 msvcrt: Use the expf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 64 ----------------------------------------------- libs/musl/src/math/expf.c | 15 +++-------- 2 files changed, 4 insertions(+), 75 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b1cdb6efb64..ca95f51873a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -218,19 +218,6 @@ float CDECL _chgsignf( float num ) #endif -#ifndef __i386__ -static const UINT64 exp2f_T[] = { - 0x3ff0000000000000ULL, 0x3fefd9b0d3158574ULL, 0x3fefb5586cf9890fULL, 0x3fef9301d0125b51ULL, - 0x3fef72b83c7d517bULL, 0x3fef54873168b9aaULL, 0x3fef387a6e756238ULL, 0x3fef1e9df51fdee1ULL, - 0x3fef06fe0a31b715ULL, 0x3feef1a7373aa9cbULL, 0x3feedea64c123422ULL, 0x3feece086061892dULL, - 0x3feebfdad5362a27ULL, 0x3feeb42b569d4f82ULL, 0x3feeab07dd485429ULL, 0x3feea47eb03a5585ULL, - 0x3feea09e667f3bcdULL, 0x3fee9f75e8ec5f74ULL, 0x3feea11473eb0187ULL, 0x3feea589994cce13ULL, - 0x3feeace5422aa0dbULL, 0x3feeb737b0cdc5e5ULL, 0x3feec49182a3f090ULL, 0x3feed503b23e255dULL, - 0x3feee89f995ad3adULL, 0x3feeff76f2fb5e47ULL, 0x3fef199bdd85529cULL, 0x3fef3720dcef9069ULL, - 0x3fef5818dcfba487ULL, 0x3fef7c97337b9b5fULL, 0x3fefa4afa2a490daULL, 0x3fefd0765b6e4540ULL -}; -#endif - /********************************************************************* * _fdclass (MSVCR120.@) * @@ -489,57 +476,6 @@ float CDECL atanf( float x ) return sign ? -z : z; } -/********************************************************************* - * expf (MSVCRT.@) - */ -float CDECL expf( float x ) -{ - static const double C[] = { - 0x1.c6af84b912394p-5 / (1 << 5) / (1 << 5) / (1 << 5), - 0x1.ebfce50fac4f3p-3 / (1 << 5) / (1 << 5), - 0x1.62e42ff0c52d6p-1 / (1 << 5) - }; - static const double invln2n = 0x1.71547652b82fep+0 * (1 << 5); - - double kd, z, r, r2, y, s; - UINT32 abstop; - UINT64 ki, t; - - abstop = (*(UINT32*)&x >> 20) & 0x7ff; - if (abstop >= 0x42b) { - /* |x| >= 88 or x is nan. */ - if (*(UINT32*)&x == 0xff800000) - return 0.0f; - if (abstop >= 0x7f8) - return x + x; - if (x > 0x1.62e42ep6f) /* x > log(0x1p128) ~= 88.72 */ - return math_error(_OVERFLOW, "expf", x, 0, x * FLT_MAX); - if (x < -0x1.9fe368p6f) /* x < log(0x1p-150) ~= -103.97 */ - return math_error(_UNDERFLOW, "expf", x, 0, fp_barrierf(FLT_MIN) * FLT_MIN); - } - - /* x*N/Ln2 = k + r with r in [-1/2, 1/2] and int k. */ - z = invln2n * x; - - /* Round and convert z to int, the result is in [-150*N, 128*N] and - ideally ties-to-even rule is used, otherwise the magnitude of r - can be bigger which gives larger approximation error. */ - kd = round(z); - ki = (INT64)kd; - r = z - kd; - - /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ - t = exp2f_T[ki % (1 << 5)]; - t += ki << (52 - 5); - s = *(double*)&t; - z = C[0] * r + C[1]; - r2 = r * r; - y = C[2] * r + 1; - y = z * r2 + y; - y = y * s; - return y; -} - static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); diff --git a/libs/musl/src/math/expf.c b/libs/musl/src/math/expf.c index 6cf118b119e..ee40977baaa 100644 --- a/libs/musl/src/math/expf.c +++ b/libs/musl/src/math/expf.c @@ -45,9 +45,9 @@ float __cdecl expf(float x) if (abstop >= top12(INFINITY)) return x + x; if (x > 0x1.62e42ep6f) /* x > log(0x1p128) ~= 88.72 */ - return __math_oflowf(0); + return math_error(_OVERFLOW, "expf", x, 0, x * FLT_MAX); if (x < -0x1.9fe368p6f) /* x < log(0x1p-150) ~= -103.97 */ - return __math_uflowf(0); + return math_error(_UNDERFLOW, "expf", x, 0, fp_barrierf(FLT_MIN) * FLT_MIN); } /* x*N/Ln2 = k + r with r in [-1/2, 1/2] and int k. */ @@ -56,15 +56,8 @@ float __cdecl expf(float x) /* Round and convert z to int, the result is in [-150*N, 128*N] and ideally ties-to-even rule is used, otherwise the magnitude of r can be bigger which gives larger approximation error. */ -#if TOINT_INTRINSICS - kd = roundtoint(z); - ki = converttoint(z); -#else -# define SHIFT __exp2f_data.shift - kd = eval_as_double(z + SHIFT); - ki = asuint64(kd); - kd -= SHIFT; -#endif + kd = round(z); + ki = (int64_t)kd; r = z - kd; /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */

1 0

Jactry Zeng : shell32: Assign a default flags for view information of IShellView.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: c26fd2621c762c967ebe5c46261b784bb7d7cdda URL: https://gitlab.winehq.org/wine/wine/-/commit/c26fd2621c762c967ebe5c46261b78… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:59:03 2023 -0500 shell32: Assign a default flags for view information of IShellView. --- dlls/shell32/shlview.c | 1 + dlls/shell32/tests/shlview.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f2e8bc67267..da60283393c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3780,6 +3780,7 @@ IShellView *IShellView_Constructor(IShellFolder *folder) sv->ptLastMousePos.x = 0; sv->ptLastMousePos.y = 0; sv->FolderSettings.ViewMode = FVM_TILE; + sv->FolderSettings.fFlags = FWF_USESEARCHFOLDER; TRACE("(%p)->(%p)\n", sv, folder); return (IShellView*)&sv->IShellView3_iface; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 71b04367398..0f6ad9f4158 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1504,7 +1504,7 @@ static void test_folder_flags(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(settings.ViewMode == FVM_TILE || broken(!settings.ViewMode) /* pre win7 */, "Got view mode %u.\n", settings.ViewMode); - todo_wine ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, + ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, "Got flags %#x.\n", settings.fFlags); destroy_interfaces(desktop, shellview);

1 0

Jactry Zeng : shell32: Assign a default view mode value for IShellView.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: e5c3a111c5045610a4509e2ef3a8151f179cd510 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c3a111c5045610a4509e2ef3a815… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:51:02 2023 -0500 shell32: Assign a default view mode value for IShellView. --- dlls/shell32/shlview.c | 1 + dlls/shell32/tests/shlview.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 40a7d76c359..f2e8bc67267 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3779,6 +3779,7 @@ IShellView *IShellView_Constructor(IShellFolder *folder) sv->cScrollDelay = 0; sv->ptLastMousePos.x = 0; sv->ptLastMousePos.y = 0; + sv->FolderSettings.ViewMode = FVM_TILE; TRACE("(%p)->(%p)\n", sv, folder); return (IShellView*)&sv->IShellView3_iface; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index a83f3137509..d25d626f829 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1094,14 +1094,20 @@ static void test_GetSetCurrentViewMode(void) hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&sview); ok(hr == S_OK, "got (0x%08lx)\n", hr); + hr = IShellView_QueryInterface(sview, &IID_IFolderView, (void **)&fview); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + viewmode = 0xdeadbeef; + hr = IFolderView_GetCurrentViewMode(fview, &viewmode); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(viewmode == FVM_TILE || broken(viewmode == 0) /* pre win7 */, "Got view mode %u.\n", viewmode); + fs.ViewMode = 1; fs.fFlags = 0; browser = IShellBrowserImpl_Construct(); hr = IShellView_CreateViewWindow(sview, NULL, &fs, browser, &rc, &hwnd); ok(hr == S_OK || broken(hr == S_FALSE /*Win2k*/ ), "got (0x%08lx)\n", hr); - hr = IShellView_QueryInterface(sview, &IID_IFolderView, (void**)&fview); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got (0x%08lx)\n", hr); if(SUCCEEDED(hr)) { HWND hwnd_lv;

1 0