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

Alex Henrie : wldap32: Skip over the TLS certificate check if not using TLS.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 12b5da66e9b7ead4e0f09b5880988e7a4a78610e URL: https://gitlab.winehq.org/wine/wine/-/commit/12b5da66e9b7ead4e0f09b5880988e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Apr 3 23:42:27 2023 -0600 wldap32: Skip over the TLS certificate check if not using TLS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54772 --- dlls/wldap32/init.c | 20 ++++++++++---------- dlls/wldap32/tests/parse.c | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index e68782add8d..f1fd33cd34e 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -271,17 +271,17 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) if ((ret = ldap_get_option( CTX(ld), LDAP_OPT_X_TLS_SSL_CTX, &tls_context ))) return map_error( ret ); - if (QueryContextAttributesA( tls_context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &cert ) != SEC_E_OK) - return WLDAP32_LDAP_SERVER_DOWN; - - if (cert_callback( ld, &cert )) - { - TRACE( "accepted\n" ); - } - else + if (QueryContextAttributesA( tls_context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &cert ) == SEC_E_OK) { - WARN( "rejected\n" ); - return WLDAP32_LDAP_SERVER_DOWN; + if (cert_callback( ld, &cert )) + { + TRACE( "accepted\n" ); + } + else + { + WARN( "rejected\n" ); + return WLDAP32_LDAP_SERVER_DOWN; + } } } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 15a24716305..995297cce10 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -586,6 +586,8 @@ static void test_opt_server_certificate(void) ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); ret = ldap_set_optionA( ld, LDAP_OPT_SERVER_CERTIFICATE, &verify_certificate ); ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_connect( ld, NULL ); + ok( !ret, "ldap_connect should succeed, got %#lx\n", ret ); ret = ldap_start_tls_sA( ld, NULL, NULL, NULL, NULL ); ok( ret == LDAP_LOCAL_ERROR, "ldap_start_tls_sA should fail, got %#lx\n", ret ); ldap_unbind( ld );

1 0

Alexandre Julliard : msvcrt: Use the fmin()/fminf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 5564512b09483156229f1231e75fc996c78d357e URL: https://gitlab.winehq.org/wine/wine/-/commit/5564512b09483156229f1231e75fc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:36:57 2023 +0200 msvcrt: Use the fmin()/fminf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index aa33f03106a..6e29972db3e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8920,34 +8920,6 @@ int CDECL _fdpcomp(float x, float y) return _dpcomp(x, y); } -/********************************************************************* - * fminf (MSVCR120.@) - */ -float CDECL fminf(float x, float y) -{ - if(isnan(x)) - return y; - if(isnan(y)) - return x; - if(x==0 && y==0) - return signbit(x) ? x : y; - return x<y ? x : y; -} - -/********************************************************************* - * fmin (MSVCR120.@) - */ -double CDECL fmin(double x, double y) -{ - if(isnan(x)) - return y; - if(isnan(y)) - return x; - if(x==0 && y==0) - return signbit(x) ? x : y; - return x<y ? x : y; -} - /********************************************************************* * asinh (MSVCR120.@) *

1 0

Alexandre Julliard : msvcrt: Use the fdim()/fdimf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 233eea6cfa59f43050ada582168fffb6587f59e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/233eea6cfa59f43050ada582168fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:37:21 2023 +0200 msvcrt: Use the fdim()/fdimf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6e29972db3e..6dcd9b5ec5f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8857,30 +8857,6 @@ float CDECL erfcf(float x) return FLT_MIN * FLT_MIN; } -/********************************************************************* - * fdimf (MSVCR120.@) - */ -float CDECL fdimf(float x, float y) -{ - if(isnan(x)) - return x; - if(isnan(y)) - return y; - return x>y ? x-y : 0; -} - -/********************************************************************* - * fdim (MSVCR120.@) - */ -double CDECL fdim(double x, double y) -{ - if(isnan(x)) - return x; - if(isnan(y)) - return y; - return x>y ? x-y : 0; -} - /********************************************************************* * _fdsign (MSVCR120.@) */

1 0

Alexandre Julliard : msvcrt: Use the copysign()/copysignf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: b5ba4baa516d556dd602382a2f7ece643a2e8049 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5ba4baa516d556dd602382a2f7ece… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:38:32 2023 +0200 msvcrt: Use the copysign()/copysignf() 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 | 26 -------------------------- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 10 +++++----- 12 files changed, 24 insertions(+), 50 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index d5192ad7569..c66cea5bade 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -64,7 +64,7 @@ @ extern _commode_dll MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -@ cdecl _copysign(double double) +@ cdecl _copysign(double double) copysign @ varargs _cprintf(str) @ extern _cpumode_dll CRTDLL__cpumode_dll @ cdecl _cputs(str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3e2839b3908..a42fe349cf5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -733,8 +733,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl -arch=!i386 _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c23293ea658..2bccd8c6fe9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1081,8 +1081,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl -arch=!i386 _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6eac1937227..ed0f69b49bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1073,8 +1073,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl _copysignf(float float) copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p @@ -2091,9 +2091,9 @@ @ stub conj @ stub conjf @ stub conjl -@ cdecl copysign(double double) _copysign -@ cdecl copysignf(float float) _copysignf -@ cdecl copysignl(double double) _copysign +@ cdecl copysign(double double) +@ cdecl copysignf(float float) +@ cdecl copysignl(double double) copysign @ cdecl cos(double) @ cdecl -arch=!i386 cosf(float) @ cdecl cosh(double) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 60fa9ed8693..cb3a92cf395 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -258,7 +258,7 @@ @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -@ cdecl _copysign(double double) +@ cdecl _copysign(double double) copysign @ varargs _cprintf(str) @ cdecl _cputs(str) @ cdecl _cputws(wstr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 1aacd768d46..a559b5cc376 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -253,7 +253,7 @@ @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -@ cdecl _copysign(double double) +@ cdecl _copysign(double double) copysign @ varargs _cprintf(str) @ cdecl _cputs(str) @ cdecl _cputws(wstr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cf885153e7a..06d0bdf82cd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -397,8 +397,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl -arch=!i386 _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 87b31d1a048..d020de98a02 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -380,8 +380,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl -arch=!i386 _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6dcd9b5ec5f..c0d9baab361 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -216,19 +216,6 @@ float CDECL _chgsignf( float num ) return u.f; } -/********************************************************************* - * _copysignf (MSVCRT.@) - * - * Copied from musl: src/math/copysignf.c - */ -float CDECL _copysignf( float x, float y ) -{ - union { float f; UINT32 i; } ux = { x }, uy = { y }; - ux.i &= 0x7fffffff; - ux.i |= uy.i & 0x80000000; - return ux.f; -} - /********************************************************************* * _nextafterf (MSVCRT.@) * @@ -5723,19 +5710,6 @@ int CDECL fesetround(int round_mode) #endif /* _MSVCR_VER>=120 */ -/********************************************************************* - * _copysign (MSVCRT.@) - * - * Copied from musl: src/math/copysign.c - */ -double CDECL _copysign( double x, double y ) -{ - union { double f; UINT64 i; } ux = { x }, uy = { y }; - ux.i &= ~0ull >> 1; - ux.i |= uy.i & 1ull << 63; - return ux.f; -} - /********************************************************************* * _finite (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6dcb0767c31..43259d7abad 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -367,8 +367,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl -arch=!i386 _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) # stub _cprintf_l(str ptr) # stub _cprintf_p(str) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 33696eba829..5cb09d92c74 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -242,7 +242,7 @@ @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -@ cdecl _copysign(double double) +@ cdecl _copysign(double double) copysign @ varargs _cprintf(str) @ cdecl _cputs(str) @ cdecl _creat(str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bc9dd2bcbc6..87a266198bd 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -237,8 +237,8 @@ @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) -@ cdecl _copysign(double double) -@ cdecl _copysignf(float float) +@ cdecl _copysign(double double) copysign +@ cdecl _copysignf(float float) copysignf @ cdecl _cputs(str) @ cdecl _cputws(wstr) @ cdecl _creat(str long) @@ -2236,9 +2236,9 @@ @ stub conj @ stub conjf @ stub conjl -@ cdecl copysign(double double) _copysign -@ cdecl copysignf(float float) _copysignf -@ cdecl copysignl(double double) _copysign +@ cdecl copysign(double double) +@ cdecl copysignf(float float) +@ cdecl copysignl(double double) copysign @ cdecl cos(double) @ cdecl -arch=!i386 cosf(float) @ cdecl cosh(double)

1 0

Alexandre Julliard : msvcrt: Use the cbrt()/cbrtf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 406c583c3bdb369e6faef763f3c77ce0bfe0670a URL: https://gitlab.winehq.org/wine/wine/-/commit/406c583c3bdb369e6faef763f3c77c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:33:29 2023 +0200 msvcrt: Use the cbrt()/cbrtf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 84 ------------------------------------------------------ 1 file changed, 84 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4d8e0e17b6f..ef5d194eab8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -7722,90 +7722,6 @@ void __cdecl __libm_sse2_sqrt_precise(void) #if _MSVCR_VER>=120 -/********************************************************************* - * cbrt (MSVCR120.@) - * - * Copied from musl: src/math/cbrt.c - */ -double CDECL cbrt(double x) -{ - static const UINT32 B1 = 715094163, B2 = 696219795; - static const double P0 = 1.87595182427177009643, - P1 = -1.88497979543377169875, - P2 = 1.621429720105354466140, - P3 = -0.758397934778766047437, - P4 = 0.145996192886612446982; - - union {double f; UINT64 i;} u = {x}; - double r,s,t,w; - UINT32 hx = u.i >> 32 & 0x7fffffff; - - if (hx >= 0x7ff00000) /* cbrt(NaN,INF) is itself */ - return x + x; - - if (hx < 0x00100000) { /* zero or subnormal? */ - u.f = x * 0x1p54; - hx = u.i>>32 & 0x7fffffff; - if (hx == 0) - return x; - hx = hx / 3 + B2; - } else - hx = hx / 3 + B1; - u.i &= 1ULL << 63; - u.i |= (UINT64)hx << 32; - t = u.f; - - r = (t * t) * (t / x); - t = t * ((P0 + r * (P1 + r * P2)) + ((r * r) * r) * (P3 + r * P4)); - - u.f = t; - u.i = (u.i + 0x80000000) & 0xffffffffc0000000ULL; - t = u.f; - - s = t * t; - r = x / s; - w = t + t; - r = (r - t) / (w + r); - t = t + t * r; - return t; -} - -/********************************************************************* - * cbrtf (MSVCR120.@) - * - * Copied from musl: src/math/cbrtf.c - */ -float CDECL cbrtf(float x) -{ - static const unsigned B1 = 709958130, B2 = 642849266; - - double r,T; - union {float f; UINT32 i;} u = {x}; - UINT32 hx = u.i & 0x7fffffff; - - if (hx >= 0x7f800000) - return x + x; - - if (hx < 0x00800000) { /* zero or subnormal? */ - if (hx == 0) - return x; - u.f = x * 0x1p24f; - hx = u.i & 0x7fffffff; - hx = hx / 3 + B2; - } else - hx = hx / 3 + B1; - u.i &= 0x80000000; - u.i |= hx; - - T = u.f; - r = T * T * T; - T = T * (x + x + r) / (x + r + r); - - r = T * T * T; - T = T * (x + x + r) / (x + r + r); - return T; -} - /********************************************************************* * exp2 (MSVCR120.@) *

1 0

Alexandre Julliard : msvcrt: Use the hypot()/hypotf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 15b50e98a43d5b2709ddd94f60f7a56b0ee19fee URL: https://gitlab.winehq.org/wine/wine/-/commit/15b50e98a43d5b2709ddd94f60f7a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:34:30 2023 +0200 msvcrt: Use the hypot()/hypotf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 101 ----------------------------------------------------- 1 file changed, 101 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ef5d194eab8..9b5f628fbec 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4599,107 +4599,6 @@ double CDECL _logb(double x) return __ilogb(x); } -static void sq(double *hi, double *lo, double x) -{ - double xh, xl, xc; - - xc = x * (0x1p27 + 1); - xh = x - xc + xc; - xl = x - xh; - *hi = x * x; - *lo = xh * xh - *hi + 2 * xh * xl + xl * xl; -} - -/********************************************************************* - * _hypot (MSVCRT.@) - * - * Copied from musl: src/math/hypot.c - */ -double CDECL _hypot(double x, double y) -{ - UINT64 ux = *(UINT64*)&x, uy = *(UINT64*)&y, ut; - double hx, lx, hy, ly, z; - int ex, ey; - - /* arrange |x| >= |y| */ - ux &= -1ULL >> 1; - uy &= -1ULL >> 1; - if (ux < uy) { - ut = ux; - ux = uy; - uy = ut; - } - - /* special cases */ - ex = ux >> 52; - ey = uy >> 52; - x = *(double*)&ux; - y = *(double*)&uy; - /* note: hypot(inf,nan) == inf */ - if (ey == 0x7ff) - return y; - if (ex == 0x7ff || uy == 0) - return x; - /* note: hypot(x,y) ~= x + y*y/x/2 with inexact for small y/x */ - /* 64 difference is enough for ld80 double_t */ - if (ex - ey > 64) - return x + y; - - /* precise sqrt argument in nearest rounding mode without overflow */ - /* xh*xh must not overflow and xl*xl must not underflow in sq */ - z = 1; - if (ex > 0x3ff + 510) { - z = 0x1p700; - x *= 0x1p-700; - y *= 0x1p-700; - } else if (ey < 0x3ff - 450) { - z = 0x1p-700; - x *= 0x1p700; - y *= 0x1p700; - } - sq(&hx, &lx, x); - sq(&hy, &ly, y); - return z * sqrt(ly + lx + hy + hx); -} - -/********************************************************************* - * _hypotf (MSVCRT.@) - * - * Copied from musl: src/math/hypotf.c - */ -float CDECL _hypotf(float x, float y) -{ - UINT32 ux = *(UINT32*)&x, uy = *(UINT32*)&y, ut; - float z; - - ux &= -1U >> 1; - uy &= -1U >> 1; - if (ux < uy) { - ut = ux; - ux = uy; - uy = ut; - } - - x = *(float*)&ux; - y = *(float*)&uy; - if (uy == 0xff << 23) - return y; - if (ux >= 0xff << 23 || uy == 0 || ux - uy >= 25 << 23) - return x + y; - - z = 1; - if (ux >= (0x7f + 60) << 23) { - z = 0x1p90f; - x *= 0x1p-90f; - y *= 0x1p-90f; - } else if (uy < (0x7f - 60) << 23) { - z = 0x1p-90f; - x *= 0x1p90f; - y *= 0x1p90f; - } - return z * sqrtf((double)x * x + (double)y * y); -} - /********************************************************************* * ceil (MSVCRT.@) *

1 0

Alexandre Julliard : libs: Import the math library from upstream musl 1.2.3.
by Alexandre Julliard April 4, 2023

April 4, 2023

1 0

Alexandre Julliard : msvcrt: Use the fabs()/fabsf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: b7228259f839881799cadbab8a6c80f5cf7ac12c URL: https://gitlab.winehq.org/wine/wine/-/commit/b7228259f839881799cadbab8a6c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 14:35:11 2023 +0200 msvcrt: Use the fabs()/fabsf() implementation from the bundled musl library. --- dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/math.c | 28 ---------------------------- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 12 files changed, 11 insertions(+), 39 deletions(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index d54e8d49964..efb835749b6 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -D_CRTDLL -D_CRTIMP= MODULE = crtdll.dll -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index d17aa79b3d7..b7ed6c9cf87 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 0bc15e27d94..1337b52224a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index cc3d5b2bdff..f854f0d5417 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index 5782a64bf03..9415d5b5b66 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index f849158e2ee..6079e87841f 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b3c44b3a530..2bf999f37f1 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 1f7ba4cdcde..0faac8f4150 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 63e6630d7bd..ad42e217d56 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 C_SRCS = \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 854403a71bf..2bbdcdcc7d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2075,22 +2075,6 @@ float CDECL modff( float x, float *iptr ) #endif -#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) - -/********************************************************************* - * fabsf (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -float CDECL fabsf( float x ) -{ - union { float f; UINT32 i; } u = { x }; - u.i &= 0x7fffffff; - return u.f; -} - -#endif - /********************************************************************* * acos (MSVCRT.@) * @@ -5095,18 +5079,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * fabs (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -double CDECL fabs( double x ) -{ - union { double f; UINT64 i; } u = { x }; - u.i &= ~0ull >> 1; - return u.f; -} - /********************************************************************* * frexp (MSVCRT.@) * diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 95f0bca93b4..994195eebc6 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= -D_DEBUG= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll PARENTSRC = ../msvcrt DELAYIMPORTS = advapi32 user32 diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index abab9d4f02c..e9cdf6127a0 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt

1 0

Alexandre Julliard : msvcrt: Use the frexp()/frexpf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: be147a806b80c005ed29decab9d4060dfd0d543b URL: https://gitlab.winehq.org/wine/wine/-/commit/be147a806b80c005ed29decab9d406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 14:38:27 2023 +0200 msvcrt: Use the frexp()/frexpf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2bbdcdcc7d3..f32e85a26a8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2009,32 +2009,6 @@ float CDECL floorf( float x ) return u.f; } -/********************************************************************* - * frexpf (MSVCRT.@) - * - * Copied from musl: src/math/frexpf.c - */ -float CDECL frexpf( float x, int *e ) -{ - UINT32 ux = *(UINT32*)&x; - int ee = ux >> 23 & 0xff; - - if (!ee) { - if (x) { - x = frexpf(x * 0x1p64, e); - *e -= 64; - } else *e = 0; - return x; - } else if (ee == 0xff) { - return x; - } - - *e = ee - 0x7e; - ux &= 0x807ffffful; - ux |= 0x3f000000ul; - return *(float*)&ux; -} - /********************************************************************* * modff (MSVCRT.@) * @@ -5079,32 +5053,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * frexp (MSVCRT.@) - * - * Copied from musl: src/math/frexp.c - */ -double CDECL frexp( double x, int *e ) -{ - UINT64 ux = *(UINT64*)&x; - int ee = ux >> 52 & 0x7ff; - - if (!ee) { - if (x) { - x = frexp(x * 0x1p64, e); - *e -= 64; - } else *e = 0; - return x; - } else if (ee == 0x7ff) { - return x; - } - - *e = ee - 0x3fe; - ux &= 0x800fffffffffffffull; - ux |= 0x3fe0000000000000ull; - return *(double*)&ux; -} - /********************************************************************* * modf (MSVCRT.@) *

1 0

Alexandre Julliard : msvcrt: Use the fmax()/fmaxf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 4a9258ee97182947dac772ec67e8975dc67ec063 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a9258ee97182947dac772ec67e897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:36:22 2023 +0200 msvcrt: Use the fmax()/fmaxf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1e1bece23f1..aa33f03106a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8857,34 +8857,6 @@ float CDECL erfcf(float x) return FLT_MIN * FLT_MIN; } -/********************************************************************* - * fmaxf (MSVCR120.@) - */ -float CDECL fmaxf(float x, float y) -{ - if(isnan(x)) - return y; - if(isnan(y)) - return x; - if(x==0 && y==0) - return signbit(x) ? y : x; - return x<y ? y : x; -} - -/********************************************************************* - * fmax (MSVCR120.@) - */ -double CDECL fmax(double x, double y) -{ - if(isnan(x)) - return y; - if(isnan(y)) - return x; - if(x==0 && y==0) - return signbit(x) ? y : x; - return x<y ? y : x; -} - /********************************************************************* * fdimf (MSVCR120.@) */

1 0