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

Piotr Caban : msvcrt: Import log10 implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: cef75b3b19d8c21e2d941de55f04f587d521a719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef75b3b19d8c21e2d941de5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:35 2021 +0200 msvcrt: Import log10 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 76 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5702131cec9..4eb759c2dda 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2964,10 +2964,82 @@ double CDECL log( double x ) */ double CDECL log10( double x ) { - double ret = unix_funcs->log10( x ); - if (x < 0.0) return math_error(_DOMAIN, "log10", x, 0, ret); - if (x == 0.0) return math_error(_SING, "log10", x, 0, ret); - return ret; + static const double ivln10hi = 4.34294481878168880939e-01, + ivln10lo = 2.50829467116452752298e-11, + log10_2hi = 3.01029995663611771306e-01, + log10_2lo = 3.69423907715893078616e-13, + Lg1 = 6.666666666666735130e-01, + Lg2 = 3.999999999940941908e-01, + Lg3 = 2.857142874366239149e-01, + Lg4 = 2.222219843214978396e-01, + Lg5 = 1.818357216161805012e-01, + Lg6 = 1.531383769920937332e-01, + Lg7 = 1.479819860511658591e-01; + + union {double f; UINT64 i;} u = {x}; + double hfsq, f, s, z, R, w, t1, t2, dk, y, hi, lo, val_hi, val_lo; + UINT32 hx; + int k; + + hx = u.i >> 32; + k = 0; + if (hx < 0x00100000 || hx >> 31) { + if (u.i << 1 == 0) + return math_error(_SING, "log10", x, 0, -1 / (x * x)); + if ((u.i & ~(1ULL << 63)) > 0x7ff0000000000000ULL) + return x; + if (hx >> 31) + return math_error(_DOMAIN, "log10", x, 0, (x - x) / (x - x)); + /* subnormal number, scale x up */ + k -= 54; + x *= 0x1p54; + u.f = x; + hx = u.i >> 32; + } else if (hx >= 0x7ff00000) { + return x; + } else if (hx == 0x3ff00000 && u.i<<32 == 0) + return 0; + + /* reduce x into [sqrt(2)/2, sqrt(2)] */ + hx += 0x3ff00000 - 0x3fe6a09e; + k += (int)(hx >> 20) - 0x3ff; + hx = (hx & 0x000fffff) + 0x3fe6a09e; + u.i = (UINT64)hx << 32 | (u.i & 0xffffffff); + x = u.f; + + f = x - 1.0; + hfsq = 0.5 * f * f; + s = f / (2.0 + f); + z = s * s; + w = z * z; + t1 = w * (Lg2 + w * (Lg4 + w * Lg6)); + t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7))); + R = t2 + t1; + + /* hi+lo = f - hfsq + s*(hfsq+R) ~ log(1+f) */ + hi = f - hfsq; + u.f = hi; + u.i &= (UINT64)-1 << 32; + hi = u.f; + lo = f - hi - hfsq + s * (hfsq + R); + + /* val_hi+val_lo ~ log10(1+f) + k*log10(2) */ + val_hi = hi * ivln10hi; + dk = k; + y = dk * log10_2hi; + val_lo = dk * log10_2lo + (lo + hi) * ivln10lo + lo * ivln10hi; + + /* + * Extra precision in for adding y is not strictly needed + * since there is no very large cancellation near x = sqrt(2) or + * x = 1/sqrt(2), but we do it anyway since it costs little on CPUs + * with some parallelism and it reduces the error for many args. + */ + w = y + val_hi; + val_lo += (y - w) + val_hi; + val_hi = w; + + return val_lo + val_hi; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 3b003a846c8..436accde122 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -120,14 +120,6 @@ static float CDECL unix_lgammaf(float x) #endif } -/********************************************************************* - * log10 - */ -static double CDECL unix_log10( double x ) -{ - return log10( x ); -} - /********************************************************************* * log10f */ @@ -211,7 +203,6 @@ static const struct unix_funcs funcs = unix_fmaf, unix_lgamma, unix_lgammaf, - unix_log10, unix_log10f, unix_log2, unix_log2f, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 7e976949e04..6ff2a520224 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -30,7 +30,6 @@ struct unix_funcs float (CDECL *fmaf)(float x, float y, float z); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); - double (CDECL *log10)(double x); float (CDECL *log10f)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x);

1 0

Piotr Caban : msvcrt: Import log10f implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: b29096cce1cbed40f539ed004aa82dbcf5fd8a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29096cce1cbed40f539ed00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:37 2021 +0200 msvcrt: Import log10f implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/unixlib.c | 9 -------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4eb759c2dda..0176b6544c0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1295,10 +1295,62 @@ float CDECL logf( float x ) */ float CDECL log10f( float x ) { - float ret = unix_funcs->log10f( x ); - if (x < 0.0) return math_error(_DOMAIN, "log10f", x, 0, ret); - if (x == 0.0) return math_error(_SING, "log10f", x, 0, ret); - return ret; + static const float ivln10hi = 4.3432617188e-01, + ivln10lo = -3.1689971365e-05, + log10_2hi = 3.0102920532e-01, + log10_2lo = 7.9034151668e-07, + Lg1 = 0xaaaaaa.0p-24, + Lg2 = 0xccce13.0p-25, + Lg3 = 0x91e9ee.0p-25, + Lg4 = 0xf89e26.0p-26; + + union {float f; UINT32 i;} u = {x}; + float hfsq, f, s, z, R, w, t1, t2, dk, hi, lo; + UINT32 ix; + int k; + + ix = u.i; + k = 0; + if (ix < 0x00800000 || ix >> 31) { /* x < 2**-126 */ + if (ix << 1 == 0) + return math_error(_SING, "log10f", x, 0, -1 / (x * x)); + if ((ix & ~(1u << 31)) > 0x7f800000) + return x; + if (ix >> 31) + return math_error(_DOMAIN, "log10f", x, 0, (x - x) / (x - x)); + /* subnormal number, scale up x */ + k -= 25; + x *= 0x1p25f; + u.f = x; + ix = u.i; + } else if (ix >= 0x7f800000) { + return x; + } else if (ix == 0x3f800000) + return 0; + + /* reduce x into [sqrt(2)/2, sqrt(2)] */ + ix += 0x3f800000 - 0x3f3504f3; + k += (int)(ix >> 23) - 0x7f; + ix = (ix & 0x007fffff) + 0x3f3504f3; + u.i = ix; + x = u.f; + + f = x - 1.0f; + s = f / (2.0f + f); + z = s * s; + w = z * z; + t1= w * (Lg2 + w * Lg4); + t2= z * (Lg1 + w * Lg3); + R = t2 + t1; + hfsq = 0.5f * f * f; + + hi = f - hfsq; + u.f = hi; + u.i &= 0xfffff000; + hi = u.f; + lo = f - hi - hfsq + s * (hfsq + R); + dk = k; + return dk * log10_2lo + (lo + hi) * ivln10lo + lo * ivln10hi + hi * ivln10hi + dk * log10_2hi; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 436accde122..4311de356df 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -120,14 +120,6 @@ static float CDECL unix_lgammaf(float x) #endif } -/********************************************************************* - * log10f - */ -static float CDECL unix_log10f( float x ) -{ - return log10f( x ); -} - /********************************************************************* * log2 */ @@ -203,7 +195,6 @@ static const struct unix_funcs funcs = unix_fmaf, unix_lgamma, unix_lgammaf, - unix_log10f, unix_log2, unix_log2f, unix_pow, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 6ff2a520224..d907d68dd7d 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -30,7 +30,6 @@ struct unix_funcs float (CDECL *fmaf)(float x, float y, float z); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); - float (CDECL *log10f)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y);

1 0

Piotr Caban : msvcrt: Import log2f implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 301bde60d3335ec78aa4bb4622dc14c5ea1eec92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=301bde60d3335ec78aa4bb46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:41 2021 +0200 msvcrt: Import log2f implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 13 -------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 80 insertions(+), 22 deletions(-) diff --git a/configure b/configure index e73670fc110..08a28968945 100755 --- a/configure +++ b/configure @@ -19623,7 +19623,6 @@ for ac_func in \ lgamma \ lgammaf \ log2 \ - log2f \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index b13c2ad3182..71c95cbdd90 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,7 +2662,6 @@ AC_CHECK_FUNCS(\ lgamma \ lgammaf \ log2 \ - log2f \ tgamma \ tgammaf ) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0176b6544c0..88a5ecd240f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -7176,12 +7176,89 @@ double CDECL log2(double x) /********************************************************************* * log2f (MSVCR120.@) + * + * Copied from musl: src/math/log2f.c */ float CDECL log2f(float x) { - if (x < 0) *_errno() = EDOM; - else if (x == 0) *_errno() = ERANGE; - return unix_funcs->log2f( x ); + static const double A[] = { + -0x1.712b6f70a7e4dp-2, + 0x1.ecabf496832ep-2, + -0x1.715479ffae3dep-1, + 0x1.715475f35c8b8p0 + }; + static const struct { + double invc, logc; + } T[] = { + { 0x1.661ec79f8f3bep+0, -0x1.efec65b963019p-2 }, + { 0x1.571ed4aaf883dp+0, -0x1.b0b6832d4fca4p-2 }, + { 0x1.49539f0f010bp+0, -0x1.7418b0a1fb77bp-2 }, + { 0x1.3c995b0b80385p+0, -0x1.39de91a6dcf7bp-2 }, + { 0x1.30d190c8864a5p+0, -0x1.01d9bf3f2b631p-2 }, + { 0x1.25e227b0b8eap+0, -0x1.97c1d1b3b7afp-3 }, + { 0x1.1bb4a4a1a343fp+0, -0x1.2f9e393af3c9fp-3 }, + { 0x1.12358f08ae5bap+0, -0x1.960cbbf788d5cp-4 }, + { 0x1.0953f419900a7p+0, -0x1.a6f9db6475fcep-5 }, + { 0x1p+0, 0x0p+0 }, + { 0x1.e608cfd9a47acp-1, 0x1.338ca9f24f53dp-4 }, + { 0x1.ca4b31f026aap-1, 0x1.476a9543891bap-3 }, + { 0x1.b2036576afce6p-1, 0x1.e840b4ac4e4d2p-3 }, + { 0x1.9c2d163a1aa2dp-1, 0x1.40645f0c6651cp-2 }, + { 0x1.886e6037841edp-1, 0x1.88e9c2c1b9ff8p-2 }, + { 0x1.767dcf5534862p-1, 0x1.ce0a44eb17bccp-2 } + }; + + double z, r, r2, p, y, y0, invc, logc; + UINT32 ix, iz, top, tmp; + int k, i; + + ix = *(UINT32*)&x; + /* Fix sign of zero with downward rounding when x==1. */ + if (ix == 0x3f800000) + return 0; + if (ix - 0x00800000 >= 0x7f800000 - 0x00800000) { + /* x < 0x1p-126 or inf or nan. */ + if (ix * 2 == 0) { + *_errno() = ERANGE; + return -1.0f / x; + } + if (ix == 0x7f800000) /* log2(inf) == inf. */ + return x; + if (ix * 2 > 0xff000000) + return x; + if (ix & 0x80000000) { + *_errno() = EDOM; + return (x - x) / (x - x); + } + /* x is subnormal, normalize it. */ + x *= 0x1p23f; + ix = *(UINT32*)&x; + ix -= 23 << 23; + } + + /* x = 2^k z; where z is in range [OFF,2*OFF] and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - 0x3f330000; + i = (tmp >> (23 - 4)) % (1 << 4); + top = tmp & 0xff800000; + iz = ix - top; + k = (INT32)tmp >> 23; /* arithmetic shift */ + invc = T[i].invc; + logc = T[i].logc; + z = *(float*)&iz; + + /* log2(x) = log1p(z/c-1)/ln2 + log2(c) + k */ + r = z * invc - 1; + y0 = logc + (double)k; + + /* Pipelined polynomial evaluation to approximate log1p(r)/ln2. */ + r2 = r * r; + y = A[1] * r + A[2]; + y = A[0] * r2 + y; + p = A[3] * r + y0; + y = y * r2 + p; + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 4311de356df..b23afaf7123 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -132,18 +132,6 @@ static double CDECL unix_log2(double x) #endif } -/********************************************************************* - * log2f - */ -static float CDECL unix_log2f(float x) -{ -#ifdef HAVE_LOG2F - return log2f(x); -#else - return unix_log2(x); -#endif -} - /********************************************************************* * pow */ @@ -196,7 +184,6 @@ static const struct unix_funcs funcs = unix_lgamma, unix_lgammaf, unix_log2, - unix_log2f, unix_pow, unix_powf, unix_tgamma, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d907d68dd7d..85f74e5fb12 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -31,7 +31,6 @@ struct unix_funcs double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); double (CDECL *log2)(double x); - float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); double (CDECL *tgamma)(double x); diff --git a/include/config.h.in b/include/config.h.in index 1b308f3d34c..d0e3ccb60fe 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -411,9 +411,6 @@ /* Define to 1 if you have the `log2' function. */ #undef HAVE_LOG2 -/* Define to 1 if you have the `log2f' function. */ -#undef HAVE_LOG2F - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT

1 0

Piotr Caban : msvcrt: Import log2 implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 7e6756d0f4495f37ac520685e3baeec053f478ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e6756d0f4495f37ac520685… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:45 2021 +0200 msvcrt: Import log2 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 --- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 244 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e6756d0f4495f37ac52…

1 0

Piotr Caban : msvcrt: Import lgamma implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 3171aa2b2d8db28e5bfde1cad92e0ef36ee7ccaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3171aa2b2d8db28e5bfde1ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:49 2021 +0200 msvcrt: Import lgamma implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 ---- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 195 insertions(+), 21 deletions(-) diff --git a/configure b/configure index edc15165750..6c890d0e36b 100755 --- a/configure +++ b/configure @@ -19620,7 +19620,6 @@ for ac_func in \ exp2 \ exp2f \ fmaf \ - lgamma \ lgammaf \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index cb2b0cbeb17..f5bf9bc071f 100644 --- a/configure.ac +++ b/configure.ac @@ -2659,7 +2659,6 @@ AC_CHECK_FUNCS(\ exp2 \ exp2f \ fmaf \ - lgamma \ lgammaf \ tgamma \ tgammaf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ae9debce20c..6f0b0c1ba4f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8644,12 +8644,206 @@ end: return sx ? -x : x; } +/* sin(pi*x) assuming x > 2^-100, if sin(pi*x)==0 the sign is arbitrary */ +static double sin_pi(double x) +{ + static const double pi = 3.14159265358979311600e+00; + int n; + + /* spurious inexact if odd int */ + x = 2.0 * (x * 0.5 - floor(x * 0.5)); /* x mod 2.0 */ + + n = (int)(x * 4.0); + n = (n + 1) / 2; + x -= n * 0.5f; + x *= pi; + + switch (n) { + default: /* case 4: */ + case 0: return __sin(x, 0.0, 0); + case 1: return __cos(x, 0.0); + case 2: return __sin(-x, 0.0, 0); + case 3: return -__cos(x, 0.0); + } +} + /********************************************************************* * lgamma (MSVCR120.@) + * + * Copied from musl: src/math/lgamma_r.c */ double CDECL lgamma(double x) { - return unix_funcs->lgamma( x ); + static const double pi = 3.14159265358979311600e+00, + a0 = 7.72156649015328655494e-02, + a1 = 3.22467033424113591611e-01, + a2 = 6.73523010531292681824e-02, + a3 = 2.05808084325167332806e-02, + a4 = 7.38555086081402883957e-03, + a5 = 2.89051383673415629091e-03, + a6 = 1.19270763183362067845e-03, + a7 = 5.10069792153511336608e-04, + a8 = 2.20862790713908385557e-04, + a9 = 1.08011567247583939954e-04, + a10 = 2.52144565451257326939e-05, + a11 = 4.48640949618915160150e-05, + tc = 1.46163214496836224576e+00, + tf = -1.21486290535849611461e-01, + tt = -3.63867699703950536541e-18, + t0 = 4.83836122723810047042e-01, + t1 = -1.47587722994593911752e-01, + t2 = 6.46249402391333854778e-02, + t3 = -3.27885410759859649565e-02, + t4 = 1.79706750811820387126e-02, + t5 = -1.03142241298341437450e-02, + t6 = 6.10053870246291332635e-03, + t7 = -3.68452016781138256760e-03, + t8 = 2.25964780900612472250e-03, + t9 = -1.40346469989232843813e-03, + t10 = 8.81081882437654011382e-04, + t11 = -5.38595305356740546715e-04, + t12 = 3.15632070903625950361e-04, + t13 = -3.12754168375120860518e-04, + t14 = 3.35529192635519073543e-04, + u0 = -7.72156649015328655494e-02, + u1 = 6.32827064025093366517e-01, + u2 = 1.45492250137234768737e+00, + u3 = 9.77717527963372745603e-01, + u4 = 2.28963728064692451092e-01, + u5 = 1.33810918536787660377e-02, + v1 = 2.45597793713041134822e+00, + v2 = 2.12848976379893395361e+00, + v3 = 7.69285150456672783825e-01, + v4 = 1.04222645593369134254e-01, + v5 = 3.21709242282423911810e-03, + s0 = -7.72156649015328655494e-02, + s1 = 2.14982415960608852501e-01, + s2 = 3.25778796408930981787e-01, + s3 = 1.46350472652464452805e-01, + s4 = 2.66422703033638609560e-02, + s5 = 1.84028451407337715652e-03, + s6 = 3.19475326584100867617e-05, + r1 = 1.39200533467621045958e+00, + r2 = 7.21935547567138069525e-01, + r3 = 1.71933865632803078993e-01, + r4 = 1.86459191715652901344e-02, + r5 = 7.77942496381893596434e-04, + r6 = 7.32668430744625636189e-06, + w0 = 4.18938533204672725052e-01, + w1 = 8.33333333333329678849e-02, + w2 = -2.77777777728775536470e-03, + w3 = 7.93650558643019558500e-04, + w4 = -5.95187557450339963135e-04, + w5 = 8.36339918996282139126e-04, + w6 = -1.63092934096575273989e-03; + + union {double f; UINT64 i;} u = {x}; + double t, y, z, nadj, p, p1, p2, p3, q, r, w; + UINT32 ix; + int sign,i; + + /* purge off +-inf, NaN, +-0, tiny and negative arguments */ + sign = u.i >> 63; + ix = u.i >> 32 & 0x7fffffff; + if (ix >= 0x7ff00000) + return x * x; + if (ix < (0x3ff - 70) << 20) { /* |x|<2**-70, return -log(|x|) */ + if(sign) + x = -x; + return -log(x); + } + if (sign) { + x = -x; + t = sin_pi(x); + if (t == 0.0) { /* -integer */ + *_errno() = ERANGE; + return 1.0 / (x - x); + } + if (t <= 0.0) + t = -t; + nadj = log(pi / (t * x)); + } + + /* purge off 1 and 2 */ + if ((ix == 0x3ff00000 || ix == 0x40000000) && (UINT32)u.i == 0) + r = 0; + /* for x < 2.0 */ + else if (ix < 0x40000000) { + if (ix <= 0x3feccccc) { /* lgamma(x) = lgamma(x+1)-log(x) */ + r = -log(x); + if (ix >= 0x3FE76944) { + y = 1.0 - x; + i = 0; + } else if (ix >= 0x3FCDA661) { + y = x - (tc - 1.0); + i = 1; + } else { + y = x; + i = 2; + } + } else { + r = 0.0; + if (ix >= 0x3FFBB4C3) { /* [1.7316,2] */ + y = 2.0 - x; + i = 0; + } else if(ix >= 0x3FF3B4C4) { /* [1.23,1.73] */ + y = x - tc; + i = 1; + } else { + y = x - 1.0; + i = 2; + } + } + switch (i) { + case 0: + z = y * y; + p1 = a0 + z * (a2 + z * (a4 + z * (a6 + z * (a8 + z * a10)))); + p2 = z * (a1 + z * (a3 + z * (a5 + z * (a7 + z * (a9 + z * a11))))); + p = y * p1 + p2; + r += (p - 0.5 * y); + break; + case 1: + z = y * y; + w = z * y; + p1 = t0 + w * (t3 + w * (t6 + w * (t9 + w * t12))); /* parallel comp */ + p2 = t1 + w * (t4 + w * (t7 + w * (t10 + w * t13))); + p3 = t2 + w * (t5 + w * (t8 + w * (t11 + w * t14))); + p = z * p1 - (tt - w * (p2 + y * p3)); + r += tf + p; + break; + case 2: + p1 = y * (u0 + y * (u1 + y * (u2 + y * (u3 + y * (u4 + y * u5))))); + p2 = 1.0 + y * (v1 + y * (v2 + y * (v3 + y * (v4 + y * v5)))); + r += -0.5 * y + p1 / p2; + } + } else if (ix < 0x40200000) { /* x < 8.0 */ + i = (int)x; + y = x - (double)i; + p = y * (s0 + y * (s1 + y * (s2 + y * (s3 + y * (s4 + y * (s5 + y * s6)))))); + q = 1.0 + y * (r1 + y * (r2 + y * (r3 + y * (r4 + y * (r5 + y * r6))))); + r = 0.5 * y + p / q; + z = 1.0; /* lgamma(1+s) = log(s) + lgamma(s) */ + switch (i) { + case 7: z *= y + 6.0; /* fall through */ + case 6: z *= y + 5.0; /* fall through */ + case 5: z *= y + 4.0; /* fall through */ + case 4: z *= y + 3.0; /* fall through */ + case 3: + z *= y + 2.0; + r += log(z); + break; + } + } else if (ix < 0x43900000) { /* 8.0 <= x < 2**58 */ + t = log(x); + z = 1.0 / x; + y = z * z; + w = w0 + z * (w1 + y * (w2 + y * (w3 + y * (w4 + y * (w5 + y * w6))))); + r = (x - 0.5) * (t - 1.0) + w; + } else /* 2**58 <= x <= inf */ + r = x * (log(x) - 1.0); + if (sign) + r = nadj - r; + return r; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 440d002869c..14aeef4c1e7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -94,19 +94,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * lgamma - */ -static double CDECL unix_lgamma(double x) -{ -#ifdef HAVE_LGAMMA - return lgamma(x); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * lgammaf */ @@ -169,7 +156,6 @@ static const struct unix_funcs funcs = unix_exp2, unix_exp2f, unix_fmaf, - unix_lgamma, unix_lgammaf, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index fc2ceb7798d..4309ff835a0 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -28,7 +28,6 @@ struct unix_funcs double (CDECL *exp2)(double x); float (CDECL *exp2f)(float x); float (CDECL *fmaf)(float x, float y, float z); - double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); diff --git a/include/config.h.in b/include/config.h.in index 252c2819fcc..dd34230b268 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,9 +297,6 @@ /* Define to 1 if you have the `ldap_parse_vlv_control' function. */ #undef HAVE_LDAP_PARSE_VLV_CONTROL -/* Define to 1 if you have the `lgamma' function. */ -#undef HAVE_LGAMMA - /* Define to 1 if you have the `lgammaf' function. */ #undef HAVE_LGAMMAF

1 0

Piotr Caban : msvcrt: Import log implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: d1ef51df4236f19c721d12bd04fd244723721771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ef51df4236f19c721d12bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:20 2021 +0200 msvcrt: Import log implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 370 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 -- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 366 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1ef51df4236f19c721d…

1 0

Rémi Bernon : mmdevapi: Load devices on driver initialization.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 0f147492ded3decc1bf2c8a6991f189fdc7133fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f147492ded3decc1bf2c8a6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 3 18:15:30 2021 +0200 mmdevapi: Load devices on driver initialization. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 14 +++----------- dlls/mmdevapi/main.c | 6 ++++++ dlls/mmdevapi/mmdevapi.h | 3 +++ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 38ae5f8962d..a0b36671595 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -373,7 +373,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st return cur; } -static HRESULT load_devices_from_reg(void) +HRESULT load_devices_from_reg(void) { DWORD i = 0; HKEY root, cur; @@ -466,7 +466,7 @@ static HRESULT set_format(MMDevice *dev) return S_OK; } -static HRESULT load_driver_devices(EDataFlow flow) +HRESULT load_driver_devices(EDataFlow flow) { WCHAR **ids; GUID *guids; @@ -860,14 +860,6 @@ static const IMMDeviceCollectionVtbl MMDevColVtbl = HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { - if (enumerator.ref == 0) - { - enumerator.ref = 1; - load_devices_from_reg(); - load_driver_devices(eRender); - load_driver_devices(eCapture); - } - return IMMDeviceEnumerator_QueryInterface(&enumerator.IMMDeviceEnumerator_iface, riid, ppv); } @@ -1278,7 +1270,7 @@ static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = static MMDevEnumImpl enumerator = { {&MMDevEnumVtbl}, - 0, + 1, }; static HRESULT MMDevPropStore_Create(MMDevice *parent, DWORD access, IPropertyStore **ppv) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 9cc0aad6105..358c1697a23 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -148,6 +148,12 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) *next = ','; } + if (drvs.module != 0){ + load_devices_from_reg(); + load_driver_devices(eRender); + load_driver_devices(eCapture); + } + return drvs.module != 0; } diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 3bcf568cddf..73c9b0e9592 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -73,4 +73,7 @@ extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient **out) DECLSPEC_HIDDEN; +extern HRESULT load_devices_from_reg(void) DECLSPEC_HIDDEN; +extern HRESULT load_driver_devices(EDataFlow flow) DECLSPEC_HIDDEN; + extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winebus.sys: Add some buttons to HID mouse input report.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 318e5feda581e601aa0c5a7023a1749733617e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=318e5feda581e601aa0c5a70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 12:47:05 2021 +0200 winebus.sys: Add some buttons to HID mouse input report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 99f834d2f40..a572d11f822 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -476,12 +476,13 @@ static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) return STATUS_BUFFER_TOO_SMALL; memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + add_button_block(buffer + sizeof(REPORT_HEADER), 1, 3); + memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE;

1 0

Francois Gouget : user32/tests: Protect OpenClipboard() from interference.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 316eec8f6658a3776d3ae147baf5ade11e536116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=316eec8f6658a3776d3ae147… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 4 14:39:09 2021 +0200 user32/tests: Protect OpenClipboard() from interference. Applications using ole32's clipboard API (e.g. Radeon / QT5) end up monitoring the content of the clipboard and calling OpenClipboard() while user32:clipboard runs. This causes the test's own OpenClipboard() calls to fail. Similarly the KDE clipboard manager may query the Wine clipboard content while the test runs, causing winex11.drv to call OpenClipboard() with the same effect. So call OpenClipboard() again when it fails due to the clipboard already being open. If opening the clipboard still fails, trace who opened the clipboard, particularly the window class name to help identify the source of interference. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 111 ++++++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=316eec8f6658a3776d3a…

1 0

Francois Gouget : user32/tests: Protect GetOpenClipboardWindow() from interference.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: f58505d1db7ae7b041976ef8e1e4b6fc7a0a1d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f58505d1db7ae7b041976ef8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 4 14:39:12 2021 +0200 user32/tests: Protect GetOpenClipboardWindow() from interference. As for OpenClipboard(), if another application opened the clipboard, GetOpenClipboardWindow() will not return the expected value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b2075c128c2..4b95675770b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -62,6 +62,27 @@ static BOOL open_clipboard(HWND hwnd) } } +static BOOL has_no_open_wnd(void) +{ + DWORD start = GetTickCount(); + while (1) + { + HWND clipwnd = GetOpenClipboardWindow(); + if (!clipwnd) return TRUE; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + /* See open_clipboard() */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return FALSE; + } + Sleep(15); + } +} + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; @@ -347,7 +368,7 @@ static void test_ClipboardOwner(void) SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); - ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + ok( has_no_open_wnd() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); ok( !IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE available\n" ); SetLastError( 0xdeadbeef ); @@ -365,7 +386,7 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); - ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( has_no_open_wnd(), "wrong open window\n" ); ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); ret = open_clipboard( 0 ); @@ -386,12 +407,12 @@ static void test_ClipboardOwner(void) ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); run_thread( open_and_empty_clipboard_thread, GetDesktopWindow(), __LINE__ ); - ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( has_no_open_wnd(), "wrong open window\n" ); ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner window %p / %p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( open_and_empty_clipboard_win_thread, 0, __LINE__ ); - ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( has_no_open_wnd(), "wrong open window\n" ); ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); }

1 0