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

Piotr Caban : msvcrt: Update search position when no token was found in strtok.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: bf7244442de0dfdc5a13f6c6a1624fbf5b762ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf7244442de0dfdc5a13f6c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 18:00:15 2021 +0200 msvcrt: Update search position when no token was found in strtok. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 6 +++++- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d335fce4992..27e3284326a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -287,7 +287,11 @@ char * CDECL strtok( char *str, const char *delim ) if (!(str = data->strtok_next)) return NULL; while (*str && strchr( delim, *str )) str++; - if (!*str) return NULL; + if (!*str) + { + data->strtok_next = str; + return NULL; + } ret = str++; while (*str && !strchr( delim, *str )) str++; if (*str) *str++ = 0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6bf3b6e775d..be0356f4c7e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1685,6 +1685,14 @@ static void test_strtok(void) "third call string (%p) \'%s\' return %p\n", teststr, testcases_strtok[i].string, strret); } + + strcpy( teststr, "test a=b" ); + strret = strtok( teststr, " " ); + ok( strret == teststr, "strret = %p, expected %p\n", strret, teststr ); + strret = strtok( NULL, "ab=" ); + ok( !strret, "strret = %p, expected NULL\n", strret ); + strret = strtok( NULL, "=" ); + ok( !strret, "strret = %p, expected NULL\n", strret ); } static void test_strtol(void)

1 0

Rémi Bernon : dssenh: Only fill hash buffer when it's provided.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 9b19a110ea6adb289cc1afa8e33d8b259164801e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b19a110ea6adb289cc1afa8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:12 2021 +0200 dssenh: Only fill hash buffer when it's provided. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 2 +- dlls/dssenh/tests/dssenh.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b03c05195cd..8344b5a321b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -940,7 +940,7 @@ BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYT SetLastError( ERROR_MORE_DATA ); return FALSE; } - memcpy( data, hash->value, hash->len ); + if (data) memcpy( data, hash->value, hash->len ); *len = hash->len; return TRUE; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f0fe4a02f97..f399f67d210 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -472,9 +472,16 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); + dataLen = 0xdeadbeef; + result = CryptGetHashParam(hHash, HP_HASHVAL, 0, &dataLen, 0); + ok(result, "Expected hash value return.\n"); + ok(dataLen == hashLen, "Expected hash length to match.\n"); + + hashLen = 0xdeadbeef; result = CryptGetHashParam(hHash, HP_HASHVAL, hashValue, &hashLen, 0); ok(result, "Expected hash value return.\n"); + ok(dataLen == hashLen, "Expected hash length to match.\n"); ok(!memcmp(hashValue, tests[i].hash, tests[i].hashLen), "Incorrect hash output.\n"); result = CryptHashData(hHash, data, dataLen, 0);

1 0

Piotr Caban : msvcrt: Import acoshf implementation from musl.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 75537f43752c9cceef2f02d1f13e9f1b245840c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75537f43752c9cceef2f02d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 15:21:06 2021 +0200 msvcrt: Import acoshf 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 | 12 +++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 0de80eca5ee..3f1fc453e34 100755 --- a/configure +++ b/configure @@ -19617,7 +19617,6 @@ fi for ac_func in \ acosh \ - acoshf \ asinh \ asinhf \ atanh \ diff --git a/configure.ac b/configure.ac index c144fa1bbdd..e1989cc2868 100644 --- a/configure.ac +++ b/configure.ac @@ -2657,7 +2657,6 @@ fi AC_CHECK_FUNCS(\ acosh \ - acoshf \ asinh \ asinhf \ atanh \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 811fce1531d..01c50800567 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6599,16 +6599,26 @@ double CDECL acosh(double x) /********************************************************************* * acoshf (MSVCR120.@) + * + * Copied from musl: src/math/acoshf.c */ float CDECL acoshf(float x) { + UINT32 a = *(UINT32*)&x & 0x7fffffff; + if (x < 1) { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - return unix_funcs->acoshf( x ); + + 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; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index c69ca440504..efd3021aa59 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -55,18 +55,6 @@ static double CDECL unix_acosh(double x) #endif } -/********************************************************************* - * acoshf - */ -static float CDECL unix_acoshf(float x) -{ -#ifdef HAVE_ACOSHF - return acoshf(x); -#else - return unix_acosh(x); -#endif -} - /********************************************************************* * asinh */ @@ -448,7 +436,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { unix_acosh, - unix_acoshf, unix_asinh, unix_asinhf, unix_atanh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 6fbafe064c1..2f171339d30 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -24,7 +24,6 @@ struct unix_funcs { double (CDECL *acosh)(double x); - float (CDECL *acoshf)(float x); double (CDECL *asinh)(double x); float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); diff --git a/include/config.h.in b/include/config.h.in index 74d54a942a6..b94337818ca 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the `acosh' function. */ #undef HAVE_ACOSH -/* Define to 1 if you have the `acoshf' function. */ -#undef HAVE_ACOSHF - /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H

1 0

Piotr Caban : msvcrt: Import acosh implementation from musl.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: bc9105e238a076da6e22e0df77a6de6a6f3cd0a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc9105e238a076da6e22e0df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 15:21:10 2021 +0200 msvcrt: Import acosh 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 | 12 +++++++++++- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 3f1fc453e34..a0510d8a36f 100755 --- a/configure +++ b/configure @@ -19616,7 +19616,6 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ - acosh \ asinh \ asinhf \ atanh \ diff --git a/configure.ac b/configure.ac index e1989cc2868..0dd919f1a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -2656,7 +2656,6 @@ then fi AC_CHECK_FUNCS(\ - acosh \ asinh \ asinhf \ atanh \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 01c50800567..01c0c053aa5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6585,16 +6585,26 @@ float CDECL asinhf(float x) /********************************************************************* * acosh (MSVCR120.@) + * + * Copied from musl: src/math/acosh.c */ double CDECL acosh(double x) { + int e = *(UINT64*)&x >> 52 & 0x7ff; + if (x < 1) { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - return unix_funcs->acosh( x ); + + 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; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index efd3021aa59..f51739cf0c9 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -42,19 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/********************************************************************* - * acosh - */ -static double CDECL unix_acosh(double x) -{ -#ifdef HAVE_ACOSH - return acosh(x); -#else - if (!isfinite(x*x)) return log(2) + log(x); - return log(x + sqrt(x*x-1)); -#endif -} - /********************************************************************* * asinh */ @@ -435,7 +422,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { - unix_acosh, unix_asinh, unix_asinhf, unix_atanh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 2f171339d30..b4275e3750b 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -23,7 +23,6 @@ struct unix_funcs { - double (CDECL *acosh)(double x); double (CDECL *asinh)(double x); float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); diff --git a/include/config.h.in b/include/config.h.in index b94337818ca..ab6c2bc3381 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -9,9 +9,6 @@ /* Define to the file extension for executables. */ #undef EXEEXT -/* Define to 1 if you have the `acosh' function. */ -#undef HAVE_ACOSH - /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H

1 0

Piotr Caban : msvcrt: Import asinhf implementation from musl.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 17174db64a81e170a4aa288def3a984879f75b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17174db64a81e170a4aa288d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 15:21:13 2021 +0200 msvcrt: Import asinhf 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 | 19 ++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/configure b/configure index a0510d8a36f..d7b558784fd 100755 --- a/configure +++ b/configure @@ -19617,7 +19617,6 @@ fi for ac_func in \ asinh \ - asinhf \ atanh \ atanhf \ exp2 \ diff --git a/configure.ac b/configure.ac index 0dd919f1a2c..73afcc9c6d0 100644 --- a/configure.ac +++ b/configure.ac @@ -2657,7 +2657,6 @@ fi AC_CHECK_FUNCS(\ asinh \ - asinhf \ atanh \ atanhf \ exp2 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 01c0c053aa5..65d01105a45 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6577,10 +6577,27 @@ double CDECL asinh(double x) /********************************************************************* * asinhf (MSVCR120.@) + * + * Copied from musl: src/math/asinhf.c */ float CDECL asinhf(float x) { - return unix_funcs->asinhf( 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; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index f51739cf0c9..f937ee5e65e 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -59,18 +59,6 @@ static double CDECL unix_asinh(double x) #endif } -/********************************************************************* - * asinhf - */ -static float CDECL unix_asinhf(float x) -{ -#ifdef HAVE_ASINHF - return asinhf(x); -#else - return unix_asinh(x); -#endif -} - /********************************************************************* * atanh */ @@ -423,7 +411,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { unix_asinh, - unix_asinhf, unix_atanh, unix_atanhf, unix_cosh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index b4275e3750b..6a3732234a2 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -24,7 +24,6 @@ struct unix_funcs { double (CDECL *asinh)(double x); - float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); double (CDECL *cosh)(double x); diff --git a/include/config.h.in b/include/config.h.in index ab6c2bc3381..f44f72c459d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -28,9 +28,6 @@ /* Define to 1 if you have the `asinh' function. */ #undef HAVE_ASINH -/* Define to 1 if you have the `asinhf' function. */ -#undef HAVE_ASINHF - /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H

1 0

Piotr Caban : msvcrt: Import asinh implementation from musl.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: da55a453d1422d37b5684ea3ddaf7ef95bf6d7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da55a453d1422d37b5684ea3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 15:21:15 2021 +0200 msvcrt: Import asinh 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 | 20 +++++++++++++++++++- dlls/msvcrt/unixlib.c | 18 ------------------ dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 19 insertions(+), 25 deletions(-) diff --git a/configure b/configure index d7b558784fd..9b41d4ff072 100755 --- a/configure +++ b/configure @@ -19616,7 +19616,6 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ - asinh \ atanh \ atanhf \ exp2 \ diff --git a/configure.ac b/configure.ac index 73afcc9c6d0..6674e0d15df 100644 --- a/configure.ac +++ b/configure.ac @@ -2656,7 +2656,6 @@ then fi AC_CHECK_FUNCS(\ - asinh \ atanh \ atanhf \ exp2 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 65d01105a45..8d4ca7bb3fb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6569,10 +6569,28 @@ double CDECL fmin(double x, double y) /********************************************************************* * asinh (MSVCR120.@) + * + * Copied from musl: src/math/asinh.c */ double CDECL asinh(double x) { - return unix_funcs->asinh( 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; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index f937ee5e65e..ce055c8ea03 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -42,23 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/********************************************************************* - * asinh - */ -static double CDECL unix_asinh(double x) -{ -#ifdef HAVE_ASINH - return asinh(x); -#else - if (!isfinite(x*x+1)) - { - if (x > 0) return log(2) + log(x); - else return -log(2) - log(-x); - } - return log(x + sqrt(x*x+1)); -#endif -} - /********************************************************************* * atanh */ @@ -410,7 +393,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { - unix_asinh, unix_atanh, unix_atanhf, unix_cosh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 6a3732234a2..f915f2f92d0 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -23,7 +23,6 @@ struct unix_funcs { - double (CDECL *asinh)(double x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); double (CDECL *cosh)(double x); diff --git a/include/config.h.in b/include/config.h.in index f44f72c459d..bca2d843e58 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -25,9 +25,6 @@ /* Define to 1 if you have the <arpa/nameser.h> header file. */ #undef HAVE_ARPA_NAMESER_H -/* Define to 1 if you have the `asinh' function. */ -#undef HAVE_ASINH - /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H

1 0

Rémi Bernon : dinput8/tests: Flush events after creating window.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 15beabe071002954ad38ca1891616efa245dbc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=15beabe071002954ad38ca18… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:52 2021 +0200 dinput8/tests: Flush events after creating window. To make it more likely it gets focused on X11 and fix spurious failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 2e0b8cdf2e9..69051bb2a34 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -48,6 +48,21 @@ static const HRESULT SetCoop_child_window[16] = { E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + static void test_set_coop(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; @@ -131,6 +146,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); + flush_events(); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Piotr Caban : msvcrt: Import atanf implementation from musl.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: ed49a95d1e0ba985f9e101e3769d722894f5803f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed49a95d1e0ba985f9e101e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 15:21:18 2021 +0200 msvcrt: Import atanf 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 | 28 ++++++++++++++++++++++------ dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 9b41d4ff072..860d57b4868 100755 --- a/configure +++ b/configure @@ -19617,7 +19617,6 @@ fi for ac_func in \ atanh \ - atanhf \ exp2 \ exp2f \ expm1 \ diff --git a/configure.ac b/configure.ac index 6674e0d15df..f8ade3af9e6 100644 --- a/configure.ac +++ b/configure.ac @@ -2657,7 +2657,6 @@ fi AC_CHECK_FUNCS(\ atanh \ - atanhf \ exp2 \ exp2f \ expm1 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8d4ca7bb3fb..0bffbcdd8a2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6687,21 +6687,37 @@ double CDECL atanh(double x) /********************************************************************* * atanhf (MSVCR120.@) + * + * Copied from musl: src/math/atanhf.c */ float CDECL atanhf(float x) { - float ret; + UINT32 ux = *(UINT32*)&x; + int s = ux >> 31; - if (x > 1 || x < -1) { + /* |x| */ + ux &= 0x7fffffff; + x = *(float*)&ux; + + if (x > 1) { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - ret = unix_funcs->atanh( x ); - - if (!isfinite(ret)) *_errno() = ERANGE; - return ret; + 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; } #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index ce055c8ea03..b044a209045 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -55,18 +55,6 @@ static double CDECL unix_atanh(double x) #endif } -/********************************************************************* - * atanhf - */ -static float CDECL unix_atanhf(float x) -{ -#ifdef HAVE_ATANHF - return atanhf(x); -#else - return unix_atanh(x); -#endif -} - /********************************************************************* * cosh */ @@ -394,7 +382,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { unix_atanh, - unix_atanhf, unix_cosh, unix_coshf, unix_exp, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index f915f2f92d0..90b55addd4c 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -24,7 +24,6 @@ struct unix_funcs { double (CDECL *atanh)(double x); - float (CDECL *atanhf)(float x); double (CDECL *cosh)(double x); float (CDECL *coshf)(float x); double (CDECL *exp)(double x); diff --git a/include/config.h.in b/include/config.h.in index bca2d843e58..132922e1f8c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -34,9 +34,6 @@ /* Define to 1 if you have the `atanh' function. */ #undef HAVE_ATANH -/* Define to 1 if you have the `atanhf' function. */ -#undef HAVE_ATANHF - /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H

1 0

Piotr Caban : msvcrt: Import atanh implementation from musl.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: ff033db60b41fcbb35a3dcca4ab181db43dd2029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff033db60b41fcbb35a3dcca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 15:21:24 2021 +0200 msvcrt: Import atanh 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 | 29 +++++++++++++++++++++++------ dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 23 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 860d57b4868..0aa6e54804c 100755 --- a/configure +++ b/configure @@ -19616,7 +19616,6 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ - atanh \ exp2 \ exp2f \ expm1 \ diff --git a/configure.ac b/configure.ac index f8ade3af9e6..821b2bb092b 100644 --- a/configure.ac +++ b/configure.ac @@ -2656,7 +2656,6 @@ then fi AC_CHECK_FUNCS(\ - atanh \ exp2 \ exp2f \ expm1 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0bffbcdd8a2..732d2084285 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6668,21 +6668,38 @@ float CDECL acoshf(float x) /********************************************************************* * atanh (MSVCR120.@) + * + * Copied from musl: src/math/atanh.c */ double CDECL atanh(double x) { - double ret; + UINT64 ux = *(UINT64*)&x; + int e = ux >> 52 & 0x7ff; + int s = ux >> 63; - if (x > 1 || x < -1) { + /* |x| */ + ux &= (UINT64)-1 / 2; + x = *(double*)&ux; + + if (x > 1) { *_errno() = EDOM; - /* on Linux atanh returns -NAN in this case */ feraiseexcept(FE_INVALID); return NAN; } - ret = unix_funcs->atanh( x ); - if (!isfinite(ret)) *_errno() = ERANGE; - return ret; + 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; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index b044a209045..6d3a3bd5a79 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -42,19 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/********************************************************************* - * atanh - */ -static double CDECL unix_atanh(double x) -{ -#ifdef HAVE_ATANH - return atanh(x); -#else - if (-1e-6 < x && x < 1e-6) return x + x*x*x/3; - else return (log(1+x) - log(1-x)) / 2; -#endif -} - /********************************************************************* * cosh */ @@ -381,7 +368,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { - unix_atanh, unix_cosh, unix_coshf, unix_exp, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 90b55addd4c..06f0d6ec5c9 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -23,7 +23,6 @@ struct unix_funcs { - double (CDECL *atanh)(double x); double (CDECL *cosh)(double x); float (CDECL *coshf)(float x); double (CDECL *exp)(double x); diff --git a/include/config.h.in b/include/config.h.in index 132922e1f8c..6ea3949541b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -31,9 +31,6 @@ /* Define to 1 if you have the <asm/user.h> header file. */ #undef HAVE_ASM_USER_H -/* Define to 1 if you have the `atanh' function. */ -#undef HAVE_ATANH - /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H

1 0

Rémi Bernon : dssenh: Return NTE_BAD_KEYSET when key cannot be opened.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: cf770571bf538f2794f56220f649b232688d1736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf770571bf538f2794f56220… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:11 2021 +0200 dssenh: Return NTE_BAD_KEYSET when key cannot be opened. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 3 ++- dlls/dssenh/tests/dssenh.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6cfa04393fd..b03c05195cd 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -284,7 +284,8 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags { case 0: case 0 | CRYPT_MACHINE_KEYSET: - ret = read_key_container( name, flags ); + if (!(ret = read_key_container( name, flags ))) + SetLastError( NTE_BAD_KEYSET ); break; case CRYPT_NEWKEYSET: diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b72b1e3a614..f0fe4a02f97 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -75,7 +75,7 @@ static void test_acquire_context(void) result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); if (!result) { - todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); }

1 0