wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Rémi Bernon : dinput: Free axis_map when joystick device is freed.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 5cf67f00d0e4d157fb08ac56cb9d8066c57a7be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cf67f00d0e4d157fb08ac56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:58 2021 +0200 dinput: Free axis_map when joystick device is freed. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=36263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 11 +++++++++++ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 2 ++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index a68c4df20e6..8ea7850621c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -534,6 +534,17 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } + +ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface) +{ + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + void *axis_map = This->axis_map; + ULONG res = IDirectInputDevice2WImpl_Release(iface); + if (!res) HeapFree(GetProcessHeap(), 0, axis_map); + return res; +} + + /****************************************************************************** * GetObjectInfo : get object info */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5a88e643e07..3215978c995 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -786,7 +786,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, - IDirectInputDevice2WImpl_Release, + JoystickWGenericImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickLinuxWImpl_GetProperty, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 488e9c04759..2b970271ec3 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1231,7 +1231,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, - IDirectInputDevice2WImpl_Release, + JoystickWGenericImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWImpl_GetProperty, diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 6d37a476380..27a47b07639 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1484,7 +1484,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, - IDirectInputDevice2WImpl_Release, + JoystickWGenericImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWImpl_GetProperty, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 78d5d721808..874bf3e69a7 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -59,6 +59,8 @@ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); + HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : dinput: Prevent a device interface leak when enumerating.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 52aacd2377c68097ea165fdfff188fd6768fcc4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=52aacd2377c68097ea165fdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:57 2021 +0200 dinput: Prevent a device interface leak when enumerating. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=36263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 62e70e0535c..c7b932aca44 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -864,8 +864,10 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { HeapFree(GetProcessHeap(), 0, didevis); + IDirectInputDevice_Release(lpdid); return DI_OK; } + IDirectInputDevice_Release(lpdid); } HeapFree(GetProcessHeap(), 0, didevis); @@ -883,7 +885,11 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + IDirectInputDevice_Release(lpdid); return DI_OK; + } + IDirectInputDevice_Release(lpdid); } }

1 0

Rémi Bernon : dinput: Remove the need for ANSI enum_device callback.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: d666aea3607ef3398744b3daec7f266cc25a2cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d666aea3607ef3398744b3da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:56 2021 +0200 dinput: Remove the need for ANSI enum_device callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 14 +++++----- dlls/dinput/dinput_private.h | 3 +- dlls/dinput/joystick_linux.c | 58 ++------------------------------------- dlls/dinput/joystick_linuxinput.c | 54 ++---------------------------------- dlls/dinput/joystick_osx.c | 52 ++--------------------------------- dlls/dinput/keyboard.c | 50 ++------------------------------- dlls/dinput/mouse.c | 50 ++------------------------------- 7 files changed, 18 insertions(+), 263 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d666aea3607ef3398744…

1 0

Rémi Bernon : dinput: Factor out device creation interface queries.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 17958bc8631c574df3cf83343d3a813d2bc81128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17958bc8631c574df3cf8334… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:55 2021 +0200 dinput: Factor out device creation interface queries. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 32 +++++++++++++++----------------- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick_linux.c | 34 ++++------------------------------ dlls/dinput/joystick_linuxinput.c | 34 ++++------------------------------ dlls/dinput/joystick_osx.c | 33 ++++----------------------------- dlls/dinput/keyboard.c | 35 ++++------------------------------- dlls/dinput/mouse.c | 34 ++++------------------------------ 7 files changed, 36 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17958bc8631c574df3cf…

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 96ab7b4430011153734119b3ef969f363aef0634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ab7b4430011153734119b3… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat May 29 16:51:39 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Bob <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 633 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 330 insertions(+), 303 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96ab7b44300111537341…

1 0

Piotr Caban : msvcrt: Import tanhf implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: bb9f97c4d13151d05ebb6aa24c3e0f6b8cab7bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9f97c4d13151d05ebb6aa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:55 2021 +0200 msvcrt: Import tanhf 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 | 40 +++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6d60a6fa086..0bace98cd7d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1512,9 +1512,43 @@ float CDECL tanf( float x ) */ float CDECL tanhf( float x ) { - float ret = unix_funcs->tanhf(x); - if (!isfinite(x)) return math_error(_DOMAIN, "tanhf", x, 0, ret); - return ret; + UINT32 ui = *(UINT32*)&x; + int sign; + float t; + + /* x = |x| */ + sign = ui >> 31; + ui &= 0x7fffffff; + x = *(float*)&ui; + + if (ui > 0x3f0c9f54) { + /* |x| > log(3)/2 ~= 0.5493 or nan */ + if (ui > 0x41200000) { +#if _MSVCR_VER < 140 + if (isnan(x)) + return math_error(_DOMAIN, "tanhf", x, 0, x); +#endif + /* |x| > 10 */ + fp_barrierf(x + 0x1p120f); + t = 1 + 0 / x; + } else { + t = __expm1f(2 * x); + t = 1 - 2 / (t + 2); + } + } else if (ui > 0x3e82c578) { + /* |x| > log(5/3)/2 ~= 0.2554 */ + t = __expm1f(2 * x); + t = t / (t + 2); + } else if (ui >= 0x00800000) { + /* |x| >= 0x1p-126 */ + t = __expm1f(-2 * x); + t = -t / (t + 2); + } else { + /* |x| is subnormal */ + fp_barrierf(x * x); + t = x; + } + return sign ? -t : t; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index ce4a3eed094..d92203c1ab7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * tanhf - */ -static float CDECL unix_tanhf( float x ) -{ - return tanhf( x ); -} - /********************************************************************* * tgamma */ @@ -327,7 +319,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_tanhf, unix_tgamma, unix_tgammaf, }; diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a95aae74dea..a01ce285106 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); };

1 0

Piotr Caban : msvcrt: Import tanh implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 3171dccbef835f85852c50e3dc3f37337e76932c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3171dccbef835f85852c50e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:52 2021 +0200 msvcrt: Import tanh 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 | 44 +++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 05571a7fe20..6d60a6fa086 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2834,9 +2834,47 @@ double CDECL tan( double x ) */ double CDECL tanh( double x ) { - double ret = unix_funcs->tanh(x); - if (isnan(x)) return math_error(_DOMAIN, "tanh", x, 0, ret); - return ret; + UINT64 ui = *(UINT64*)&x; + UINT32 w; + int sign; + double t; + + /* x = |x| */ + sign = ui >> 63; + ui &= (UINT64)-1 / 2; + x = *(double*)&ui; + w = ui >> 32; + + if (w > 0x3fe193ea) { + /* |x| > log(3)/2 ~= 0.5493 or nan */ + if (w > 0x40340000) { +#if _MSVCR_VER < 140 + if (isnan(x)) + return math_error(_DOMAIN, "tanh", x, 0, x); +#endif + /* |x| > 20 or nan */ + /* note: this branch avoids raising overflow */ + fp_barrier(x + 0x1p120f); + t = 1 - 0 / x; + } else { + t = __expm1(2 * x); + t = 1 - 2 / (t + 2); + } + } else if (w > 0x3fd058ae) { + /* |x| > log(5/3)/2 ~= 0.2554 */ + t = __expm1(2 * x); + t = t / (t + 2); + } else if (w >= 0x00100000) { + /* |x| >= 0x1p-1022, up to 2ulp error in [0.1,0.2554] */ + t = __expm1(-2 * x); + t = -t / (t + 2); + } else { + /* |x| is subnormal */ + /* note: the branch above would not raise underflow in [0x1p-1023,0x1p-1022) */ + fp_barrier((float)x); + t = x; + } + return sign ? -t : t; } diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 918c7e6ed71..ce4a3eed094 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * tanh - */ -static double CDECL unix_tanh( double x ) -{ - return tanh( x ); -} - /********************************************************************* * tanhf */ @@ -335,7 +327,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_tanh, unix_tanhf, unix_tgamma, unix_tgammaf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 0e3074be0c5..a95aae74dea 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x);

1 0

Piotr Caban : msvcrt: Import sinhf implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: ae48d58362d92b378cb47e07b46ff16cb156fd68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae48d58362d92b378cb47e07… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:49 2021 +0200 msvcrt: Import sinhf 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 | 27 ++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5ecbb8bf037..05571a7fe20 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1312,9 +1312,30 @@ float CDECL sinf( float x ) */ float CDECL sinhf( float x ) { - float ret = unix_funcs->sinhf( x ); - if (isnan(x)) return math_error(_DOMAIN, "sinhf", x, 0, ret); - return ret; + UINT32 ui = *(UINT32*)&x; + float t, h, absx; + + h = 0.5; + if (ui >> 31) + h = -h; + /* |x| */ + ui &= 0x7fffffff; + absx = *(float*)&ui; + + /* |x| < log(FLT_MAX) */ + if (ui < 0x42b17217) { + t = __expm1f(absx); + if (ui < 0x3f800000) { + if (ui < 0x3f800000 - (12 << 23)) + return x; + return h * (2 * t - t * t / (t + 1)); + } + return h * (t + t / (t + 1)); + } + + /* |x| > logf(FLT_MAX) or nan */ + t = __expo2f(absx, 2 * h); + return t; } static BOOL sqrtf_validate( float *x ) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 2f447533fb6..918c7e6ed71 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * sinhf - */ -static float CDECL unix_sinhf( float x ) -{ - return sinhf( x ); -} - /********************************************************************* * tanh */ @@ -343,7 +335,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_sinhf, unix_tanh, unix_tanhf, unix_tgamma, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 80a150b9031..0e3074be0c5 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *sinhf)(float x); double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x);

1 0

Piotr Caban : msvcrt: Import sinh implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 739d4f0c943732b88ee135884a51ccd272c46047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=739d4f0c943732b88ee13588… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:46 2021 +0200 msvcrt: Import sinh 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 | 30 +++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9aadc6dea1e..5ecbb8bf037 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2527,9 +2527,33 @@ double CDECL sin( double x ) */ double CDECL sinh( double x ) { - double ret = unix_funcs->sinh( x ); - if (isnan(x)) return math_error(_DOMAIN, "sinh", x, 0, ret); - return ret; + UINT64 ux = *(UINT64*)&x; + UINT32 w; + double t, h, absx; + + h = 0.5; + if (ux >> 63) + h = -h; + /* |x| */ + ux &= (UINT64)-1 / 2; + absx = *(double*)&ux; + w = ux >> 32; + + /* |x| < log(DBL_MAX) */ + if (w < 0x40862e42) { + t = __expm1(absx); + if (w < 0x3ff00000) { + if (w < 0x3ff00000 - (26 << 20)) + return x; + return h * (2 * t - t * t / (t + 1)); + } + return h * (t + t / (t + 1)); + } + + /* |x| > log(DBL_MAX) or nan */ + /* note: the result is stored to handle overflow */ + t = __expo2(absx, 2 * h); + return t; } static BOOL sqrt_validate( double *x, BOOL update_sw ) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index e5e4233d12f..2f447533fb6 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * sinh - */ -static double CDECL unix_sinh( double x ) -{ - return sinh( x ); -} - /********************************************************************* * sinhf */ @@ -351,7 +343,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_sinh, unix_sinhf, unix_tanh, unix_tanhf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 4c30fc220fe..80a150b9031 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - double (CDECL *sinh)(double x); float (CDECL *sinhf)(float x); double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x);

1 0

Piotr Caban : msvcrt: Import coshf implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: c395ec77d7b1b601def6324778535fea0fabd525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c395ec77d7b1b601def63247… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:43 2021 +0200 msvcrt: Import coshf 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 | 216 ++++++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 --- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 129 insertions(+), 97 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 760f3834761..9aadc6dea1e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -549,6 +549,95 @@ recompute: return n & 7; } +#if !defined(__i386__) || _MSVCR_VER >= 120 +/* Copied from musl: src/math/expm1f.c */ +static float __expm1f(float x) +{ + static const float ln2_hi = 6.9313812256e-01, + ln2_lo = 9.0580006145e-06, + invln2 = 1.4426950216e+00, + Q1 = -3.3333212137e-2, + Q2 = 1.5807170421e-3; + + float y, hi, lo, c, t, e, hxs, hfx, r1, twopk; + union {float f; UINT32 i;} u = {x}; + UINT32 hx = u.i & 0x7fffffff; + int k, sign = u.i >> 31; + + /* filter out huge and non-finite argument */ + if (hx >= 0x4195b844) { /* if |x|>=27*ln2 */ + if (hx >= 0x7f800000) /* NaN */ + return u.i == 0xff800000 ? -1 : x; + if (sign) + return math_error(_UNDERFLOW, "exp", x, 0, -1); + if (hx > 0x42b17217) /* x > log(FLT_MAX) */ + return math_error(_OVERFLOW, "exp", x, 0, fp_barrierf(x * FLT_MAX)); + } + + /* argument reduction */ + if (hx > 0x3eb17218) { /* if |x| > 0.5 ln2 */ + if (hx < 0x3F851592) { /* and |x| < 1.5 ln2 */ + if (!sign) { + hi = x - ln2_hi; + lo = ln2_lo; + k = 1; + } else { + hi = x + ln2_hi; + lo = -ln2_lo; + k = -1; + } + } else { + k = invln2 * x + (sign ? -0.5f : 0.5f); + t = k; + hi = x - t * ln2_hi; /* t*ln2_hi is exact here */ + lo = t * ln2_lo; + } + x = hi - lo; + c = (hi - x) - lo; + } else if (hx < 0x33000000) { /* when |x|<2**-25, return x */ + if (hx < 0x00800000) + fp_barrierf(x * x); + return x; + } else + k = 0; + + /* x is now in primary range */ + hfx = 0.5f * x; + hxs = x * hfx; + r1 = 1.0f + hxs * (Q1 + hxs * Q2); + t = 3.0f - r1 * hfx; + e = hxs * ((r1 - t) / (6.0f - x * t)); + if (k == 0) /* c is 0 */ + return x - (x * e - hxs); + e = x * (e - c) - c; + e -= hxs; + /* exp(x) ~ 2^k (x_reduced - e + 1) */ + if (k == -1) + return 0.5f * (x - e) - 0.5f; + if (k == 1) { + if (x < -0.25f) + return -2.0f * (e - (x + 0.5f)); + return 1.0f + 2.0f * (x - e); + } + u.i = (0x7f + k) << 23; /* 2^k */ + twopk = u.f; + if (k < 0 || k > 56) { /* suffice to return exp(x)-1 */ + y = x - e + 1.0f; + if (k == 128) + y = y * 2.0f * 0x1p127f; + else + y = y * twopk; + return y - 1.0f; + } + u.i = (0x7f-k) << 23; /* 2^-k */ + if (k < 23) + y = (x - e + (1 - u.f)) * twopk; + else + y = (x - (e + u.f) + 1) * twopk; + return y; +} +#endif + #ifndef __i386__ /********************************************************************* @@ -994,14 +1083,50 @@ float CDECL cosf( float x ) } } +/* Copied from musl: src/math/__expo2f.c */ +static float __expo2f(float x, float sign) +{ + static const int k = 235; + static const float kln2 = 0x1.45c778p+7f; + float scale; + + *(UINT32*)&scale = (UINT32)(0x7f + k/2) << 23; + return expf(x - kln2) * (sign * scale) * scale; +} + /********************************************************************* * coshf (MSVCRT.@) + * + * Copied from musl: src/math/coshf.c */ float CDECL coshf( float x ) { - float ret = unix_funcs->coshf( x ); - if (isnan(x)) return math_error(_DOMAIN, "coshf", x, 0, ret); - return ret; + UINT32 ui = *(UINT32*)&x; + float t; + + /* |x| */ + ui &= 0x7fffffff; + x = *(float*)&ui; + + /* |x| < log(2) */ + if (ui < 0x3f317217) { + if (ui < 0x3f800000 - (12 << 23)) { + fp_barrierf(x + 0x1p120f); + return 1; + } + t = __expm1f(x); + return 1 + t * t / (2 * (1 + t)); + } + + /* |x| < log(FLT_MAX) */ + if (ui < 0x42b17217) { + t = expf(x); + return 0.5f * (t + 1 / t); + } + + /* |x| > log(FLT_MAX) or nan */ + t = __expo2f(x, 1.0f); + return t; } /********************************************************************* @@ -5899,93 +6024,10 @@ double CDECL expm1(double x) /********************************************************************* * expm1f (MSVCR120.@) - * - * Copied from musl: src/math/expm1f.c */ float CDECL expm1f(float x) { - static const float ln2_hi = 6.9313812256e-01, - ln2_lo = 9.0580006145e-06, - invln2 = 1.4426950216e+00, - Q1 = -3.3333212137e-2, - Q2 = 1.5807170421e-3; - - float y, hi, lo, c, t, e, hxs, hfx, r1, twopk; - union {float f; UINT32 i;} u = {x}; - UINT32 hx = u.i & 0x7fffffff; - int k, sign = u.i >> 31; - - /* filter out huge and non-finite argument */ - if (hx >= 0x4195b844) { /* if |x|>=27*ln2 */ - if (hx >= 0x7f800000) /* NaN */ - return u.i == 0xff800000 ? -1 : x; - if (sign) - return math_error(_UNDERFLOW, "exp", x, 0, -1); - if (hx > 0x42b17217) /* x > log(FLT_MAX) */ - return math_error(_OVERFLOW, "exp", x, 0, fp_barrierf(x * FLT_MAX)); - } - - /* argument reduction */ - if (hx > 0x3eb17218) { /* if |x| > 0.5 ln2 */ - if (hx < 0x3F851592) { /* and |x| < 1.5 ln2 */ - if (!sign) { - hi = x - ln2_hi; - lo = ln2_lo; - k = 1; - } else { - hi = x + ln2_hi; - lo = -ln2_lo; - k = -1; - } - } else { - k = invln2 * x + (sign ? -0.5f : 0.5f); - t = k; - hi = x - t * ln2_hi; /* t*ln2_hi is exact here */ - lo = t * ln2_lo; - } - x = hi - lo; - c = (hi - x) - lo; - } else if (hx < 0x33000000) { /* when |x|<2**-25, return x */ - if (hx < 0x00800000) - fp_barrierf(x * x); - return x; - } else - k = 0; - - /* x is now in primary range */ - hfx = 0.5f * x; - hxs = x * hfx; - r1 = 1.0f + hxs * (Q1 + hxs * Q2); - t = 3.0f - r1 * hfx; - e = hxs * ((r1 - t) / (6.0f - x * t)); - if (k == 0) /* c is 0 */ - return x - (x * e - hxs); - e = x * (e - c) - c; - e -= hxs; - /* exp(x) ~ 2^k (x_reduced - e + 1) */ - if (k == -1) - return 0.5f * (x - e) - 0.5f; - if (k == 1) { - if (x < -0.25f) - return -2.0f * (e - (x + 0.5f)); - return 1.0f + 2.0f * (x - e); - } - u.i = (0x7f + k) << 23; /* 2^k */ - twopk = u.f; - if (k < 0 || k > 56) { /* suffice to return exp(x)-1 */ - y = x - e + 1.0f; - if (k == 128) - y = y * 2.0f * 0x1p127f; - else - y = y * twopk; - return y - 1.0f; - } - u.i = (0x7f-k) << 23; /* 2^-k */ - if (k < 23) - y = (x - e + (1 - u.f)) * twopk; - else - y = (x - (e + u.f) + 1) * twopk; - return y; + return __expm1f(x); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 6af252e5e9b..e5e4233d12f 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/********************************************************************* - * coshf - */ -static float CDECL unix_coshf( float x ) -{ - return coshf( x ); -} - /********************************************************************* * exp */ @@ -336,7 +328,6 @@ static float CDECL unix_tgammaf(float x) static const struct unix_funcs funcs = { - unix_coshf, unix_exp, unix_expf, unix_exp2, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 67dd1f98b84..4c30fc220fe 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -23,7 +23,6 @@ struct unix_funcs { - float (CDECL *coshf)(float x); double (CDECL *exp)(double x); float (CDECL *expf)(float x); double (CDECL *exp2)(double x);

1 0

← Newer
1
2
3
4
5
6
7
...
77
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 May 2021