wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Alex Henrie : msvcr120: Add log1p.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 8848e97e1d0760138485b51621b8a3f3eabc7f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8848e97e1d0760138485b5162… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 22:33:51 2017 -0600 msvcr120: Add log1p. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 31b835d0e0124d6f6e3e4f6fc9ad53de6182dee1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 58 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 44a7d42..833b989 100755 --- a/configure +++ b/configure @@ -17130,6 +17130,8 @@ for ac_func in \ llrintf \ llround \ llroundf \ + log1p \ + log1pf \ log2 \ log2f \ lrint \ diff --git a/configure.ac b/configure.ac index be48d24..e5376bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,6 +2554,8 @@ AC_CHECK_FUNCS(\ llrintf \ llround \ llroundf \ + log1p \ + log1pf \ log2 \ log2f \ lrint \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index f23782c..9a10bb8 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -270,9 +270,9 @@ @ cdecl log(double) ucrtbase.log @ cdecl log10(double) ucrtbase.log10 @ cdecl -arch=arm,x86_64 log10f(float) ucrtbase.log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) ucrtbase.log1p +@ cdecl log1pf(float) ucrtbase.log1pf +@ cdecl log1pl(double) ucrtbase.log1pl @ cdecl log2(double) ucrtbase.log2 @ cdecl log2f(float) ucrtbase.log2f @ cdecl log2l(double) ucrtbase.log2l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 26f7ecd..7b2c5eb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2259,9 +2259,9 @@ @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) MSVCR120_log1p +@ cdecl log1pf(float) MSVCR120_log1pf +@ cdecl log1pl(double) MSVCR120_log1pl @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3e9d5fe..83b0862 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1922,9 +1922,9 @@ @ cdecl -arch=arm,x86_64 logf(float) msvcr120.logf @ cdecl log10(double) msvcr120.log10 @ cdecl -arch=arm,x86_64 log10f(float) msvcr120.log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) msvcr120.log1p +@ cdecl log1pf(float) msvcr120.log1pf +@ cdecl log1pl(double) msvcr120.log1pl @ cdecl log2(double) msvcr120.log2 @ cdecl log2f(float) msvcr120.log2f @ cdecl log2l(double) msvcr120.log2l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 562cdda..775fbac 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2452,6 +2452,42 @@ LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x) } /********************************************************************* + * log1p (MSVCR120.@) + */ +double CDECL MSVCR120_log1p(double x) +{ + if (x < -1) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == -1) *MSVCRT__errno() = MSVCRT_ERANGE; +#ifdef HAVE_LOG1P + return log1p(x); +#else + return log(1 + x); +#endif +} + +/********************************************************************* + * log1pf (MSVCR120.@) + */ +float CDECL MSVCR120_log1pf(float x) +{ + if (x < -1) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == -1) *MSVCRT__errno() = MSVCRT_ERANGE; +#ifdef HAVE_LOG1PF + return log1pf(x); +#else + return log(1 + x); +#endif +} + +/********************************************************************* + * log1pl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_log1pl(LDOUBLE x) +{ + return MSVCR120_log1p(x); +} + +/********************************************************************* * log2 (MSVCR120.@) */ double CDECL MSVCR120_log2(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d3f496b..85d2ed3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2392,9 +2392,9 @@ @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) MSVCR120_log1p +@ cdecl log1pf(float) MSVCR120_log1pf +@ cdecl log1pl(double) MSVCR120_log1pl @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l diff --git a/include/config.h.in b/include/config.h.in index 5b2457e..99906bd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -507,6 +507,12 @@ /* Define to 1 if you have the `llroundf' function. */ #undef HAVE_LLROUNDF +/* Define to 1 if you have the `log1p' function. */ +#undef HAVE_LOG1P + +/* Define to 1 if you have the `log1pf' function. */ +#undef HAVE_LOG1PF + /* Define to 1 if you have the `log2' function. */ #undef HAVE_LOG2

1 0

Alex Henrie : msvcr120: Add expm1.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 94bf7cc632e8c7c57843fce541e40bcebd9888d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bf7cc632e8c7c57843fce54… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 13 23:14:20 2017 -0600 msvcr120: Add expm1. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79715cce88ef372eb56374f14c4771b748029105) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 58 insertions(+), 12 deletions(-) diff --git a/configure b/configure index c736fe8..44a7d42 100755 --- a/configure +++ b/configure @@ -17122,6 +17122,8 @@ for ac_func in \ erff \ exp2 \ exp2f \ + expm1 \ + expm1f \ lgamma \ lgammaf \ llrint \ diff --git a/configure.ac b/configure.ac index dd4c0e3..be48d24 100644 --- a/configure.ac +++ b/configure.ac @@ -2546,6 +2546,8 @@ AC_CHECK_FUNCS(\ erff \ exp2 \ exp2f \ + expm1 \ + expm1f \ lgamma \ lgammaf \ llrint \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index fb78f07..f23782c 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -231,9 +231,9 @@ @ cdecl exp2f(float) ucrtbase.exp2f @ cdecl exp2l(double) ucrtbase.exp2l @ cdecl -arch=arm,x86_64 expf(float) ucrtbase.expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) ucrtbase.expm1 +@ cdecl expm1f(float) ucrtbase.expm1f +@ cdecl expm1l(double) ucrtbase.expm1l @ cdecl fabs(double) ucrtbase.fabs @ cdecl -arch=arm fabsf(float) ucrtbase.fabsf @ stub fdim diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5177122..26f7ecd 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2134,9 +2134,9 @@ @ cdecl exp2f(float) MSVCR120_exp2f @ cdecl exp2l(double) MSVCR120_exp2l @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) MSVCR120_expm1 +@ cdecl expm1f(float) MSVCR120_expm1f +@ cdecl expm1l(double) MSVCR120_expm1l @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm,x86_64 fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0c4adb3..3e9d5fe 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1800,9 +1800,9 @@ @ cdecl exp2f(float) msvcr120.exp2f @ cdecl exp2l(double) msvcr120.exp2l @ cdecl -arch=arm,x86_64 expf(float) msvcr120.expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) msvcr120.expm1 +@ cdecl expm1f(float) msvcr120.expm1f +@ cdecl expm1l(double) msvcr120.expm1l @ cdecl fabs(double) msvcr120.fabs @ cdecl -arch=arm,x86_64 fabsf(float) msvcr120.fabsf @ cdecl fclose(ptr) msvcr120.fclose diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 867ef22..562cdda 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2416,6 +2416,42 @@ LDOUBLE CDECL MSVCR120_exp2l(LDOUBLE x) } /********************************************************************* + * expm1 (MSVCR120.@) + */ +double CDECL MSVCR120_expm1(double x) +{ +#ifdef HAVE_EXPM1 + double ret = expm1(x); +#else + double ret = exp(x) - 1; +#endif + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * expm1f (MSVCR120.@) + */ +float CDECL MSVCR120_expm1f(float x) +{ +#ifdef HAVE_EXPM1F + double ret = expm1f(x); +#else + double ret = exp(x) - 1; +#endif + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * expm1l (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x) +{ + return MSVCR120_expm1(x); +} + +/********************************************************************* * log2 (MSVCR120.@) */ double CDECL MSVCR120_log2(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 763e037..d3f496b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2277,9 +2277,9 @@ @ cdecl exp2f(float) MSVCR120_exp2f @ cdecl exp2l(double) MSVCR120_exp2l @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) MSVCR120_expm1 +@ cdecl expm1f(float) MSVCR120_expm1f +@ cdecl expm1l(double) MSVCR120_expm1l @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose diff --git a/include/config.h.in b/include/config.h.in index 56295f3..5b2457e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -147,6 +147,12 @@ /* Define to 1 if you have the `exp2f' function. */ #undef HAVE_EXP2F +/* Define to 1 if you have the `expm1' function. */ +#undef HAVE_EXPM1 + +/* Define to 1 if you have the `expm1f' function. */ +#undef HAVE_EXPM1F + /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE

1 0

Alex Henrie : msvcr120: Add atanh.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 2c5fc3b3d8d5451d45cd1616db929adeeb99e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5fc3b3d8d5451d45cd1616d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:19 2017 +0200 msvcr120: Add atanh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 860c1578e6ed130792ff6a9c5e5431ec005472ac) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 66 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- include/config.h.in | 6 ++ 8 files changed, 88 insertions(+), 12 deletions(-) diff --git a/configure b/configure index eed2c2e..c736fe8 100755 --- a/configure +++ b/configure @@ -17114,6 +17114,8 @@ for ac_func in \ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/configure.ac b/configure.ac index 9e60a76..dd4c0e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2538,6 +2538,8 @@ AC_CHECK_FUNCS(\ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 50fc298..fb78f07 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -136,9 +136,9 @@ @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f @ cdecl -arch=arm,x86_64 atanf(float) ucrtbase.atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) ucrtbase.atanh +@ cdecl atanhf(float) ucrtbase.atanhf +@ cdecl atanhl(double) ucrtbase.atanhl @ stub cabs @ stub cabsf @ stub cabsl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9e4be38..5177122 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2025,9 +2025,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 09a6dee..0c4adb3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1691,9 +1691,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) msvcr120.atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) msvcr120.atanh +@ cdecl atanhf(float) msvcr120.atanhf +@ cdecl atanhl(double) msvcr120.atanhl @ cdecl -private atexit(ptr) msvcr120.atexit @ cdecl atof(str) msvcr120.atof @ cdecl atoi(str) msvcr120.atoi diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 81911de..867ef22 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2943,6 +2943,72 @@ LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) } /********************************************************************* + * atanh (MSVCR120.@) + */ +double CDECL MSVCR120_atanh(double x) +{ + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + /* on Linux atanh returns -NAN in this case */ + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + +#ifdef HAVE_ATANH + ret = atanh(x); +#else + if (-1e-6 < x && x < 1e-6) ret = x + x*x*x/3; + else ret = (log(1+x) - log(1-x)) / 2; +#endif + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * atanhf (MSVCR120.@) + */ +float CDECL MSVCR120_atanhf(float x) +{ +#ifdef HAVE_ATANHF + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + + ret = atanhf(x); + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + return MSVCR120_atanh(x); +#endif +} + +/********************************************************************* + * atanhl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) +{ + return MSVCR120_atanh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c563808..763e037 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2167,9 +2167,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol diff --git a/include/config.h.in b/include/config.h.in index 618731e..56295f3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -50,6 +50,12 @@ /* 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 `atanhf' function. */ +#undef HAVE_ATANHF + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H

1 0

Mikhail Paulyshka : msvcp140: Implement _To_byte.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 2d5a21d944340fa81806345e4692ce5a144b60f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5a21d944340fa81806345e4… Author: Mikhail Paulyshka <me(a)mixaill.tk> Date: Mon Jul 10 12:59:02 2017 +0200 msvcp140: Implement _To_byte. Signed-off-by: Mikhail Paulyshka <me(a)mixaill.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aaaac6ffecff2b025a78513560b349c506958ee7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 6 ++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index cfaa94a..ec8ae3b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3731,7 +3731,7 @@ @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -@ stub _To_byte +@ cdecl _To_byte(wstr ptr) _To_byte @ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index b3a4214..12aedf5 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static HMODULE msvcp; @@ -215,6 +216,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore@details@Concurrency@@YAXPAU_Threadpool_chore@12@@Z"); } + SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); init_thiscall_thunk(); @@ -469,6 +471,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_byte(void) +{ + static const WCHAR test_1[] = {'T', 'E', 'S', 'T', 0}; + static const WCHAR test_2[] = {0x9580, 0x9581, 0x9582, 0x9583, 0}; /* some CJK characters */ + static const WCHAR *tests[] = {test_1, test_2}; + + char dst[MAX_PATH + 4] = "ABC\0XXXXXXX"; + char compare[MAX_PATH + 4] = "ABC\0XXXXXXX"; + int ret,expected; + unsigned int i, j; + WCHAR longstr[MAX_PATH + 3]; + + ret = p_To_byte(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", dst); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_byte(tests[i], dst); + expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare), + NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", dst, i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + for (j = 0; j < i; j++) + longstr[j] = 'A'; + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_byte(longstr, dst); + expected = WideCharToMultiByte(CP_ACP, 0, longstr, -1, compare, MAX_PATH, NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", dst, i); + } +} + static void test_to_wide(void) { /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. @@ -524,6 +572,7 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_byte(); test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8847ac2..cf1f605 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,12 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_byte(const wchar_t *src, char *dst) +{ + TRACE("(%s %p)\n", debugstr_w(src), dst); + return WideCharToMultiByte(CP_ACP, 0, src, -1, dst, MAX_PATH, NULL, NULL); +} + int __cdecl _To_wide(const char *src, wchar_t *dst) { TRACE("(%s %p)\n", debugstr_a(src), dst);

1 0

Stefan Dösinger : msvcp140: Implement _To_wide.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: c78b268c52d2930cb721d816e921e239fff4a4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78b268c52d2930cb721d816e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 26 14:52:08 2017 +0200 msvcp140: Implement _To_wide. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c5e060be9c390cee20fa1e8fef91f9e74701543) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 10 ++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e05e448..cfaa94a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3732,7 +3732,7 @@ @ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start @ cdecl _Thrd_yield() _Thrd_yield @ stub _To_byte -@ stub _To_wide +@ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper @ cdecl _Towlower(long ptr) _Towlower diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 6d1a5f8..b3a4214 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -18,6 +18,10 @@ #include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + #include "wine/test.h" #include "winbase.h" @@ -148,6 +152,8 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -209,6 +215,8 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore@details@Concurrency@@YAXPAU_Threadpool_chore@12@@Z"); } + SET(p_To_wide, "_To_wide"); + init_thiscall_thunk(); return TRUE; } @@ -461,6 +469,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_wide(void) +{ + /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. + * With a different system codepage it will produce different results, so do not hardcode the + * expected output but convert it with MultiByteToWideChar. */ + static const char special_input[] = {0xf6, 0xe4, 0xfc, 0xdf, 0x80, 0x9f, 0x81, 0x41, 0x7f, 0x42, 0}; + static const char *tests[] = {"Testtest", special_input}; + WCHAR dst[MAX_PATH + 4] = {'A', 'B', 'C', 0, 'X', 'X', 'X', 'X', 'X', 'X', 'X'}; + WCHAR compare[MAX_PATH + 4] = {'A', 'B', 'C', 0, 'X', 'X', 'X', 'X', 'X', 'X', 'X'}; + int ret, expected; + unsigned int i; + char longstr[MAX_PATH + 3]; + + ret = p_To_wide(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_wide(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_wide(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", wine_dbgstr_w(dst)); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_wide(tests[i], dst); + expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare)); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", + wine_dbgstr_w(dst), i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + memset(longstr, 'A', sizeof(longstr)); + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_wide(longstr, dst); + expected = MultiByteToWideChar(CP_ACP, 0, longstr, -1, compare, MAX_PATH); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", + wine_dbgstr_w(dst), i); + } +} + START_TEST(msvcp140) { if(!init()) return; @@ -470,5 +524,6 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d2fce47..8847ac2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,16 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_wide(const char *src, wchar_t *dst) +{ + TRACE("(%s %p)\n", debugstr_a(src), dst); + + if (!src || !dst) + return 0; + + return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base@std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp@locale@std@@")

1 0

Piotr Caban : msvcp140: Add {_Schedule, _Reschedule, _Release}_chore implementation.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: a13aa6c1ff19e1469258730c9a63ef3b677ce8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13aa6c1ff19e1469258730c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 12:13:11 2017 +0100 msvcp140: Add {_Schedule,_Reschedule,_Release}_chore implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c54f9aeaca1d662a15ae037372d7399c37d1360) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 12 ++++---- dlls/msvcp140/tests/msvcp140.c | 67 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 49 ++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a13aa6c1ff19e14692587…

1 0

Piotr Caban : msvcp140/tests: Add _TaskEventLogger tests.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 4aa135340969b8afe85a70e6420f6f74d6a122e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa135340969b8afe85a70e64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 15 12:06:29 2017 +0100 msvcp140/tests: Add _TaskEventLogger tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17b34a2e08b3ebd6195ed1f9c250ccf230b643f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 101 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 99ab8a3..dca8d0a 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -119,6 +119,12 @@ typedef struct { void *this; } function_void_cdecl_void; +typedef struct { + void *task; + MSVCP_bool scheduled; + MSVCP_bool started; +} _TaskEventLogger; + static unsigned int (__cdecl *p__Thrd_id)(void); static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); static void (__thiscall *p__ContextCallback__Assign)(_ContextCallback*, void*); @@ -126,6 +132,12 @@ static void (__thiscall *p__ContextCallback__CallInContext)(const _ContextCallba static void (__thiscall *p__ContextCallback__Capture)(_ContextCallback*); static void (__thiscall *p__ContextCallback__Reset)(_ContextCallback*); static MSVCP_bool (__cdecl *p__ContextCallback__IsCurrentOriginSTA)(_ContextCallback*); +static void (__thiscall *p__TaskEventLogger__LogCancelTask)(_TaskEventLogger*); +static void (__thiscall *p__TaskEventLogger__LogScheduleTask)(_TaskEventLogger*, MSVCP_bool); +static void (__thiscall *p__TaskEventLogger__LogTaskCompleted)(_TaskEventLogger*); +static void (__thiscall *p__TaskEventLogger__LogTaskExecutionCompleted)(_TaskEventLogger*); +static void (__thiscall *p__TaskEventLogger__LogWorkItemCompleted)(_TaskEventLogger*); +static void (__thiscall *p__TaskEventLogger__LogWorkItemStarted)(_TaskEventLogger*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -148,6 +160,12 @@ static BOOL init(void) SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z"); SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AEAAXXZ"); SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AEAAXXZ"); + SET(p__TaskEventLogger__LogCancelTask, "?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QEAAXXZ"); + SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QEAAX_N@Z"); + SET(p__TaskEventLogger__LogTaskCompleted, "?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ"); + SET(p__TaskEventLogger__LogTaskExecutionCompleted, "?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ"); + SET(p__TaskEventLogger__LogWorkItemCompleted, "?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ"); + SET(p__TaskEventLogger__LogWorkItemStarted, "?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QEAAXXZ"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAA@XZ"); @@ -155,12 +173,24 @@ static BOOL init(void) SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QBAXV?$function@$$A6AXXZ@std@@_N@Z"); SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AAAXXZ"); SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AAAXXZ"); + SET(p__TaskEventLogger__LogCancelTask, "?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAAXXZ"); + SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z"); + SET(p__TaskEventLogger__LogTaskCompleted, "?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ"); + SET(p__TaskEventLogger__LogTaskExecutionCompleted, "?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ"); + SET(p__TaskEventLogger__LogWorkItemCompleted, "?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ"); + SET(p__TaskEventLogger__LogWorkItemStarted, "?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAAXXZ"); #else SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAE@XZ"); SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AAEXPAX@Z"); SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z"); SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AAEXXZ"); SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AAEXXZ"); + SET(p__TaskEventLogger__LogCancelTask, "?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAEXXZ"); + SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z"); + SET(p__TaskEventLogger__LogTaskCompleted, "?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ"); + SET(p__TaskEventLogger__LogTaskExecutionCompleted, "?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ"); + SET(p__TaskEventLogger__LogWorkItemCompleted, "?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ"); + SET(p__TaskEventLogger__LogWorkItemStarted, "?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAEXXZ"); #endif } @@ -295,6 +325,76 @@ static void test__ContextCallback(void) #endif } +static void test__TaskEventLogger(void) +{ + _TaskEventLogger logger; + memset(&logger, 0, sizeof(logger)); + + call_func1(p__TaskEventLogger__LogCancelTask, &logger); + ok(!logger.task, "logger.task = %p\n", logger.task); + ok(!logger.scheduled, "logger.scheduled = %x\n", logger.scheduled); + ok(!logger.started, "logger.started = %x\n", logger.started); + + call_func2(p__TaskEventLogger__LogScheduleTask, &logger, FALSE); + ok(!logger.task, "logger.task = %p\n", logger.task); + ok(!logger.scheduled, "logger.scheduled = %x\n", logger.scheduled); + ok(!logger.started, "logger.started = %x\n", logger.started); + + call_func1(p__TaskEventLogger__LogTaskCompleted, &logger); + ok(!logger.task, "logger.task = %p\n", logger.task); + ok(!logger.scheduled, "logger.scheduled = %x\n", logger.scheduled); + ok(!logger.started, "logger.started = %x\n", logger.started); + + call_func1(p__TaskEventLogger__LogTaskExecutionCompleted, &logger); + ok(!logger.task, "logger.task = %p\n", logger.task); + ok(!logger.scheduled, "logger.scheduled = %x\n", logger.scheduled); + ok(!logger.started, "logger.started = %x\n", logger.started); + + call_func1(p__TaskEventLogger__LogWorkItemCompleted, &logger); + ok(!logger.task, "logger.task = %p\n", logger.task); + ok(!logger.scheduled, "logger.scheduled = %x\n", logger.scheduled); + ok(!logger.started, "logger.started = %x\n", logger.started); + + call_func1(p__TaskEventLogger__LogWorkItemStarted, &logger); + ok(!logger.task, "logger.task = %p\n", logger.task); + ok(!logger.scheduled, "logger.scheduled = %x\n", logger.scheduled); + ok(!logger.started, "logger.started = %x\n", logger.started); + + logger.task = (void*)0xdeadbeef; + logger.scheduled = TRUE; + logger.started = TRUE; + + call_func1(p__TaskEventLogger__LogCancelTask, &logger); + ok(logger.task == (void*)0xdeadbeef, "logger.task = %p\n", logger.task); + ok(logger.scheduled, "logger.scheduled = FALSE\n"); + ok(logger.started, "logger.started = FALSE\n"); + + call_func2(p__TaskEventLogger__LogScheduleTask, &logger, FALSE); + ok(logger.task == (void*)0xdeadbeef, "logger.task = %p\n", logger.task); + ok(logger.scheduled, "logger.scheduled = FALSE\n"); + ok(logger.started, "logger.started = FALSE\n"); + + call_func1(p__TaskEventLogger__LogTaskCompleted, &logger); + ok(logger.task == (void*)0xdeadbeef, "logger.task = %p\n", logger.task); + ok(logger.scheduled, "logger.scheduled = FALSE\n"); + ok(logger.started, "logger.started = FALSE\n"); + + call_func1(p__TaskEventLogger__LogTaskExecutionCompleted, &logger); + ok(logger.task == (void*)0xdeadbeef, "logger.task = %p\n", logger.task); + ok(logger.scheduled, "logger.scheduled = FALSE\n"); + ok(logger.started, "logger.started = FALSE\n"); + + call_func1(p__TaskEventLogger__LogWorkItemCompleted, &logger); + ok(logger.task == (void*)0xdeadbeef, "logger.task = %p\n", logger.task); + ok(logger.scheduled, "logger.scheduled = FALSE\n"); + ok(logger.started, "logger.started = FALSE\n"); + + call_func1(p__TaskEventLogger__LogWorkItemStarted, &logger); + ok(logger.task == (void*)0xdeadbeef, "logger.task = %p\n", logger.task); + ok(logger.scheduled, "logger.scheduled = FALSE\n"); + ok(logger.started, "logger.started = FALSE\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -302,5 +402,6 @@ START_TEST(msvcp140) test_vbtable_size_exports(); test_task_continuation_context(); test__ContextCallback(); + test__TaskEventLogger(); FreeLibrary(msvcp); }

1 0

Piotr Caban : msvcp140: Add _ContextCallback tests.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: eb6f46394a935f1d5ae02a3c073ea06092d7630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6f46394a935f1d5ae02a3c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 16:01:40 2017 +0100 msvcp140: Add _ContextCallback tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72df2637a7db533eaa6f445af42e752ad90fe56a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 143 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index db241ca..99ab8a3 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -21,6 +21,38 @@ #include "wine/test.h" #include "winbase.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { \ + expect_ ## func = TRUE; \ + errno = 0xdeadbeef; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#ifdef _WIN64 +DEFINE_EXPECT(function_do_call); +DEFINE_EXPECT(function_do_clean); +#endif + #undef __thiscall #ifdef __i386__ #define __thiscall __stdcall @@ -43,6 +75,7 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); static void init_thiscall_thunk(void) { @@ -54,24 +87,45 @@ static void init_thiscall_thunk(void) thunk->push_eax = 0x50; /* pushl %eax */ thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,a) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) #endif /* __i386__ */ +typedef unsigned char MSVCP_bool; typedef struct { void *unk0; BYTE unk1; } task_continuation_context; +typedef struct { + void *unused; +} _ContextCallback; + +typedef struct { + const void *vtable; + void (__cdecl *func)(void); + int unk[4]; + void *unk2[3]; + void *this; +} function_void_cdecl_void; + static unsigned int (__cdecl *p__Thrd_id)(void); static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); +static void (__thiscall *p__ContextCallback__Assign)(_ContextCallback*, void*); +static void (__thiscall *p__ContextCallback__CallInContext)(const _ContextCallback*, function_void_cdecl_void, MSVCP_bool); +static void (__thiscall *p__ContextCallback__Capture)(_ContextCallback*); +static void (__thiscall *p__ContextCallback__Reset)(_ContextCallback*); +static MSVCP_bool (__cdecl *p__ContextCallback__IsCurrentOriginSTA)(_ContextCallback*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -86,14 +140,27 @@ static BOOL init(void) } SET(p__Thrd_id, "_Thrd_id"); + SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AEAA@XZ"); + SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AEAAXPEAX@Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z"); + SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AEAAXXZ"); + SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AEAAXXZ"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAA@XZ"); + SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AAAXPAX@Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QBAXV?$function@$$A6AXXZ@std@@_N@Z"); + SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AAAXXZ"); + SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AAAXXZ"); #else SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAE@XZ"); + SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AAEXPAX@Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z"); + SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AAEXXZ"); + SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AAEXXZ"); #endif } @@ -153,11 +220,87 @@ static void test_task_continuation_context(void) ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1); } +#ifdef _WIN64 +static void __cdecl function_do_call(void *this) +{ + CHECK_EXPECT(function_do_call); +} + +static void __cdecl function_do_clean(void *this, MSVCP_bool b) +{ + CHECK_EXPECT(function_do_clean); + ok(b, "b == FALSE\n"); +} +#endif + +static void test__ContextCallback(void) +{ + _ContextCallback cc = {0}; + void *v = (void*)0xdeadbeef; +#ifdef _WIN64 + void* function_vtbl[] = { + NULL, + NULL, + (void*)function_do_call, + NULL, + (void*)function_do_clean, + NULL + }; + function_void_cdecl_void function = { function_vtbl, NULL, {0}, {NULL}, &function }; + function_void_cdecl_void function2 = { NULL, NULL, {0}, {NULL}, &function }; +#endif + + call_func2(p__ContextCallback__Assign, &cc, v); + ok(!cc.unused, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Reset, &cc); + ok(!cc.unused, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Capture, &cc); + ok(!cc.unused, "cc.unused = %p\n", cc.unused); + ok(!p__ContextCallback__IsCurrentOriginSTA(&cc), "IsCurrentOriginSTA returned TRUE\n"); + + cc.unused = v; + call_func2(p__ContextCallback__Assign, &cc, NULL); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Reset, &cc); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Capture, &cc); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + ok(!p__ContextCallback__IsCurrentOriginSTA(&cc), "IsCurrentOriginSTA returned TRUE\n"); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + +#ifdef _WIN64 + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function, FALSE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); + + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function, TRUE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); + + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function2, FALSE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); + + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function2, TRUE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); +#endif +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); test_vbtable_size_exports(); test_task_continuation_context(); + test__ContextCallback(); FreeLibrary(msvcp); }

1 0

Alexandre Julliard : user32: Always update the visible region for cross-process DCEs.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 341f3a5effae03eef3ed6588203f7716476ced6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=341f3a5effae03eef3ed65882… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 17:04:35 2017 +0200 user32: Always update the visible region for cross-process DCEs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7f30014c307cf69f9c4e7c472ee38338e0b2638) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/painting.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 622dcad..d555a0f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1053,6 +1053,9 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) dce->hwnd = hwnd; dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); + /* cross-process invalidation is not supported yet, so always update the vis rgn */ + if (!WIN_IsCurrentProcess( hwnd )) bUpdateVisRgn = TRUE; + if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce );

1 0

Alex Henrie : msvcr120: Add acosh.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: e9e33f5e9162acc9411c4bef3354be19b60ee1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e33f5e9162acc9411c4bef3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:09 2017 +0200 msvcr120: Add acosh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f1dad14807ae9650c66d83ec35fbc016b91ac471) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 45 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- include/config.h.in | 6 +++ 8 files changed, 67 insertions(+), 12 deletions(-) diff --git a/configure b/configure index ceb6419..eed2c2e 100755 --- a/configure +++ b/configure @@ -17110,6 +17110,8 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ + acosh \ + acoshf \ asinh \ asinhf \ cbrt \ diff --git a/configure.ac b/configure.ac index 353f271..9e60a76 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,6 +2534,8 @@ then fi AC_CHECK_FUNCS(\ + acosh \ + acoshf \ asinh \ asinhf \ cbrt \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index d5ade42..50fc298 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -124,9 +124,9 @@ @ cdecl _yn(long double) ucrtbase._yn @ cdecl acos(double) ucrtbase.acos @ cdecl -arch=arm,x86_64 acosf(float) ucrtbase.acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) ucrtbase.acosh +@ cdecl acoshf(float) ucrtbase.acoshf +@ cdecl acoshl(double) ucrtbase.acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf @ cdecl asinh(double double) ucrtbase.asinh diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f98c25b..9e4be38 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2011,9 +2011,9 @@ @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) MSVCR120_acosh +@ cdecl acoshf(float) MSVCR120_acoshf +@ cdecl acoshl(double) MSVCR120_acoshl @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0a7d3e4..09a6dee 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1677,9 +1677,9 @@ @ cdecl abs(long) msvcr120.abs @ cdecl acos(double) msvcr120.acos @ cdecl -arch=arm,x86_64 acosf(float) msvcr120.acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) msvcr120.acosh +@ cdecl acoshf(float) msvcr120.acoshf +@ cdecl acoshl(double) msvcr120.acoshl @ cdecl asctime(ptr) msvcr120.asctime @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 323ed2c..81911de 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2898,6 +2898,51 @@ LDOUBLE CDECL MSVCR120_asinhl(LDOUBLE x) } /********************************************************************* + * acosh (MSVCR120.@) + */ +double CDECL MSVCR120_acosh(double x) +{ + if (x < 1) *MSVCRT__errno() = MSVCRT_EDOM; + +#ifdef HAVE_ACOSH + return acosh(x); +#else + if (x < 1) { + MSVCRT_fenv_t env; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + if (!isfinite(x*x)) return log(2) + log(x); + return log(x + sqrt(x*x-1)); +#endif +} + +/********************************************************************* + * acoshf (MSVCR120.@) + */ +float CDECL MSVCR120_acoshf(float x) +{ +#ifdef HAVE_ACOSHF + if (x < 1) *MSVCRT__errno() = MSVCRT_EDOM; + + return acoshf(x); +#else + return MSVCR120_acosh(x); +#endif +} + +/********************************************************************* + * acoshl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) +{ + return MSVCR120_acosh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c75d75e..c563808 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2153,9 +2153,9 @@ @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) MSVCR120_acosh +@ cdecl acoshf(float) MSVCR120_acoshf +@ cdecl acoshl(double) MSVCR120_acoshl @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin diff --git a/include/config.h.in b/include/config.h.in index 5dcd90b..618731e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -10,6 +10,12 @@ /* 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 `acoshf' function. */ +#undef HAVE_ACOSHF + /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017