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

Rémi Bernon : mmdevapi: Load devices on driver initialization.
by Alexandre Julliard 04 Jun '21

04 Jun '21

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

1 0

Rémi Bernon : mmdevapi: Use a struct list to keep device list.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: ff57031d16c274b31eb15989ac0c0aaddf9d1107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff57031d16c274b31eb15989… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 3 18:15:31 2021 +0200 mmdevapi: Use a struct list to keep device list. It's not guarded but devices are only created on driver initialization and destroyed on DLL detach. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 48 ++++++++++++++++-------------------------------- dlls/mmdevapi/mmdevapi.h | 4 ++++ 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index a0b36671595..b17572425f3 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -59,9 +59,7 @@ typedef struct MMDevEnumImpl LONG ref; } MMDevEnumImpl; -static MMDevice **MMDevice_head; static MMDevice *MMDevice_def_rec, *MMDevice_def_play; -static DWORD MMDevice_count; static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl; static const IMMDeviceCollectionVtbl MMDevColVtbl; static const IMMDeviceVtbl MMDeviceVtbl; @@ -69,6 +67,7 @@ static const IPropertyStoreVtbl MMDevPropVtbl; static const IMMEndpointVtbl MMEndpointVtbl; static MMDevEnumImpl enumerator; +static struct list device_list = LIST_INIT(device_list); static IMMDevice info_device; typedef struct MMDevColImpl @@ -263,9 +262,8 @@ static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPE static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) { HKEY key, root; - MMDevice *cur = NULL; + MMDevice *device, *cur = NULL; WCHAR guidstr[39]; - DWORD i; static const PROPERTYKEY deviceinterface_key = { {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 @@ -275,9 +273,8 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 }; - for (i = 0; i < MMDevice_count; ++i) + LIST_FOR_EACH_ENTRY(device, &device_list, MMDevice, entry) { - MMDevice *device = MMDevice_head[i]; if (device->flow == flow && IsEqualGUID(&device->devguid, id)){ cur = device; break; @@ -296,11 +293,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st InitializeCriticalSection(&cur->crst); cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst"); - if (!MMDevice_head) - MMDevice_head = HeapAlloc(GetProcessHeap(), 0, sizeof(*MMDevice_head)); - else - MMDevice_head = HeapReAlloc(GetProcessHeap(), 0, MMDevice_head, sizeof(*MMDevice_head)*(1+MMDevice_count)); - MMDevice_head[MMDevice_count++] = cur; + list_add_tail(&device_list, &cur->entry); }else if(cur->ref > 0) WARN("Modifying an MMDevice with postitive reference count!\n"); @@ -495,17 +488,8 @@ HRESULT load_driver_devices(EDataFlow flow) static void MMDevice_Destroy(MMDevice *This) { - DWORD i; TRACE("Freeing %s\n", debugstr_w(This->drv_id)); - /* Since this function is called at destruction time, reordering of the list is unimportant */ - for (i = 0; i < MMDevice_count; ++i) - { - if (MMDevice_head[i] == This) - { - MMDevice_head[i] = MMDevice_head[--MMDevice_count]; - break; - } - } + list_remove(&This->entry); This->crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->crst); HeapFree(GetProcessHeap(), 0, This->drv_id); @@ -806,16 +790,15 @@ static ULONG WINAPI MMDevCol_Release(IMMDeviceCollection *iface) static HRESULT WINAPI MMDevCol_GetCount(IMMDeviceCollection *iface, UINT *numdevs) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); - DWORD i; + MMDevice *cur; TRACE("(%p)->(%p)\n", This, numdevs); if (!numdevs) return E_POINTER; *numdevs = 0; - for (i = 0; i < MMDevice_count; ++i) + LIST_FOR_EACH_ENTRY(cur, &device_list, MMDevice, entry) { - MMDevice *cur = MMDevice_head[i]; if ((cur->flow == This->flow || This->flow == eAll) && (cur->state & This->state)) ++(*numdevs); @@ -826,15 +809,15 @@ static HRESULT WINAPI MMDevCol_GetCount(IMMDeviceCollection *iface, UINT *numdev static HRESULT WINAPI MMDevCol_Item(IMMDeviceCollection *iface, UINT n, IMMDevice **dev) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); - DWORD i = 0, j = 0; + MMDevice *cur; + DWORD i = 0; TRACE("(%p)->(%u, %p)\n", This, n, dev); if (!dev) return E_POINTER; - for (j = 0; j < MMDevice_count; ++j) + LIST_FOR_EACH_ENTRY(cur, &device_list, MMDevice, entry) { - MMDevice *cur = MMDevice_head[j]; if ((cur->flow == This->flow || This->flow == eAll) && (cur->state & This->state) && i++ == n) @@ -865,8 +848,9 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) void MMDevEnum_Free(void) { - while (MMDevice_count) - MMDevice_Destroy(MMDevice_head[0]); + MMDevice *device, *next; + LIST_FOR_EACH_ENTRY_SAFE(device, next, &device_list, MMDevice, entry) + MMDevice_Destroy(device); RegCloseKey(key_render); RegCloseKey(key_capture); key_render = key_capture = NULL; @@ -1006,7 +990,7 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHAR *name, IMMDevice **device) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - DWORD i=0; + MMDevice *impl; IMMDevice *dev = NULL; TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); @@ -1019,11 +1003,11 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA return S_OK; } - for (i = 0; i < MMDevice_count; ++i) + LIST_FOR_EACH_ENTRY(impl, &device_list, MMDevice, entry) { HRESULT hr; WCHAR *str; - dev = &MMDevice_head[i]->IMMDevice_iface; + dev = &impl->IMMDevice_iface; hr = IMMDevice_GetId(dev, &str); if (FAILED(hr)) { diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 73c9b0e9592..db91e333cc8 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/list.h> + extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; @@ -67,6 +69,8 @@ typedef struct MMDevice { DWORD state; GUID devguid; WCHAR *drv_id; + + struct list entry; } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Import log implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

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

1 0

Piotr Caban : msvcrt: Import logf implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 51a253d25a65be68f25d20844548d8272ee0a5c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a253d25a65be68f25d2084… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:23 2021 +0200 msvcrt: Import logf 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 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 74 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 02db8b3eeb5..6e6d80f50a0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1211,13 +1211,83 @@ float CDECL fmodf( float x, float y ) /********************************************************************* * logf (MSVCRT.@) + * + * Copied from musl: src/math/logf.c src/math/logf_data.c */ float CDECL logf( float x ) { - float ret = unix_funcs->logf( x ); - if (x < 0.0) return math_error(_DOMAIN, "logf", x, 0, ret); - if (x == 0.0) return math_error(_SING, "logf", x, 0, ret); - return ret; + static const double Ln2 = 0x1.62e42fefa39efp-1; + static const double A[] = { + -0x1.00ea348b88334p-2, + 0x1.5575b0be00b6ap-2, + -0x1.ffffef20a4123p-2 + }; + static const struct { + double invc, logc; + } T[] = { + { 0x1.661ec79f8f3bep+0, -0x1.57bf7808caadep-2 }, + { 0x1.571ed4aaf883dp+0, -0x1.2bef0a7c06ddbp-2 }, + { 0x1.49539f0f010bp+0, -0x1.01eae7f513a67p-2 }, + { 0x1.3c995b0b80385p+0, -0x1.b31d8a68224e9p-3 }, + { 0x1.30d190c8864a5p+0, -0x1.6574f0ac07758p-3 }, + { 0x1.25e227b0b8eap+0, -0x1.1aa2bc79c81p-3 }, + { 0x1.1bb4a4a1a343fp+0, -0x1.a4e76ce8c0e5ep-4 }, + { 0x1.12358f08ae5bap+0, -0x1.1973c5a611cccp-4 }, + { 0x1.0953f419900a7p+0, -0x1.252f438e10c1ep-5 }, + { 0x1p+0, 0x0p+0 }, + { 0x1.e608cfd9a47acp-1, 0x1.aa5aa5df25984p-5 }, + { 0x1.ca4b31f026aap-1, 0x1.c5e53aa362eb4p-4 }, + { 0x1.b2036576afce6p-1, 0x1.526e57720db08p-3 }, + { 0x1.9c2d163a1aa2dp-1, 0x1.bc2860d22477p-3 }, + { 0x1.886e6037841edp-1, 0x1.1058bc8a07ee1p-2 }, + { 0x1.767dcf5534862p-1, 0x1.4043057b6ee09p-2 } + }; + + double z, r, r2, y, y0, invc, logc; + UINT32 ix, iz, tmp; + int k, i; + + ix = *(UINT32*)&x; + /* Fix sign of zero with downward rounding when x==1. */ + if (ix == 0x3f800000) + return 0; + if (ix - 0x00800000 >= 0x7f800000 - 0x00800000) { + /* x < 0x1p-126 or inf or nan. */ + if (ix * 2 == 0) + return math_error(_SING, "logf", x, 0, -1.0 / x); + if (ix == 0x7f800000) /* log(inf) == inf. */ + return x; + if (ix * 2 > 0xff000000) + return x; + if (ix & 0x80000000) + return math_error(_DOMAIN, "logf", x, 0, (x - x) / (x - x)); + /* x is subnormal, normalize it. */ + x *= 0x1p23f; + ix = *(UINT32*)&x; + ix -= 23 << 23; + } + + /* x = 2^k z; where z is in range [OFF,2*OFF] and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - 0x3f330000; + i = (tmp >> (23 - 4)) % (1 << 4); + k = (INT32)tmp >> 23; /* arithmetic shift */ + iz = ix - (tmp & 0xff << 23); + invc = T[i].invc; + logc = T[i].logc; + z = *(float*)&iz; + + /* log(x) = log1p(z/c-1) + log(c) + k*Ln2 */ + r = z * invc - 1; + y0 = logc + (double)k * Ln2; + + /* Pipelined polynomial evaluation to approximate log1p(r). */ + r2 = r * r; + y = A[1] * r + A[2]; + y = A[0] * r2 + y; + y = y * r2 + (y0 + r); + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 8589601ef6a..c880bcda8e2 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -120,14 +120,6 @@ static float CDECL unix_lgammaf(float x) #endif } -/********************************************************************* - * logf - */ -static float CDECL unix_logf( float x ) -{ - return logf( x ); -} - /********************************************************************* * log10 */ @@ -243,7 +235,6 @@ static const struct unix_funcs funcs = unix_fmaf, unix_lgamma, unix_lgammaf, - unix_logf, unix_log10, unix_log10f, unix_log1p, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index db840b9d177..bbec27c1061 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -30,7 +30,6 @@ struct unix_funcs float (CDECL *fmaf)(float x, float y, float z); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); - float (CDECL *logf)(float x); double (CDECL *log10)(double x); float (CDECL *log10f)(float x); double (CDECL *log1p)(double x);

1 0

Piotr Caban : msvcrt: Import log1p implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 2e6fa0a49804da29e683c72826960a95651ef41e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6fa0a49804da29e683c728… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:26 2021 +0200 msvcrt: Import log1p implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 13 ---------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 67 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 512ced158fa..e91b319c705 100755 --- a/configure +++ b/configure @@ -19622,7 +19622,6 @@ for ac_func in \ fmaf \ lgamma \ lgammaf \ - log1p \ log1pf \ log2 \ log2f \ diff --git a/configure.ac b/configure.ac index 23075b36a42..accdbaf6216 100644 --- a/configure.ac +++ b/configure.ac @@ -2661,7 +2661,6 @@ AC_CHECK_FUNCS(\ fmaf \ lgamma \ lgammaf \ - log1p \ log1pf \ log2 \ log2f \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6e6d80f50a0..fbc97aedce4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6898,12 +6898,76 @@ float CDECL expm1f(float x) /********************************************************************* * log1p (MSVCR120.@) + * + * Copied from musl: src/math/log1p.c */ double CDECL log1p(double x) { - if (x < -1) *_errno() = EDOM; - else if (x == -1) *_errno() = ERANGE; - return unix_funcs->log1p( x ); + static const double ln2_hi = 6.93147180369123816490e-01, + ln2_lo = 1.90821492927058770002e-10, + Lg1 = 6.666666666666735130e-01, + Lg2 = 3.999999999940941908e-01, + Lg3 = 2.857142874366239149e-01, + Lg4 = 2.222219843214978396e-01, + Lg5 = 1.818357216161805012e-01, + Lg6 = 1.531383769920937332e-01, + Lg7 = 1.479819860511658591e-01; + + union {double f; UINT64 i;} u = {x}; + double hfsq, f, c, s, z, R, w, t1, t2, dk; + UINT32 hx, hu; + int k; + + hx = u.i >> 32; + k = 1; + if (hx < 0x3fda827a || hx >> 31) { /* 1+x < sqrt(2)+ */ + if (hx >= 0xbff00000) { /* x <= -1.0 */ + if (x == -1) { + *_errno() = ERANGE; + return x / 0.0; /* og1p(-1) = -inf */ + } + *_errno() = EDOM; + return (x-x) / 0.0; /* log1p(x<-1) = NaN */ + } + if (hx << 1 < 0x3ca00000 << 1) { /* |x| < 2**-53 */ + fp_barrier(x + 0x1p120f); + /* underflow if subnormal */ + if ((hx & 0x7ff00000) == 0) + fp_barrierf(x); + return x; + } + if (hx <= 0xbfd2bec4) { /* sqrt(2)/2- <= 1+x < sqrt(2)+ */ + k = 0; + c = 0; + f = x; + } + } else if (hx >= 0x7ff00000) + return x; + if (k) { + u.f = 1 + x; + hu = u.i >> 32; + hu += 0x3ff00000 - 0x3fe6a09e; + k = (int)(hu >> 20) - 0x3ff; + /* correction term ~ log(1+x)-log(u), avoid underflow in c/u */ + if (k < 54) { + c = k >= 2 ? 1 - (u.f - x) : x - (u.f - 1); + c /= u.f; + } else + c = 0; + /* reduce u into [sqrt(2)/2, sqrt(2)] */ + hu = (hu & 0x000fffff) + 0x3fe6a09e; + u.i = (UINT64)hu << 32 | (u.i & 0xffffffff); + f = u.f - 1; + } + hfsq = 0.5 * f * f; + s = f / (2.0 + f); + z = s * s; + w = z * z; + t1 = w * (Lg2 + w * (Lg4 + w * Lg6)); + t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7))); + R = t2 + t1; + dk = k; + return s * (hfsq + R) + (dk * ln2_lo + c) - hfsq + f + dk * ln2_hi; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index c880bcda8e2..f98d08e4909 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -136,18 +136,6 @@ static float CDECL unix_log10f( float x ) return log10f( x ); } -/********************************************************************* - * log1p - */ -static double CDECL unix_log1p(double x) -{ -#ifdef HAVE_LOG1P - return log1p(x); -#else - return log(1 + x); -#endif -} - /********************************************************************* * log1pf */ @@ -237,7 +225,6 @@ static const struct unix_funcs funcs = unix_lgammaf, unix_log10, unix_log10f, - unix_log1p, unix_log1pf, unix_log2, unix_log2f, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index bbec27c1061..285deb22bc2 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -32,7 +32,6 @@ struct unix_funcs float (CDECL *lgammaf)(float x); double (CDECL *log10)(double x); float (CDECL *log10f)(float x); - double (CDECL *log1p)(double x); float (CDECL *log1pf)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); diff --git a/include/config.h.in b/include/config.h.in index 3d1e5e6ca5a..7e6d36112d3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -408,9 +408,6 @@ /* Define to 1 if you have the <linux/videodev2.h> header file. */ #undef HAVE_LINUX_VIDEODEV2_H -/* Define to 1 if you have the `log1p' function. */ -#undef HAVE_LOG1P - /* Define to 1 if you have the `log1pf' function. */ #undef HAVE_LOG1PF

1 0

Piotr Caban : msvcrt: Import log1pf implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: ff7faafda68f697b38270569031f71f151d2dc0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7faafda68f697b38270569… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:30 2021 +0200 msvcrt: Import log1pf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 13 ---------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 63 insertions(+), 22 deletions(-) diff --git a/configure b/configure index e91b319c705..e73670fc110 100755 --- a/configure +++ b/configure @@ -19622,7 +19622,6 @@ for ac_func in \ fmaf \ lgamma \ lgammaf \ - log1pf \ log2 \ log2f \ tgamma \ diff --git a/configure.ac b/configure.ac index accdbaf6216..b13c2ad3182 100644 --- a/configure.ac +++ b/configure.ac @@ -2661,7 +2661,6 @@ AC_CHECK_FUNCS(\ fmaf \ lgamma \ lgammaf \ - log1pf \ log2 \ log2f \ tgamma \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fbc97aedce4..5702131cec9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6972,12 +6972,72 @@ double CDECL log1p(double x) /********************************************************************* * log1pf (MSVCR120.@) + * + * Copied from musl: src/math/log1pf.c */ float CDECL log1pf(float x) { - if (x < -1) *_errno() = EDOM; - else if (x == -1) *_errno() = ERANGE; - return unix_funcs->log1pf( x ); + static const float ln2_hi = 6.9313812256e-01, + ln2_lo = 9.0580006145e-06, + Lg1 = 0xaaaaaa.0p-24, + Lg2 = 0xccce13.0p-25, + Lg3 = 0x91e9ee.0p-25, + Lg4 = 0xf89e26.0p-26; + + union {float f; UINT32 i;} u = {x}; + float hfsq, f, c, s, z, R, w, t1, t2, dk; + UINT32 ix, iu; + int k; + + ix = u.i; + k = 1; + if (ix < 0x3ed413d0 || ix >> 31) { /* 1+x < sqrt(2)+ */ + if (ix >= 0xbf800000) { /* x <= -1.0 */ + if (x == -1) { + *_errno() = ERANGE; + return x / 0.0f; /* log1p(-1)=+inf */ + } + *_errno() = EDOM; + return (x - x) / 0.0f; /* log1p(x<-1)=NaN */ + } + if (ix<<1 < 0x33800000<<1) { /* |x| < 2**-24 */ + /* underflow if subnormal */ + if ((ix & 0x7f800000) == 0) + fp_barrierf(x * x); + return x; + } + if (ix <= 0xbe95f619) { /* sqrt(2)/2- <= 1+x < sqrt(2)+ */ + k = 0; + c = 0; + f = x; + } + } else if (ix >= 0x7f800000) + return x; + if (k) { + u.f = 1 + x; + iu = u.i; + iu += 0x3f800000 - 0x3f3504f3; + k = (int)(iu >> 23) - 0x7f; + /* correction term ~ log(1+x)-log(u), avoid underflow in c/u */ + if (k < 25) { + c = k >= 2 ? 1 - (u.f - x) : x - (u.f - 1); + c /= u.f; + } else + c = 0; + /* reduce u into [sqrt(2)/2, sqrt(2)] */ + iu = (iu & 0x007fffff) + 0x3f3504f3; + u.i = iu; + f = u.f - 1; + } + s = f / (2.0f + f); + z = s * s; + w = z * z; + t1= w * (Lg2 + w * Lg4); + t2= z * (Lg1 + w * Lg3); + R = t2 + t1; + hfsq = 0.5f * f * f; + dk = k; + return s * (hfsq + R) + (dk * ln2_lo + c) - hfsq + f + dk * ln2_hi; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index f98d08e4909..3b003a846c8 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -136,18 +136,6 @@ static float CDECL unix_log10f( float x ) return log10f( x ); } -/********************************************************************* - * log1pf - */ -static float CDECL unix_log1pf(float x) -{ -#ifdef HAVE_LOG1PF - return log1pf(x); -#else - return log(1 + x); -#endif -} - /********************************************************************* * log2 */ @@ -225,7 +213,6 @@ static const struct unix_funcs funcs = unix_lgammaf, unix_log10, unix_log10f, - unix_log1pf, unix_log2, unix_log2f, unix_pow, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 285deb22bc2..7e976949e04 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -32,7 +32,6 @@ struct unix_funcs float (CDECL *lgammaf)(float x); double (CDECL *log10)(double x); float (CDECL *log10f)(float x); - float (CDECL *log1pf)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); diff --git a/include/config.h.in b/include/config.h.in index 7e6d36112d3..1b308f3d34c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -408,9 +408,6 @@ /* Define to 1 if you have the <linux/videodev2.h> header file. */ #undef HAVE_LINUX_VIDEODEV2_H -/* 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

Piotr Caban : msvcrt: Import log10 implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

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

1 0

Piotr Caban : msvcrt: Import log10f implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

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

1 0

Piotr Caban : msvcrt: Import log2f implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

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

1 0

Piotr Caban : msvcrt: Import log2 implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

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

1 0