- Wine-Commits - list.winehq.org

Biswapriyo Nath : include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 467604c6613e7a41201e0af34f009700bc8ac392 URL: https://gitlab.winehq.org/wine/wine/-/commit/467604c6613e7a41201e0af34f0097… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Apr 11 01:07:00 2023 +0530 include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl. This matches the declaration with official documentation and fixes the following two compiler errors in apitrace project. d3d9trace.cpp:28469:59: error: invalid conversion from 'const DXVA2_ConfigPictureDecode*' to 'DXVA2_ConfigPictureDecode*' [-fpermissive] d3d9trace.cpp:28194:65: error: invalid conversion from 'void*' to 'IUnknown*' [-fpermissive] Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- dlls/dxva2/main.c | 4 ++-- include/dxva2api.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index c5ca3439a68..d48cf8de230 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -701,7 +701,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDi } static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface, - REFGUID guid, const DXVA2_VideoDesc *video_desc, IUnknown *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) + REFGUID guid, const DXVA2_VideoDesc *video_desc, void *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) { FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs); @@ -709,7 +709,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(ID } static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface, - REFGUID guid, const DXVA2_VideoDesc *video_desc, DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, + REFGUID guid, const DXVA2_VideoDesc *video_desc, const DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, UINT num_surfaces, IDirectXVideoDecoder **decoder) { FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces, diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 63de780f0df..205491e3790 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -631,14 +631,14 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService HRESULT GetDecoderConfigurations( [in] REFGUID guid, [in] const DXVA2_VideoDesc *pVideoDesc, - [in] IUnknown *pReserved, + [in] void *pReserved, [out] UINT *pCount, [out] DXVA2_ConfigPictureDecode **ppConfigs); HRESULT CreateVideoDecoder( [in] REFGUID guid, [in] const DXVA2_VideoDesc *pVideoDesc, - [in] DXVA2_ConfigPictureDecode *pConfig, + [in] const DXVA2_ConfigPictureDecode *pConfig, [in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] UINT NumSurfaces, [out] IDirectXVideoDecoder **ppDecode);

1 0

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

April 10, 2023

Module: wine Branch: master Commit: 4ffb1199e37ddb96c7b361bb97767a74ef5e2902 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ffb1199e37ddb96c7b361bb97767a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:53:49 2023 +0200 msvcrt: Use the atanh()/atanhf() implementation from the bundled musl library. --- dlls/msvcr120/msvcr120.spec | 6 ++--- dlls/msvcrt/math.c | 61 +++++++-------------------------------------- dlls/ucrtbase/ucrtbase.spec | 12 ++++----- libs/musl/src/math/atanh.c | 2 ++ libs/musl/src/math/atanhf.c | 2 ++ 5 files changed, 22 insertions(+), 61 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f536aba9ba3..cfc81d75804 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2026,9 +2026,9 @@ @ cdecl -arch=!i386 atanf(float) @ cdecl atan2(double double) @ cdecl -arch=!i386 atan2f(float float) -@ cdecl atanh(double) -@ cdecl atanhf(float) -@ cdecl atanhl(double) atanh +@ cdecl atanh(double) MSVCRT_atanh +@ cdecl atanhf(float) MSVCRT_atanhf +@ cdecl atanhl(double) MSVCRT_atanh @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) @ cdecl atoi(str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4f95a4747a9..bc138845dce 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -78,7 +78,7 @@ void msvcrt_init_math( void *module ) } /* Copied from musl: src/internal/libm.h */ -#if !defined(__i386__) || _MSVCR_VER>=120 +#ifndef __i386__ static inline float fp_barrierf(float x) { volatile float y = x; @@ -3377,73 +3377,30 @@ float CDECL MSVCRT_acoshf(float x) /********************************************************************* * atanh (MSVCR120.@) - * - * Copied from musl: src/math/atanh.c */ -double CDECL atanh(double x) +double CDECL MSVCRT_atanh(double x) { - UINT64 ux = *(UINT64*)&x; - int e = ux >> 52 & 0x7ff; - int s = ux >> 63; - - /* |x| */ - ux &= (UINT64)-1 / 2; - x = *(double*)&ux; - - if (x > 1) { + if (fabs(x) > 1) + { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - - if (e < 0x3ff - 1) { - if (e < 0x3ff - 32) { - fp_barrier(x + 0x1p120f); - if (e == 0) /* handle underflow */ - fp_barrier(x * x); - } else { /* |x| < 0.5, up to 1.7ulp error */ - x = 0.5 * log1p(2 * x + 2 * x * x / (1 - x)); - } - } else { /* avoid overflow */ - x = 0.5 * log1p(2 * (x / (1 - x))); - if (isinf(x)) *_errno() = ERANGE; - } - return s ? -x : x; + return atanh( x ); } /********************************************************************* * atanhf (MSVCR120.@) - * - * Copied from musl: src/math/atanhf.c */ -float CDECL atanhf(float x) +float CDECL MSVCRT_atanhf(float x) { - UINT32 ux = *(UINT32*)&x; - int s = ux >> 31; - - /* |x| */ - ux &= 0x7fffffff; - x = *(float*)&ux; - - if (x > 1) { + if (fabs(x) > 1) + { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - - if (ux < 0x3f800000 - (1 << 23)) { - if (ux < 0x3f800000 - (32 << 23)) { - fp_barrierf(x + 0x1p120f); - if (ux < (1 << 23)) /* handle underflow */ - fp_barrierf(x * x); - } else { /* |x| < 0.5, up to 1.7ulp error */ - x = 0.5f * log1pf(2 * x + 2 * x * x / (1 - x)); - } - } else { /* avoid overflow */ - x = 0.5f * log1pf(2 * (x / (1 - x))); - if (isinf(x)) *_errno() = ERANGE; - } - return s ? -x : x; + return atanhf( x ); } #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5bea04dad62..258a1aa945a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1576,9 +1576,9 @@ @ cdecl _o_atan2(double double) atan2 @ cdecl -arch=!i386 _o_atan2f(float float) atan2f @ cdecl -arch=!i386 _o_atanf(float) atanf -@ cdecl _o_atanh(double) atanh -@ cdecl _o_atanhf(float) atanhf -@ cdecl _o_atanhl(double) atanh +@ cdecl _o_atanh(double) MSVCRT_atanh +@ cdecl _o_atanhf(float) MSVCRT_atanhf +@ cdecl _o_atanhl(double) MSVCRT_atanh @ cdecl _o_atof(str) atof @ cdecl _o_atoi(str) atoi @ cdecl _o_atol(str) atol @@ -2170,9 +2170,9 @@ @ cdecl atan2(double double) @ cdecl -arch=!i386 atan2f(float float) @ cdecl -arch=!i386 atanf(float) -@ cdecl atanh(double) -@ cdecl atanhf(float) -@ cdecl atanhl(double) atanh +@ cdecl atanh(double) MSVCRT_atanh +@ cdecl atanhf(float) MSVCRT_atanhf +@ cdecl atanhl(double) MSVCRT_atanh @ cdecl atof(str) @ cdecl atoi(str) @ cdecl atol(str) diff --git a/libs/musl/src/math/atanh.c b/libs/musl/src/math/atanh.c index b50e4922a10..08776e97f03 100644 --- a/libs/musl/src/math/atanh.c +++ b/libs/musl/src/math/atanh.c @@ -14,6 +14,7 @@ double __cdecl atanh(double x) if (e < 0x3ff - 1) { if (e < 0x3ff - 32) { + fp_barrier(y + 0x1p120f); /* handle underflow */ if (e == 0) FORCE_EVAL((float)y); @@ -24,6 +25,7 @@ double __cdecl atanh(double x) } else { /* avoid overflow */ y = 0.5*log1p(2*(y/(1-y))); + if (isinf(y)) errno = ERANGE; } return s ? -y : y; } diff --git a/libs/musl/src/math/atanhf.c b/libs/musl/src/math/atanhf.c index cbb425ce908..74533fb11b8 100644 --- a/libs/musl/src/math/atanhf.c +++ b/libs/musl/src/math/atanhf.c @@ -13,6 +13,7 @@ float __cdecl atanhf(float x) if (u.i < 0x3f800000 - (1<<23)) { if (u.i < 0x3f800000 - (32<<23)) { + fp_barrierf(y + 0x1p120f); /* handle underflow */ if (u.i < (1<<23)) FORCE_EVAL((float)(y*y)); @@ -23,6 +24,7 @@ float __cdecl atanhf(float x) } else { /* avoid overflow */ y = 0.5f*log1pf(2*(y/(1-y))); + if (isinf(y)) errno = ERANGE; } return s ? -y : y; }

1 0

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

April 10, 2023

Module: wine Branch: master Commit: 82563ede700641a39beabcd5e746a38f7e0a858e URL: https://gitlab.winehq.org/wine/wine/-/commit/82563ede700641a39beabcd5e746a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 17:06:40 2023 +0200 msvcrt: Use the asin() implementation from the bundled musl library. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 92 +++++++-------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- libs/musl/src/math/asin.c | 2 +- 13 files changed, 27 insertions(+), 91 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 0e863362f77..b870eef8845 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -346,7 +346,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index abae3f4b301..16ece69f1a4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1630,7 +1630,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl atan(double) @ cdecl -arch=!i386 atanf(float) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e83ce328928..d4d696f512e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1987,7 +1987,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl atan(double) @ cdecl -arch=!i386 atanf(float) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ec1fd48dce5..33bd6efb73e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2017,7 +2017,7 @@ @ cdecl acoshl(double) acosh @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl asinh(double) @ cdecl asinhf(float) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 3300cf36bf3..cf2a57c5578 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -688,7 +688,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 5b68d3217af..1ef2ec942e4 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -684,7 +684,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7c7c2f8bcdb..88c4a32d52f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1313,7 +1313,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl atan(double) @ cdecl -arch=!i386 atanf(float) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c1e4a406265..bd5b3126f30 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1285,7 +1285,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -arch=!i386 asinf(float) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 32ee44fa246..69dfca332af 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -445,29 +445,7 @@ float CDECL tanhf( float x ) /********************************************************************* * asin (MSVCRT.@) - * - * Copied from musl: src/math/asin.c */ -static double asin_R(double z) -{ - /* coefficients for R(x^2) */ - 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; -} - #ifdef __i386__ double CDECL x87_asin(double); __ASM_GLOBAL_FUNC( x87_asin, @@ -485,70 +463,28 @@ __ASM_GLOBAL_FUNC( x87_asin, "ret" ) #endif -double CDECL asin( double x ) +double CDECL MSVCRT_asin( double x ) { - static const double pio2_hi = 1.57079632679489655800e+00, - pio2_lo = 6.12323399573676603587e-17; - - double z, r, s; - unsigned int hx, ix; - ULONGLONG llx; #ifdef __i386__ unsigned int x87_cw, sse2_cw; -#endif + unsigned int hx = *(ULONGLONG*)&x >> 32; + unsigned int ix = hx & 0x7fffffff; - 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) - /* asin(1) = +-pi/2 with inexact */ - return x * pio2_hi + 7.5231638452626401e-37; - if (isnan(x)) - { -#ifdef __i386__ - return math_error(_DOMAIN, "asin", x, 0, x); -#else - return x; -#endif - } - return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); - } + if (isnan(x)) return math_error(_DOMAIN, "asin", x, 0, x); -#ifdef __i386__ - __control87_2(0, 0, &x87_cw, &sse2_cw); - if (!sse2_enabled || (x87_cw & _MCW_EM) != _MCW_EM + /* |x| < 1 */ + if (ix < 0x3ff00000) + { + __control87_2(0, 0, &x87_cw, &sse2_cw); + if (!sse2_enabled || (x87_cw & _MCW_EM) != _MCW_EM || (sse2_cw & (_MCW_EM | _MCW_RC)) != _MCW_EM) - return x87_asin(x); + return x87_asin(x); + } +#else + if (isnan(x)) return x; #endif - /* |x| < 0.5 */ - if (ix < 0x3fe00000) { - /* if 0x1p-1022 <= |x| < 0x1p-26, avoid raising underflow */ - if (ix < 0x3e500000 && ix >= 0x00100000) - return x; - return x + x * asin_R(x * x); - } - /* 1 > |x| >= 0.5 */ - z = (1 - fabs(x)) * 0.5; - s = sqrt(z); - r = asin_R(z); - if (ix >= 0x3fef3333) { /* if |x| > 0.975 */ - x = pio2_hi - (2 * (s + s * r) - pio2_lo); - } else { - double f, c; - /* f+c = sqrt(z) */ - f = s; - llx = (*(ULONGLONG*)&f >> 32) << 32; - f = *(double*)&llx; - c = (z - f * f) / (s + f); - x = 0.5 * pio2_hi - (2 * s * r - (pio2_lo - 2 * c) - (0.5 * pio2_hi - 2 * f)); - } - if (hx >> 31) - return -x; - return x; + return asin( x ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index aaca212c63c..2d3e27be81a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1253,7 +1253,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -arch=!i386 asinf(float) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 2c3f4912a03..09c0a947683 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -641,7 +641,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a05023b9f3e..45d883d410c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1567,7 +1567,7 @@ @ cdecl _o_acoshl(double) acosh @ cdecl _o_asctime(ptr) asctime @ cdecl _o_asctime_s(ptr long ptr) asctime_s -@ cdecl _o_asin(double) asin +@ cdecl _o_asin(double) MSVCRT_asin @ cdecl -arch=!i386 _o_asinf(float) asinf @ cdecl _o_asinh(double) asinh @ cdecl _o_asinhf(float) asinhf @@ -2161,7 +2161,7 @@ @ cdecl acoshl(double) acosh @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl asinh(double) @ cdecl asinhf(float) diff --git a/libs/musl/src/math/asin.c b/libs/musl/src/math/asin.c index 0ff68c07899..0686522f0f7 100644 --- a/libs/musl/src/math/asin.c +++ b/libs/musl/src/math/asin.c @@ -78,7 +78,7 @@ double __cdecl asin(double x) if ((ix-0x3ff00000 | lx) == 0) /* asin(1) = +-pi/2 with inexact */ return x*pio2_hi + 0x1p-120f; - return 0/(x-x); + return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); } /* |x| < 0.5 */ if (ix < 0x3fe00000) {

1 0

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

April 10, 2023

Module: wine Branch: master Commit: 6e9dd141a892524d8740d4567e0dafcb30087eca URL: https://gitlab.winehq.org/wine/wine/-/commit/6e9dd141a892524d8740d4567e0daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:43:45 2023 +0200 msvcrt: Use the asinh()/asinhf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2a523b589ae..ea72ca2f01c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3347,57 +3347,6 @@ int CDECL _fdpcomp(float x, float y) return _dpcomp(x, y); } -/********************************************************************* - * asinh (MSVCR120.@) - * - * Copied from musl: src/math/asinh.c - */ -double CDECL asinh(double x) -{ - UINT64 ux = *(UINT64*)&x; - int e = ux >> 52 & 0x7ff; - int s = ux >> 63; - - /* |x| */ - ux &= (UINT64)-1 / 2; - x = *(double*)&ux; - - if (e >= 0x3ff + 26) /* |x| >= 0x1p26 or inf or nan */ - x = log(x) + 0.693147180559945309417232121458176568; - else if (e >= 0x3ff + 1) /* |x| >= 2 */ - x = log(2 * x + 1 / (sqrt(x * x + 1) + x)); - else if (e >= 0x3ff - 26) /* |x| >= 0x1p-26 */ - x = log1p(x + x * x / (sqrt(x * x + 1) + 1)); - else /* |x| < 0x1p-26, raise inexact if x != 0 */ - fp_barrier(x + 0x1p120f); - return s ? -x : x; -} - -/********************************************************************* - * asinhf (MSVCR120.@) - * - * Copied from musl: src/math/asinhf.c - */ -float CDECL asinhf(float x) -{ - UINT32 ux = *(UINT32*)&x; - UINT32 i = ux & 0x7fffffff; - int s = ux >> 31; - - /* |x| */ - x = *(float*)&i; - - if (i >= 0x3f800000 + (12 << 23))/* |x| >= 0x1p12 or inf or nan */ - x = logf(x) + 0.693147180559945309417232121458176568f; - else if (i >= 0x3f800000 + (1 << 23)) /* |x| >= 2 */ - x = logf(2 * x + 1 / (sqrtf(x * x + 1) + x)); - else if (i >= 0x3f800000 - (12 << 23)) /* |x| >= 0x1p-12 */ - x = log1pf(x + x * x / (sqrtf(x * x + 1) + 1)); - else /* |x| < 0x1p-12, raise inexact if x!=0 */ - fp_barrierf(x + 0x1p120f); - return s ? -x : x; -} - /********************************************************************* * acosh (MSVCR120.@) *

1 0

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

April 10, 2023

Module: wine Branch: master Commit: 5c3de7d79471dd71d07544c117233bf02d444192 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c3de7d79471dd71d07544c117233b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:38:57 2023 +0200 msvcrt: Use the exp() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 245 +---------------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- libs/musl/src/math/exp.c | 28 ++---- 3 files changed, 16 insertions(+), 259 deletions(-)

1 0

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