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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 4b46c6302495ceffa783f8ebc118cc71723b3e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b46c6302495ceffa783f8eb… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jun 4 21:54:49 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 296 ++++++++++++++++----------------------------------------------- 1 file changed, 76 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b46c6302495ceffa783…

1 0

Alexandre Julliard : Release 6.10.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 649385e7d47091fa25b9114668075b06d2942e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=649385e7d47091fa25b91146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 4 21:30:53 2021 +0200 Release 6.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 816 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 427 insertions(+), 410 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=649385e7d47091fa25b9…

1 0

Piotr Caban : msvcrt: Import lgammaf implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: b634fa7ca7eb428252cbaf539dca5a2be3ef9e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b634fa7ca7eb428252cbaf53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:53 2021 +0200 msvcrt: Import lgammaf 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 | 259 +++++++++++++++++++++++++++++++++++++++++++------- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 226 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b634fa7ca7eb428252cb…

1 0

Tag wine-6.10 : Alexandre Julliard : Release 6.10
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: refs/tags/wine-6.10 Tag: a935d725d0555b768d01e3978ce67bf6a373b187 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a935d725d0555b768d01e3978ce… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 4 21:30:53 2021 +0200 Release 6.10

1 0

Rémi Bernon : winebus.sys: Add some buttons to HID keyboard input report.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 001b70774f70ddcf2b956d2264201780e2c622d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=001b70774f70ddcf2b956d22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 12:47:06 2021 +0200 winebus.sys: Add some buttons to HID keyboard input report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/controller.h | 3 ++- dlls/winebus.sys/main.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index a941b543c08..2f4a72a94cd 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -33,7 +33,7 @@ static const BYTE REPORT_HEADER[] = { #define IDX_HEADER_USAGE 3 static const BYTE REPORT_BUTTONS[] = { - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_PAGE(1, /* placeholder */ HID_USAGE_PAGE_BUTTON), USAGE_MINIMUM(1, /* placeholder */ 1), USAGE_MAXIMUM(1, /* placeholder */ 3), LOGICAL_MINIMUM(1, 0), @@ -44,6 +44,7 @@ static const BYTE REPORT_BUTTONS[] = { REPORT_SIZE(1, 1), INPUT(1, Data|Var|Abs), }; +#define IDX_BUTTON_USAGE_PAGE 1 #define IDX_BUTTON_MIN_USAGE 3 #define IDX_BUTTON_MAX_USAGE 5 #define IDX_BUTTON_COUNT 15 diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a572d11f822..a512015d478 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -546,12 +546,14 @@ static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffe { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) return STATUS_BUFFER_TOO_SMALL; memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + add_button_block(buffer + sizeof(REPORT_HEADER), 0, 101); + buffer[sizeof(REPORT_HEADER) + IDX_BUTTON_USAGE_PAGE] = HID_USAGE_PAGE_KEYBOARD; + memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_KEYBOARD;

1 0

Dmitry Timoshkov : wininet: Reset buffer size before each call to HTTP_HttpQueryInfoW.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 3b052877e46c7ae7cbedfd8f71ea58b691504dc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b052877e46c7ae7cbedfd8f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 3 17:01:06 2021 +0300 wininet: Reset buffer size before each call to HTTP_HttpQueryInfoW. Otherwise when headers contain multiple entries like WWW-Authenticate: Negotiate WWW-Authenticate: Basic realm="SAMPLE.COM" then 2nd query fails because buffer size is shorter than the header value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c770c312ba9..eedb210cd23 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5125,6 +5125,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = TRUE; break; } + + dwBufferSize = 2048; } heap_free( host ); @@ -5153,6 +5155,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = TRUE; break; } + + dwBufferSize = 2048; } if(!loop_next) {

1 0

Rémi Bernon : mmdevapi: Use a struct list to keep device list.
by Alexandre Julliard June 4, 2021

June 4, 2021

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 logf implementation from musl.
by Alexandre Julliard June 4, 2021

June 4, 2021

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 June 4, 2021

June 4, 2021

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 June 4, 2021

June 4, 2021

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