October 2021 - Wine-commits

Rémi Bernon : dinput: Call hid_joystick_enum_device directly in JoyConfig8Impl_GetConfig.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: bbff12381ed841dc84c982d9a830801b727e8d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbff12381ed841dc84c982d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 26 09:17:31 2021 +0200 dinput: Call hid_joystick_enum_device directly in JoyConfig8Impl_GetConfig. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 41 ++++++++++------------------------------- dlls/dinput/dinput_private.h | 11 ----------- dlls/dinput/joystick_hid.c | 7 ------- dlls/dinput/keyboard.c | 6 ------ dlls/dinput/mouse.c | 6 ------ 5 files changed, 10 insertions(+), 61 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 745fdafa920..bc033a1baca 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -74,13 +74,6 @@ static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInpu return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); } -static const struct dinput_device *dinput_devices[] = -{ - &mouse_device, - &keyboard_device, - &joystick_hid_device, -}; - HINSTANCE DINPUT_instance; static HWND di_em_win; @@ -927,10 +920,11 @@ static HRESULT WINAPI JoyConfig8Impl_DeleteType(IDirectInputJoyConfig8 *iface, L static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPDIJOYCONFIG info, DWORD flags) { + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; IDirectInputImpl *di = impl_from_IDirectInputJoyConfig8(iface); + unsigned int i = 0; UINT found = 0; - int i, j; - HRESULT r; + HRESULT hr; FIXME("(%p)->(%d, %p, 0x%08x): semi-stub!\n", iface, id, info, flags); @@ -941,29 +935,14 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI X(DIJC_CALLOUT) #undef X - /* Enumerate all joysticks in order */ - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) + do { - if (!dinput_devices[i]->enum_device) continue; - - for (j = 0, r = S_OK; SUCCEEDED(r); j++) - { - DIDEVICEINSTANCEW dev; - dev.dwSize = sizeof(dev); - if ((r = dinput_devices[i]->enum_device(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j)) == S_OK) - { - /* Only take into account the chosen id */ - if (found == id) - { - if (flags & DIJC_GUIDINSTANCE) - info->guidInstance = dev.guidInstance; - - return DI_OK; - } - found += 1; - } - } - } + hr = hid_joystick_enum_device( DI8DEVCLASS_GAMECTRL, 0, &instance, di->dwVersion, i++ ); + if (hr != DI_OK) continue; + if (flags & DIJC_GUIDINSTANCE) info->guidInstance = instance.guidInstance; + /* Only take into account the chosen id */ + if (found++ == id) return DI_OK; + } while (SUCCEEDED(hr)); return DIERR_NOMOREITEMS; } diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index e9b40bb95b6..461af021a30 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -52,13 +52,6 @@ struct IDirectInputImpl extern const IDirectInput7AVtbl dinput7_a_vtbl DECLSPEC_HIDDEN; extern const IDirectInput8AVtbl dinput8_a_vtbl DECLSPEC_HIDDEN; -/* Function called by all devices that Wine supports */ -struct dinput_device { - const char *name; - HRESULT (*enum_device)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); - HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out); -}; - extern HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); extern HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); @@ -72,10 +65,6 @@ struct DevicePlayer { struct list entry; }; -extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; -extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; -extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; - extern void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface); extern void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface); extern int dinput_mouse_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3419fed7d79..4632109a35b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1867,13 +1867,6 @@ failed: return hr; } -const struct dinput_device joystick_hid_device = -{ - "Wine HID joystick driver", - hid_joystick_enum_device, - hid_joystick_create_device, -}; - static HRESULT WINAPI hid_joystick_effect_QueryInterface( IDirectInputEffect *iface, REFIID iid, void **out ) { TRACE( "iface %p, iid %s, out %p\n", iface, debugstr_guid( iid ), out ); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3b8f52b38f2..a6032cbd0a4 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -204,12 +204,6 @@ HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDir return DI_OK; } -const struct dinput_device keyboard_device = { - "Wine keyboard driver", - keyboard_enum_device, - keyboard_create_device -}; - static HRESULT keyboard_poll( IDirectInputDevice8W *iface ) { check_dinput_events(); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 325d38c90d3..84b5410bb36 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -153,12 +153,6 @@ HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirect return DI_OK; } -const struct dinput_device mouse_device = { - "Wine mouse driver", - mouse_enum_device, - mouse_create_device -}; - /****************************************************************************** * SysMouseA (DInput Mouse support) */

1 0

Alexandre Julliard : ntdll: Move math functions to a separate file.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: c7454eef0bf577545225c7c236a3f3b03daf31d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7454eef0bf577545225c7c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:25 2021 +0200 ntdll: Move math functions to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/math.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 153 ------------------------------------------ 3 files changed, 178 insertions(+), 153 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index aac7f8eead7..ba23e397545 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ large_int.c \ loader.c \ locale.c \ + math.c \ misc.c \ path.c \ printf.c \ diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c new file mode 100644 index 00000000000..8241e5077c2 --- /dev/null +++ b/dlls/ntdll/math.c @@ -0,0 +1,177 @@ +/* + * Math functions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <math.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "ntdll_misc.h" + +/********************************************************************* + * abs (NTDLL.@) + */ +int CDECL abs( int i ) +{ + return i >= 0 ? i : -i; +} + +/********************************************************************* + * atan (NTDLL.@) + */ +double CDECL atan( double d ) +{ + return unix_funcs->atan( d ); +} + +/********************************************************************* + * ceil (NTDLL.@) + */ +double CDECL ceil( double d ) +{ + return unix_funcs->ceil( d ); +} + +/********************************************************************* + * cos (NTDLL.@) + */ +double CDECL cos( double d ) +{ + return unix_funcs->cos( d ); +} + +/********************************************************************* + * fabs (NTDLL.@) + */ +double CDECL fabs( double d ) +{ + return unix_funcs->fabs( d ); +} + +/********************************************************************* + * floor (NTDLL.@) + */ +double CDECL floor( double d ) +{ + return unix_funcs->floor( d ); +} + +/********************************************************************* + * log (NTDLL.@) + */ +double CDECL log( double d ) +{ + return unix_funcs->log( d ); +} + +/********************************************************************* + * pow (NTDLL.@) + */ +double CDECL pow( double x, double y ) +{ + return unix_funcs->pow( x, y ); +} + +/********************************************************************* + * sin (NTDLL.@) + */ +double CDECL sin( double d ) +{ + return unix_funcs->sin( d ); +} + +/********************************************************************* + * sqrt (NTDLL.@) + */ +double CDECL sqrt( double d ) +{ + return unix_funcs->sqrt( d ); +} + +/********************************************************************* + * tan (NTDLL.@) + */ +double CDECL tan( double d ) +{ + return unix_funcs->tan( d ); +} + +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) + +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +/********************************************************************* + * _CIcos (NTDLL.@) + */ +double CDECL _CIcos(void) +{ + FPU_DOUBLE(x); + return cos(x); +} + +/********************************************************************* + * _CIlog (NTDLL.@) + */ +double CDECL _CIlog(void) +{ + FPU_DOUBLE(x); + return log(x); +} + +/********************************************************************* + * _CIpow (NTDLL.@) + */ +double CDECL _CIpow(void) +{ + FPU_DOUBLES(x,y); + return pow(x,y); +} + +/********************************************************************* + * _CIsin (NTDLL.@) + */ +double CDECL _CIsin(void) +{ + FPU_DOUBLE(x); + return sin(x); +} + +/********************************************************************* + * _CIsqrt (NTDLL.@) + */ +double CDECL _CIsqrt(void) +{ + FPU_DOUBLE(x); + return sqrt(x); +} + +/********************************************************************* + * _ftol (NTDLL.@) + */ +LONGLONG CDECL _ftol(void) +{ + FPU_DOUBLE(x); + return (LONGLONG)x; +} + +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 092900b289b..3bef5a561c8 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -20,7 +20,6 @@ */ #include <time.h> -#include <math.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -38,158 +37,6 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR)); } -/********************************************************************* - * abs (NTDLL.@) - */ -int CDECL abs( int i ) -{ - return i >= 0 ? i : -i; -} - -/********************************************************************* - * atan (NTDLL.@) - */ -double CDECL atan( double d ) -{ - return unix_funcs->atan( d ); -} - -/********************************************************************* - * ceil (NTDLL.@) - */ -double CDECL ceil( double d ) -{ - return unix_funcs->ceil( d ); -} - -/********************************************************************* - * cos (NTDLL.@) - */ -double CDECL cos( double d ) -{ - return unix_funcs->cos( d ); -} - -/********************************************************************* - * fabs (NTDLL.@) - */ -double CDECL fabs( double d ) -{ - return unix_funcs->fabs( d ); -} - -/********************************************************************* - * floor (NTDLL.@) - */ -double CDECL floor( double d ) -{ - return unix_funcs->floor( d ); -} - -/********************************************************************* - * log (NTDLL.@) - */ -double CDECL log( double d ) -{ - return unix_funcs->log( d ); -} - -/********************************************************************* - * pow (NTDLL.@) - */ -double CDECL pow( double x, double y ) -{ - return unix_funcs->pow( x, y ); -} - -/********************************************************************* - * sin (NTDLL.@) - */ -double CDECL sin( double d ) -{ - return unix_funcs->sin( d ); -} - -/********************************************************************* - * sqrt (NTDLL.@) - */ -double CDECL sqrt( double d ) -{ - return unix_funcs->sqrt( d ); -} - -/********************************************************************* - * tan (NTDLL.@) - */ -double CDECL tan( double d ) -{ - return unix_funcs->tan( d ); -} - -#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) - -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/********************************************************************* - * _CIcos (NTDLL.@) - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} - -/********************************************************************* - * _CIlog (NTDLL.@) - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} - -/********************************************************************* - * _CIpow (NTDLL.@) - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x,y); - return pow(x,y); -} - -/********************************************************************* - * _CIsin (NTDLL.@) - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} - -/********************************************************************* - * _CIsqrt (NTDLL.@) - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); -} - -/********************************************************************* - * _ftol (NTDLL.@) - */ -LONGLONG CDECL _ftol(void) -{ - FPU_DOUBLE(x); - return (LONGLONG)x; -} - -#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ - static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), size_t left, size_t right )

1 0

Alexandre Julliard : ntdll: Copy atan() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: bb9e068babb9049a09c205ca4bf07fa2744cd26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9e068babb9049a09c205ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:30 2021 +0200 ntdll: Copy atan() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 8241e5077c2..25477b44d4a 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -16,6 +16,23 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * + * For functions copied from musl libc (http://musl.libc.org/) + * ==================================================== + * Copyright 2005-2020 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * ==================================================== */ #include <math.h> @@ -24,6 +41,15 @@ #define WIN32_NO_STATUS #include "ntdll_misc.h" +/* Copied from musl: src/internal/libm.h */ +static inline float fp_barrierf(float x) +{ + volatile float y = x; + return y; +} + + + /********************************************************************* * abs (NTDLL.@) */ @@ -34,10 +60,88 @@ int CDECL abs( int i ) /********************************************************************* * atan (NTDLL.@) + * + * Copied from musl: src/math/atan.c */ -double CDECL atan( double d ) +double CDECL atan( double x ) { - return unix_funcs->atan( d ); + static const double atanhi[] = { + 4.63647609000806093515e-01, + 7.85398163397448278999e-01, + 9.82793723247329054082e-01, + 1.57079632679489655800e+00, + }; + static const double atanlo[] = { + 2.26987774529616870924e-17, + 3.06161699786838301793e-17, + 1.39033110312309984516e-17, + 6.12323399573676603587e-17, + }; + static const double aT[] = { + 3.33333333333329318027e-01, + -1.99999999998764832476e-01, + 1.42857142725034663711e-01, + -1.11111104054623557880e-01, + 9.09088713343650656196e-02, + -7.69187620504482999495e-02, + 6.66107313738753120669e-02, + -5.83357013379057348645e-02, + 4.97687799461593236017e-02, + -3.65315727442169155270e-02, + 1.62858201153657823623e-02, + }; + + double w, s1, s2, z; + unsigned int ix, sign; + int id; + + ix = *(ULONGLONG*)&x >> 32; + sign = ix >> 31; + ix &= 0x7fffffff; + if (ix >= 0x44100000) { /* if |x| >= 2^66 */ + if (isnan(x)) + return x; + z = atanhi[3] + 7.5231638452626401e-37; + return sign ? -z : z; + } + if (ix < 0x3fdc0000) { /* |x| < 0.4375 */ + if (ix < 0x3e400000) { /* |x| < 2^-27 */ + if (ix < 0x00100000) + /* raise underflow for subnormal x */ + fp_barrierf((float)x); + return x; + } + id = -1; + } else { + x = fabs(x); + if (ix < 0x3ff30000) { /* |x| < 1.1875 */ + if (ix < 0x3fe60000) { /* 7/16 <= |x| < 11/16 */ + id = 0; + x = (2.0 * x - 1.0) / (2.0 + x); + } else { /* 11/16 <= |x| < 19/16 */ + id = 1; + x = (x - 1.0) / (x + 1.0); + } + } else { + if (ix < 0x40038000) { /* |x| < 2.4375 */ + id = 2; + x = (x - 1.5) / (1.0 + 1.5 * x); + } else { /* 2.4375 <= |x| < 2^66 */ + id = 3; + x = -1.0 / x; + } + } + } + /* end of argument reduction */ + z = x * x; + w = z * z; + /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ + s1 = z * (aT[0] + w * (aT[2] + w * (aT[4] + w * (aT[6] + w * (aT[8] + w * aT[10]))))); + s2 = w * (aT[1] + w * (aT[3] + w * (aT[5] + w * (aT[7] + w * aT[9])))); + if (id < 0) + return x - x * (s1 + s2); + z = atanhi[id] - (x * (s1 + s2) - atanlo[id] - x); + return sign ? -z : z; } /*********************************************************************

1 0

Alexandre Julliard : ntdll: Copy ceil() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: fca34420f6348a0344a3eff4f1d882d2b67873f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fca34420f6348a0344a3eff4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:39 2021 +0200 ntdll: Copy ceil() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 25477b44d4a..e7f5987a5af 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -146,10 +146,31 @@ double CDECL atan( double x ) /********************************************************************* * ceil (NTDLL.@) + * + * Based on musl: src/math/ceilf.c */ -double CDECL ceil( double d ) +double CDECL ceil( double x ) { - return unix_funcs->ceil( d ); + union {double f; UINT64 i;} u = {x}; + int e = (u.i >> 52 & 0x7ff) - 0x3ff; + UINT64 m; + + if (e >= 52) + return x; + if (e >= 0) { + m = 0x000fffffffffffffULL >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 63 == 0) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 63) + return -0.0; + else if (u.i << 1) + return 1.0; + } + return u.f; } /*********************************************************************

1 0

Alexandre Julliard : ntdll: Copy floor() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: f0d3a7d33be980b06abc2298fea90c4d2110643a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d3a7d33be980b06abc2298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:43 2021 +0200 ntdll: Copy floor() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index e7f5987a5af..a7d20acdf59 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -191,10 +191,31 @@ double CDECL fabs( double d ) /********************************************************************* * floor (NTDLL.@) + * + * Based on musl: src/math/floorf.c */ -double CDECL floor( double d ) +double CDECL floor( double x ) { - return unix_funcs->floor( d ); + union {double f; UINT64 i;} u = {x}; + int e = (int)(u.i >> 52 & 0x7ff) - 0x3ff; + UINT64 m; + + if (e >= 52) + return x; + if (e >= 0) { + m = 0x000fffffffffffffULL >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 63) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 63 == 0) + return 0; + else if (u.i << 1) + return -1; + } + return u.f; } /*********************************************************************

1 0

Alexandre Julliard : ntdll: Copy fabs() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: 9eb3adbc851733352aa4b7edb401f012290e61b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eb3adbc851733352aa4b7ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:47 2021 +0200 ntdll: Copy fabs() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index a7d20acdf59..7202897ce1b 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -183,10 +183,14 @@ double CDECL cos( double d ) /********************************************************************* * fabs (NTDLL.@) + * + * Copied from musl: src/math/fabsf.c */ -double CDECL fabs( double d ) +double CDECL fabs( double x ) { - return unix_funcs->fabs( d ); + union { double f; UINT64 i; } u = { x }; + u.i &= ~0ull >> 1; + return u.f; } /*********************************************************************

1 0

Alexandre Julliard : ntdll: Copy sin() and cos() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: e4737d285b83ad38914d635d665f4037640ddba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4737d285b83ad38914d635d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:51 2021 +0200 ntdll: Copy sin() and cos() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 530 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 526 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4737d285b83ad38914d…

1 0

Alexandre Julliard : ntdll: Copy tan() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: 90bd0487862c5c6fae85cb8a7d84b53b59db0098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bd0487862c5c6fae85cb8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:55 2021 +0200 ntdll: Copy tan() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 55d82cc3f8e..58965c7b169 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -507,6 +507,65 @@ static double __cos(double x, double y) return w + (((1.0 - w) - hz) + (z * r - x * y)); } +/* Copied from musl: src/math/__tan.c */ +static double __tan(double x, double y, int odd) +{ + static const double T[] = { + 3.33333333333334091986e-01, + 1.33333333333201242699e-01, + 5.39682539762260521377e-02, + 2.18694882948595424599e-02, + 8.86323982359930005737e-03, + 3.59207910759131235356e-03, + 1.45620945432529025516e-03, + 5.88041240820264096874e-04, + 2.46463134818469906812e-04, + 7.81794442939557092300e-05, + 7.14072491382608190305e-05, + -1.85586374855275456654e-05, + 2.59073051863633712884e-05, + }; + static const double pio4 = 7.85398163397448278999e-01; + static const double pio4lo = 3.06161699786838301793e-17; + + double z, r, v, w, s, a, w0, a0; + UINT32 hx; + int big, sign; + + hx = *(ULONGLONG*)&x >> 32; + big = (hx & 0x7fffffff) >= 0x3FE59428; /* |x| >= 0.6744 */ + if (big) { + sign = hx >> 31; + if (sign) { + x = -x; + y = -y; + } + x = (pio4 - x) + (pio4lo - y); + y = 0.0; + } + z = x * x; + w = z * z; + r = T[1] + w * (T[3] + w * (T[5] + w * (T[7] + w * (T[9] + w * T[11])))); + v = z * (T[2] + w * (T[4] + w * (T[6] + w * (T[8] + w * (T[10] + w * T[12]))))); + s = z * x; + r = y + z * (s * (r + v) + y) + s * T[0]; + w = x + r; + if (big) { + s = 1 - 2 * odd; + v = s - 2.0 * (x + (r - w * w / (w + s))); + return sign ? -v : v; + } + if (!odd) + return w; + /* -1.0/(x+r) has up to 2ulp error, so compute it accurately */ + w0 = w; + *(LONGLONG*)&w0 = *(LONGLONG*)&w0 & 0xffffffff00000000ULL; + v = r - (w0 - x); /* w0+v = r+x */ + a0 = a = -1.0 / w; + *(LONGLONG*)&a0 = *(LONGLONG*)&a0 & 0xffffffff00000000ULL; + return a0 + a * (1.0 + a0 * w0 + a0 * v); +} + /********************************************************************* * abs (NTDLL.@) @@ -778,10 +837,33 @@ double CDECL sqrt( double d ) /********************************************************************* * tan (NTDLL.@) + * + * Copied from musl: src/math/tan.c */ -double CDECL tan( double d ) +double CDECL tan( double x ) { - return unix_funcs->tan( d ); + double y[2]; + UINT32 ix; + unsigned n; + + ix = *(ULONGLONG*)&x >> 32; + ix &= 0x7fffffff; + + if (ix <= 0x3fe921fb) { /* |x| ~< pi/4 */ + if (ix < 0x3e400000) { /* |x| < 2**-27 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrier(ix < 0x00100000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __tan(x, 0.0, 0); + } + + if (isinf(x)) return x - x; + if (ix >= 0x7ff00000) + return x - x; + + n = __rem_pio2(x, y); + return __tan(y[0], y[1], n & 1); } #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)

1 0

Alexandre Julliard : ntdll: Copy log() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: 0c0915e98584d93b22d9d02d3752136a65b6fa9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0915e98584d93b22d9d02d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:58 2021 +0200 ntdll: Copy log() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 367 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c0915e98584d93b22d9…

1 0

Alexandre Julliard : ntdll: Copy pow() implementation from msvcrt.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: 140cd3553c136864ea722a15834b37d348945e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=140cd3553c136864ea722a15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:34:02 2021 +0200 ntdll: Copy pow() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 563 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=140cd3553c136864ea72…

1 0