April 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the remainder()/remainderf() implementation from the bundled musl library.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 3b1e2a7bfdb82c2e41cc96df4bb6ce5e1670b90e URL: https://gitlab.winehq.org/wine/wine/-/commit/3b1e2a7bfdb82c2e41cc96df4bb6ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 15:38:53 2023 +0200 msvcrt: Use the remainder()/remainderf() implementation from the bundled musl library. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcrt/math.c | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 618fc3acbba..d4757be4a6f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2325,9 +2325,9 @@ @ cdecl rand() @ cdecl rand_s(ptr) @ cdecl realloc(ptr long) -@ cdecl remainder(double double) -@ cdecl remainderf(float float) -@ cdecl remainderl(double double) remainder +@ cdecl remainder(double double) MSVCRT_remainder +@ cdecl remainderf(float float) MSVCRT_remainderf +@ cdecl remainderl(double double) MSVCRT_remainder @ cdecl remove(str) @ cdecl remquo(double double ptr) @ cdecl remquof(float float ptr) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2acfe23278d..5146ac43644 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3350,36 +3350,34 @@ float CDECL _scalbf(float num, __msvcrt_long power) return ldexp(num, power); } -#if _MSVCR_VER>=120 +#if _MSVCR_VER == 120 /* other versions call remainder() directly */ /********************************************************************* * remainder (MSVCR120.@) - * - * Copied from musl: src/math/remainder.c */ -double CDECL remainder(double x, double y) +double CDECL MSVCRT_remainder(double x, double y) { - int q; -#if _MSVCR_VER == 120 && defined(__x86_64__) +#ifdef __x86_64__ if (isnan(x) || isnan(y)) *_errno() = EDOM; #endif - return remquo(x, y, &q); + return remainder(x, y); } /********************************************************************* * remainderf (MSVCR120.@) - * - * Copied from musl: src/math/remainderf.c */ -float CDECL remainderf(float x, float y) +float CDECL MSVCRT_remainderf(float x, float y) { - int q; -#if _MSVCR_VER == 120 && defined(__x86_64__) +#ifdef __x86_64__ if (isnan(x) || isnan(y)) *_errno() = EDOM; #endif - return remquof(x, y, &q); + return remainderf(x, y); } +#endif /* _MSVCR_VER == 120 */ + +#if _MSVCR_VER>=120 + /********************************************************************* * _except1 (MSVCR120.@) * TODO:

1 0

Alex Henrie : opengl32/tests: Make the wglShareLists tests comprehensive.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: c3eca06a2aa5d7fc791f32a89a59d0a239b37bb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3eca06a2aa5d7fc791f32a89a59d0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 9 22:32:57 2023 -0600 opengl32/tests: Make the wglShareLists tests comprehensive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51311 --- dlls/opengl32/tests/opengl.c | 118 +++++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 44 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 6979e00792e..d7a28339916 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -541,54 +541,84 @@ static void test_setpixelformat(HDC winhdc) static void test_sharelists(HDC winhdc) { - HGLRC hglrc1, hglrc2, hglrc3; - BOOL res; - - hglrc1 = wglCreateContext(winhdc); - res = wglShareLists(0, 0); - ok(res == FALSE, "Sharing display lists for no contexts passed!\n"); + BOOL res, nvidia, amd, source_current, source_sharing, dest_current, dest_sharing; + HGLRC source, dest, other; - /* Test 1: Create a context and just share lists without doing anything special */ - hglrc2 = wglCreateContext(winhdc); - if(hglrc2) - { - res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing of display lists failed\n"); - wglDeleteContext(hglrc2); - } + res = wglShareLists(NULL, NULL); + ok(!res, "Sharing display lists for no contexts passed!\n"); - /* Test 2: Share display lists with a 'destination' context which has been made current */ - hglrc2 = wglCreateContext(winhdc); - if(hglrc2) - { - res = wglMakeCurrent(winhdc, hglrc2); - ok(res, "Make current failed\n"); - res = wglShareLists(hglrc1, hglrc2); - todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); - wglMakeCurrent(0, 0); - wglDeleteContext(hglrc2); - } + nvidia = !!strstr((const char*)glGetString(GL_VENDOR), "NVIDIA"); + amd = strstr((const char*)glGetString(GL_VENDOR), "AMD") || + strstr((const char*)glGetString(GL_VENDOR), "ATI"); - /* Test 3: Share display lists with a context which already shares display lists with another context. - * According to MSDN the second parameter cannot share any display lists but some buggy drivers might allow it */ - hglrc3 = wglCreateContext(winhdc); - if(hglrc3) + for (source_current = FALSE; source_current <= TRUE; source_current++) { - res = wglShareLists(hglrc3, hglrc1); - ok(res == FALSE, "Sharing of display lists passed for a context which already shared lists before\n"); - wglDeleteContext(hglrc3); - } - - /* Test 4: Share display lists with a 'source' context which has been made current */ - hglrc2 = wglCreateContext(winhdc); - if(hglrc2) - { - res = wglMakeCurrent(winhdc, hglrc1); - ok(res, "Make current failed\n"); - res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing display lists with a source context which has been made current failed\n"); - wglMakeCurrent(0, 0); - wglDeleteContext(hglrc2); + for (source_sharing = FALSE; source_sharing <= TRUE; source_sharing++) + { + for (dest_current = FALSE; dest_current <= TRUE; dest_current++) + { + for (dest_sharing = FALSE; dest_sharing <= TRUE; dest_sharing++) + { + winetest_push_context("source_current=%d source_sharing=%d dest_current=%d dest_sharing=%d", + source_current, source_sharing, dest_current, dest_sharing); + + source = wglCreateContext(winhdc); + ok(!!source, "Create source context failed\n"); + dest = wglCreateContext(winhdc); + ok(!!dest, "Create dest context failed\n"); + other = wglCreateContext(winhdc); + ok(!!other, "Create other context failed\n"); + + if (source_current) + { + res = wglMakeCurrent(winhdc, source); + ok(res, "Make source current failed\n"); + } + if (source_sharing) + { + res = wglShareLists(other, source); + todo_wine_if(source_current) + ok(res, "Sharing of display lists from other to source failed\n"); + } + if (dest_current) + { + res = wglMakeCurrent(winhdc, dest); + ok(res, "Make dest current failed\n"); + } + if (dest_sharing) + { + res = wglShareLists(other, dest); + todo_wine_if(dest_current) + ok(res, "Sharing of display lists from other to dest failed\n"); + } + + res = wglShareLists(source, dest); + todo_wine_if(dest_current || dest_sharing) + ok(res || broken(nvidia && !source_sharing && dest_sharing), + "Sharing of display lists from source to dest failed\n"); + + if (source_current || dest_current) + { + res = wglMakeCurrent(NULL, NULL); + ok(res, "Make none current failed\n"); + } + res = wglDeleteContext(source); + ok(res, "Delete source context failed\n"); + res = wglDeleteContext(dest); + ok(res, "Delete dest context failed\n"); + if (!strcmp(winetest_platform, "wine") || !amd || source_sharing || !dest_sharing) + { + /* If source_sharing=FALSE and dest_sharing=TRUE, wglShareLists succeeds on AMD, but + * sometimes wglDeleteContext crashes afterwards. On Wine, both functions should always + * succeed in this case. */ + res = wglDeleteContext(other); + ok(res, "Delete other context failed\n"); + } + + winetest_pop_context(); + } + } + } } }

1 0

Alex Henrie : winex11: Allow replacing either context in wglShareLists.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 28233dd3bc4963e6205d33aedb665bfdb995c9c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/28233dd3bc4963e6205d33aedb665b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 9 22:32:57 2023 -0600 winex11: Allow replacing either context in wglShareLists. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=11436 --- dlls/opengl32/tests/opengl.c | 5 ++--- dlls/winex11.drv/opengl.c | 41 ++++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index d7a28339916..fca0aea73e7 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -577,7 +577,6 @@ static void test_sharelists(HDC winhdc) if (source_sharing) { res = wglShareLists(other, source); - todo_wine_if(source_current) ok(res, "Sharing of display lists from other to source failed\n"); } if (dest_current) @@ -588,12 +587,12 @@ static void test_sharelists(HDC winhdc) if (dest_sharing) { res = wglShareLists(other, dest); - todo_wine_if(dest_current) + todo_wine_if(source_sharing && dest_current) ok(res, "Sharing of display lists from other to dest failed\n"); } res = wglShareLists(source, dest); - todo_wine_if(dest_current || dest_sharing) + todo_wine_if((source_current || source_sharing) && (dest_current || dest_sharing)) ok(res || broken(nvidia && !source_sharing && dest_sharing), "Sharing of display lists from source to dest failed\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 565df8bb4c6..8c1ab90595a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1916,6 +1916,8 @@ done: */ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest) { + struct wgl_context *keep, *clobber; + TRACE("(%p, %p)\n", org, dest); /* Sharing of display lists works differently in GLX and WGL. In case of GLX it is done @@ -1926,34 +1928,35 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de * so there delaying context creation doesn't work. * * The new approach is to create a GLX context in wglCreateContext / wglCreateContextAttribsARB - * and when a program requests sharing we recreate the destination context if it hasn't been made - * current or when it hasn't shared display lists before. + * and when a program requests sharing we recreate the destination or source context if it + * hasn't been made current and it hasn't shared display lists before. */ - if(dest->has_been_current) + if (!dest->has_been_current && !dest->sharing) { - ERR("Could not share display lists because the destination context has already been current\n"); - return FALSE; + keep = org; + clobber = dest; } - else if(dest->sharing) + else if (!org->has_been_current && !org->sharing) { - ERR("Could not share display lists because the destination context has already shared lists\n"); - return FALSE; + keep = dest; + clobber = org; } else { - /* Re-create the GLX context and share display lists */ - pglXDestroyContext(gdi_display, dest->ctx); - dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); - TRACE(" re-created context (%p) for Wine context %p (%s) sharing lists with ctx %p (%s)\n", - dest->ctx, dest, debugstr_fbconfig(dest->fmt->fbconfig), - org->ctx, debugstr_fbconfig( org->fmt->fbconfig)); - - org->sharing = TRUE; - dest->sharing = TRUE; - return TRUE; + ERR("Could not share display lists because both of the contexts have already been current or shared\n"); + return FALSE; } - return FALSE; + + pglXDestroyContext(gdi_display, clobber->ctx); + clobber->ctx = create_glxcontext(gdi_display, clobber, keep->ctx); + TRACE("re-created context (%p) for Wine context %p (%s) sharing lists with ctx %p (%s)\n", + clobber->ctx, clobber, debugstr_fbconfig(clobber->fmt->fbconfig), + keep->ctx, debugstr_fbconfig(keep->fmt->fbconfig)); + + org->sharing = TRUE; + dest->sharing = TRUE; + return TRUE; } static void wglFinish(void)

1 0

Jacek Caban : mshtml: Wine Gecko 2.47.4 release.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 84f1f36686dc456abcd27164429235bd64462e60 URL: https://gitlab.winehq.org/wine/wine/-/commit/84f1f36686dc456abcd27164429235… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 3 16:55:12 2023 +0200 mshtml: Wine Gecko 2.47.4 release. --- dlls/appwiz.cpl/addons.c | 6 +++--- dlls/mshtml/nsiface.idl | 7 ++++++- tools/gitlab/test.yml | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a5fdda3e81f..57855648ff1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -46,13 +46,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); -#define GECKO_VERSION "2.47.3" +#define GECKO_VERSION "2.47.4" #ifdef __i386__ #define GECKO_ARCH "x86" -#define GECKO_SHA "e5b9b06d3ce355646a8d2e72e044e37e1e0c8d18464eb1985adcd187a7f48e01" +#define GECKO_SHA "26cecc47706b091908f7f814bddb074c61beb8063318e9efc5a7f789857793d6" #elif defined(__x86_64__) #define GECKO_ARCH "x86_64" -#define GECKO_SHA "a53ee954392b6d1fe3d68545f6e4e2a97afbc8dc8b03a8b443349545ce139675" +#define GECKO_SHA "e590b7d988a32d6aa4cf1d8aa3aa3d33766fdd4cf4c89c2dcc2095ecb28d066f" #else #define GECKO_ARCH "" #define GECKO_SHA "???" diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1e97f1fc63b..8ad5e871e21 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -25,7 +25,7 @@ #pragma makedep header -cpp_quote("#define GECKO_VERSION \"2.47.3\"") +cpp_quote("#define GECKO_VERSION \"2.47.4\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -114,6 +114,7 @@ interface nsIDOMHTMLSelectElement; interface nsIFile; interface nsIDocShell; interface mozIDOMWindowProxy; +interface nsIDOMMediaQueryListListener; interface IMoniker; @@ -919,6 +920,7 @@ interface nsIDOMMediaQueryList : nsISupports { nsresult GetMedia(nsAString *aMedia); nsresult GetMatches(bool *_retval); + nsresult SetListener(nsIDOMMediaQueryListListener *listener); } [ @@ -1445,6 +1447,8 @@ interface nsIDOMHTMLDocument : nsIDOMDocument nsresult GetSelection(nsISelection **_retval); nsresult CaptureEvents(); nsresult ReleaseEvents(); + nsresult GetIECompatMode(uint32_t *aIECompatMode); + nsresult SetIECompatMode(uint32_t aIECompatMode); } [ @@ -1777,6 +1781,7 @@ interface nsIDOMHTMLInputElement : nsISupports nsresult MozGetFileNameArray(uint32_t *aLength, PRUnichar ***aFileNames); nsresult MozSetFileNameArray(const PRUnichar **aFileNames, uint32_t aLength); nsresult MozIsTextField(bool aExcludePassword, bool *_retval); + nsresult GetComplete(bool *aComplete); } [ diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 78c462c3e20..490ca3b5b84 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -6,7 +6,7 @@ interruptible: true variables: GIT_STRATEGY: none - GECKO_VER: 2.47.3 + GECKO_VER: 2.47.4 MONO_VER: 7.4.0 cache: - key: wine-gecko-$GECKO_VER

1 0

Alexandre Julliard : msvcrt: Use the tanh()/tanhf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 5c00be28fc747c51375c9999ec1b622549197abe URL: https://gitlab.winehq.org/wine/wine/-/commit/5c00be28fc747c51375c9999ec1b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 5 14:29:41 2023 +0200 msvcrt: Use the tanh()/tanhf() implementation from the bundled musl library. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/math.c | 117 ++++++++------------------------------------ dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrtd/msvcrtd.spec | 2 +- libs/musl/src/math/tanh.c | 9 +++- libs/musl/src/math/tanhf.c | 9 +++- 13 files changed, 51 insertions(+), 116 deletions(-)

1 0

Biswapriyo Nath : include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 467604c6613e7a41201e0af34f009700bc8ac392 URL: https://gitlab.winehq.org/wine/wine/-/commit/467604c6613e7a41201e0af34f0097… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Apr 11 01:07:00 2023 +0530 include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl. This matches the declaration with official documentation and fixes the following two compiler errors in apitrace project. d3d9trace.cpp:28469:59: error: invalid conversion from 'const DXVA2_ConfigPictureDecode*' to 'DXVA2_ConfigPictureDecode*' [-fpermissive] d3d9trace.cpp:28194:65: error: invalid conversion from 'void*' to 'IUnknown*' [-fpermissive] Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- dlls/dxva2/main.c | 4 ++-- include/dxva2api.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index c5ca3439a68..d48cf8de230 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -701,7 +701,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDi } static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface, - REFGUID guid, const DXVA2_VideoDesc *video_desc, IUnknown *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) + REFGUID guid, const DXVA2_VideoDesc *video_desc, void *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) { FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs); @@ -709,7 +709,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(ID } static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface, - REFGUID guid, const DXVA2_VideoDesc *video_desc, DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, + REFGUID guid, const DXVA2_VideoDesc *video_desc, const DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, UINT num_surfaces, IDirectXVideoDecoder **decoder) { FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces, diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 63de780f0df..205491e3790 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -631,14 +631,14 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService HRESULT GetDecoderConfigurations( [in] REFGUID guid, [in] const DXVA2_VideoDesc *pVideoDesc, - [in] IUnknown *pReserved, + [in] void *pReserved, [out] UINT *pCount, [out] DXVA2_ConfigPictureDecode **ppConfigs); HRESULT CreateVideoDecoder( [in] REFGUID guid, [in] const DXVA2_VideoDesc *pVideoDesc, - [in] DXVA2_ConfigPictureDecode *pConfig, + [in] const DXVA2_ConfigPictureDecode *pConfig, [in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] UINT NumSurfaces, [out] IDirectXVideoDecoder **ppDecode);

1 0

Alexandre Julliard : msvcrt: Use the atanh()/atanhf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 4ffb1199e37ddb96c7b361bb97767a74ef5e2902 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ffb1199e37ddb96c7b361bb97767a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:53:49 2023 +0200 msvcrt: Use the atanh()/atanhf() implementation from the bundled musl library. --- dlls/msvcr120/msvcr120.spec | 6 ++--- dlls/msvcrt/math.c | 61 +++++++-------------------------------------- dlls/ucrtbase/ucrtbase.spec | 12 ++++----- libs/musl/src/math/atanh.c | 2 ++ libs/musl/src/math/atanhf.c | 2 ++ 5 files changed, 22 insertions(+), 61 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f536aba9ba3..cfc81d75804 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2026,9 +2026,9 @@ @ cdecl -arch=!i386 atanf(float) @ cdecl atan2(double double) @ cdecl -arch=!i386 atan2f(float float) -@ cdecl atanh(double) -@ cdecl atanhf(float) -@ cdecl atanhl(double) atanh +@ cdecl atanh(double) MSVCRT_atanh +@ cdecl atanhf(float) MSVCRT_atanhf +@ cdecl atanhl(double) MSVCRT_atanh @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) @ cdecl atoi(str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4f95a4747a9..bc138845dce 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -78,7 +78,7 @@ void msvcrt_init_math( void *module ) } /* Copied from musl: src/internal/libm.h */ -#if !defined(__i386__) || _MSVCR_VER>=120 +#ifndef __i386__ static inline float fp_barrierf(float x) { volatile float y = x; @@ -3377,73 +3377,30 @@ float CDECL MSVCRT_acoshf(float x) /********************************************************************* * atanh (MSVCR120.@) - * - * Copied from musl: src/math/atanh.c */ -double CDECL atanh(double x) +double CDECL MSVCRT_atanh(double x) { - UINT64 ux = *(UINT64*)&x; - int e = ux >> 52 & 0x7ff; - int s = ux >> 63; - - /* |x| */ - ux &= (UINT64)-1 / 2; - x = *(double*)&ux; - - if (x > 1) { + if (fabs(x) > 1) + { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - - if (e < 0x3ff - 1) { - if (e < 0x3ff - 32) { - fp_barrier(x + 0x1p120f); - if (e == 0) /* handle underflow */ - fp_barrier(x * x); - } else { /* |x| < 0.5, up to 1.7ulp error */ - x = 0.5 * log1p(2 * x + 2 * x * x / (1 - x)); - } - } else { /* avoid overflow */ - x = 0.5 * log1p(2 * (x / (1 - x))); - if (isinf(x)) *_errno() = ERANGE; - } - return s ? -x : x; + return atanh( x ); } /********************************************************************* * atanhf (MSVCR120.@) - * - * Copied from musl: src/math/atanhf.c */ -float CDECL atanhf(float x) +float CDECL MSVCRT_atanhf(float x) { - UINT32 ux = *(UINT32*)&x; - int s = ux >> 31; - - /* |x| */ - ux &= 0x7fffffff; - x = *(float*)&ux; - - if (x > 1) { + if (fabs(x) > 1) + { *_errno() = EDOM; feraiseexcept(FE_INVALID); return NAN; } - - if (ux < 0x3f800000 - (1 << 23)) { - if (ux < 0x3f800000 - (32 << 23)) { - fp_barrierf(x + 0x1p120f); - if (ux < (1 << 23)) /* handle underflow */ - fp_barrierf(x * x); - } else { /* |x| < 0.5, up to 1.7ulp error */ - x = 0.5f * log1pf(2 * x + 2 * x * x / (1 - x)); - } - } else { /* avoid overflow */ - x = 0.5f * log1pf(2 * (x / (1 - x))); - if (isinf(x)) *_errno() = ERANGE; - } - return s ? -x : x; + return atanhf( x ); } #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5bea04dad62..258a1aa945a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1576,9 +1576,9 @@ @ cdecl _o_atan2(double double) atan2 @ cdecl -arch=!i386 _o_atan2f(float float) atan2f @ cdecl -arch=!i386 _o_atanf(float) atanf -@ cdecl _o_atanh(double) atanh -@ cdecl _o_atanhf(float) atanhf -@ cdecl _o_atanhl(double) atanh +@ cdecl _o_atanh(double) MSVCRT_atanh +@ cdecl _o_atanhf(float) MSVCRT_atanhf +@ cdecl _o_atanhl(double) MSVCRT_atanh @ cdecl _o_atof(str) atof @ cdecl _o_atoi(str) atoi @ cdecl _o_atol(str) atol @@ -2170,9 +2170,9 @@ @ cdecl atan2(double double) @ cdecl -arch=!i386 atan2f(float float) @ cdecl -arch=!i386 atanf(float) -@ cdecl atanh(double) -@ cdecl atanhf(float) -@ cdecl atanhl(double) atanh +@ cdecl atanh(double) MSVCRT_atanh +@ cdecl atanhf(float) MSVCRT_atanhf +@ cdecl atanhl(double) MSVCRT_atanh @ cdecl atof(str) @ cdecl atoi(str) @ cdecl atol(str) diff --git a/libs/musl/src/math/atanh.c b/libs/musl/src/math/atanh.c index b50e4922a10..08776e97f03 100644 --- a/libs/musl/src/math/atanh.c +++ b/libs/musl/src/math/atanh.c @@ -14,6 +14,7 @@ double __cdecl atanh(double x) if (e < 0x3ff - 1) { if (e < 0x3ff - 32) { + fp_barrier(y + 0x1p120f); /* handle underflow */ if (e == 0) FORCE_EVAL((float)y); @@ -24,6 +25,7 @@ double __cdecl atanh(double x) } else { /* avoid overflow */ y = 0.5*log1p(2*(y/(1-y))); + if (isinf(y)) errno = ERANGE; } return s ? -y : y; } diff --git a/libs/musl/src/math/atanhf.c b/libs/musl/src/math/atanhf.c index cbb425ce908..74533fb11b8 100644 --- a/libs/musl/src/math/atanhf.c +++ b/libs/musl/src/math/atanhf.c @@ -13,6 +13,7 @@ float __cdecl atanhf(float x) if (u.i < 0x3f800000 - (1<<23)) { if (u.i < 0x3f800000 - (32<<23)) { + fp_barrierf(y + 0x1p120f); /* handle underflow */ if (u.i < (1<<23)) FORCE_EVAL((float)(y*y)); @@ -23,6 +24,7 @@ float __cdecl atanhf(float x) } else { /* avoid overflow */ y = 0.5f*log1pf(2*(y/(1-y))); + if (isinf(y)) errno = ERANGE; } return s ? -y : y; }

1 0

Alexandre Julliard : msvcrt: Use the asin() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 82563ede700641a39beabcd5e746a38f7e0a858e URL: https://gitlab.winehq.org/wine/wine/-/commit/82563ede700641a39beabcd5e746a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 17:06:40 2023 +0200 msvcrt: Use the asin() implementation from the bundled musl library. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 92 +++++++-------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- libs/musl/src/math/asin.c | 2 +- 13 files changed, 27 insertions(+), 91 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 0e863362f77..b870eef8845 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -346,7 +346,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index abae3f4b301..16ece69f1a4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1630,7 +1630,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl atan(double) @ cdecl -arch=!i386 atanf(float) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e83ce328928..d4d696f512e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1987,7 +1987,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl atan(double) @ cdecl -arch=!i386 atanf(float) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ec1fd48dce5..33bd6efb73e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2017,7 +2017,7 @@ @ cdecl acoshl(double) acosh @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl asinh(double) @ cdecl asinhf(float) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 3300cf36bf3..cf2a57c5578 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -688,7 +688,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 5b68d3217af..1ef2ec942e4 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -684,7 +684,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7c7c2f8bcdb..88c4a32d52f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1313,7 +1313,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl atan(double) @ cdecl -arch=!i386 atanf(float) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c1e4a406265..bd5b3126f30 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1285,7 +1285,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -arch=!i386 asinf(float) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 32ee44fa246..69dfca332af 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -445,29 +445,7 @@ float CDECL tanhf( float x ) /********************************************************************* * asin (MSVCRT.@) - * - * Copied from musl: src/math/asin.c */ -static double asin_R(double z) -{ - /* coefficients for R(x^2) */ - static const double pS0 = 1.66666666666666657415e-01, - pS1 = -3.25565818622400915405e-01, - pS2 = 2.01212532134862925881e-01, - pS3 = -4.00555345006794114027e-02, - pS4 = 7.91534994289814532176e-04, - pS5 = 3.47933107596021167570e-05, - qS1 = -2.40339491173441421878e+00, - qS2 = 2.02094576023350569471e+00, - qS3 = -6.88283971605453293030e-01, - qS4 = 7.70381505559019352791e-02; - - double p, q; - p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); - q = 1.0 + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); - return p / q; -} - #ifdef __i386__ double CDECL x87_asin(double); __ASM_GLOBAL_FUNC( x87_asin, @@ -485,70 +463,28 @@ __ASM_GLOBAL_FUNC( x87_asin, "ret" ) #endif -double CDECL asin( double x ) +double CDECL MSVCRT_asin( double x ) { - static const double pio2_hi = 1.57079632679489655800e+00, - pio2_lo = 6.12323399573676603587e-17; - - double z, r, s; - unsigned int hx, ix; - ULONGLONG llx; #ifdef __i386__ unsigned int x87_cw, sse2_cw; -#endif + unsigned int hx = *(ULONGLONG*)&x >> 32; + unsigned int ix = hx & 0x7fffffff; - hx = *(ULONGLONG*)&x >> 32; - ix = hx & 0x7fffffff; - /* |x| >= 1 or nan */ - if (ix >= 0x3ff00000) { - unsigned int lx; - lx = *(ULONGLONG*)&x; - if (((ix - 0x3ff00000) | lx) == 0) - /* asin(1) = +-pi/2 with inexact */ - return x * pio2_hi + 7.5231638452626401e-37; - if (isnan(x)) - { -#ifdef __i386__ - return math_error(_DOMAIN, "asin", x, 0, x); -#else - return x; -#endif - } - return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); - } + if (isnan(x)) return math_error(_DOMAIN, "asin", x, 0, x); -#ifdef __i386__ - __control87_2(0, 0, &x87_cw, &sse2_cw); - if (!sse2_enabled || (x87_cw & _MCW_EM) != _MCW_EM + /* |x| < 1 */ + if (ix < 0x3ff00000) + { + __control87_2(0, 0, &x87_cw, &sse2_cw); + if (!sse2_enabled || (x87_cw & _MCW_EM) != _MCW_EM || (sse2_cw & (_MCW_EM | _MCW_RC)) != _MCW_EM) - return x87_asin(x); + return x87_asin(x); + } +#else + if (isnan(x)) return x; #endif - /* |x| < 0.5 */ - if (ix < 0x3fe00000) { - /* if 0x1p-1022 <= |x| < 0x1p-26, avoid raising underflow */ - if (ix < 0x3e500000 && ix >= 0x00100000) - return x; - return x + x * asin_R(x * x); - } - /* 1 > |x| >= 0.5 */ - z = (1 - fabs(x)) * 0.5; - s = sqrt(z); - r = asin_R(z); - if (ix >= 0x3fef3333) { /* if |x| > 0.975 */ - x = pio2_hi - (2 * (s + s * r) - pio2_lo); - } else { - double f, c; - /* f+c = sqrt(z) */ - f = s; - llx = (*(ULONGLONG*)&f >> 32) << 32; - f = *(double*)&llx; - c = (z - f * f) / (s + f); - x = 0.5 * pio2_hi - (2 * s * r - (pio2_lo - 2 * c) - (0.5 * pio2_hi - 2 * f)); - } - if (hx >> 31) - return -x; - return x; + return asin( x ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index aaca212c63c..2d3e27be81a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1253,7 +1253,7 @@ @ cdecl -arch=!i386 acosf(float) @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -arch=!i386 asinf(float) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 2c3f4912a03..09c0a947683 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -641,7 +641,7 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) @ cdecl atan2(double double) @ cdecl -private atexit(ptr) MSVCRT_atexit diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a05023b9f3e..45d883d410c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1567,7 +1567,7 @@ @ cdecl _o_acoshl(double) acosh @ cdecl _o_asctime(ptr) asctime @ cdecl _o_asctime_s(ptr long ptr) asctime_s -@ cdecl _o_asin(double) asin +@ cdecl _o_asin(double) MSVCRT_asin @ cdecl -arch=!i386 _o_asinf(float) asinf @ cdecl _o_asinh(double) asinh @ cdecl _o_asinhf(float) asinhf @@ -2161,7 +2161,7 @@ @ cdecl acoshl(double) acosh @ cdecl asctime(ptr) @ cdecl asctime_s(ptr long ptr) -@ cdecl asin(double) +@ cdecl asin(double) MSVCRT_asin @ cdecl -arch=!i386 asinf(float) @ cdecl asinh(double) @ cdecl asinhf(float) diff --git a/libs/musl/src/math/asin.c b/libs/musl/src/math/asin.c index 0ff68c07899..0686522f0f7 100644 --- a/libs/musl/src/math/asin.c +++ b/libs/musl/src/math/asin.c @@ -78,7 +78,7 @@ double __cdecl asin(double x) if ((ix-0x3ff00000 | lx) == 0) /* asin(1) = +-pi/2 with inexact */ return x*pio2_hi + 0x1p-120f; - return 0/(x-x); + return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); } /* |x| < 0.5 */ if (ix < 0x3fe00000) {

1 0

Alexandre Julliard : msvcrt: Use the asinh()/asinhf() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 6e9dd141a892524d8740d4567e0dafcb30087eca URL: https://gitlab.winehq.org/wine/wine/-/commit/6e9dd141a892524d8740d4567e0daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:43:45 2023 +0200 msvcrt: Use the asinh()/asinhf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2a523b589ae..ea72ca2f01c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3347,57 +3347,6 @@ int CDECL _fdpcomp(float x, float y) return _dpcomp(x, y); } -/********************************************************************* - * asinh (MSVCR120.@) - * - * Copied from musl: src/math/asinh.c - */ -double CDECL asinh(double x) -{ - UINT64 ux = *(UINT64*)&x; - int e = ux >> 52 & 0x7ff; - int s = ux >> 63; - - /* |x| */ - ux &= (UINT64)-1 / 2; - x = *(double*)&ux; - - if (e >= 0x3ff + 26) /* |x| >= 0x1p26 or inf or nan */ - x = log(x) + 0.693147180559945309417232121458176568; - else if (e >= 0x3ff + 1) /* |x| >= 2 */ - x = log(2 * x + 1 / (sqrt(x * x + 1) + x)); - else if (e >= 0x3ff - 26) /* |x| >= 0x1p-26 */ - x = log1p(x + x * x / (sqrt(x * x + 1) + 1)); - else /* |x| < 0x1p-26, raise inexact if x != 0 */ - fp_barrier(x + 0x1p120f); - return s ? -x : x; -} - -/********************************************************************* - * asinhf (MSVCR120.@) - * - * Copied from musl: src/math/asinhf.c - */ -float CDECL asinhf(float x) -{ - UINT32 ux = *(UINT32*)&x; - UINT32 i = ux & 0x7fffffff; - int s = ux >> 31; - - /* |x| */ - x = *(float*)&i; - - if (i >= 0x3f800000 + (12 << 23))/* |x| >= 0x1p12 or inf or nan */ - x = logf(x) + 0.693147180559945309417232121458176568f; - else if (i >= 0x3f800000 + (1 << 23)) /* |x| >= 2 */ - x = logf(2 * x + 1 / (sqrtf(x * x + 1) + x)); - else if (i >= 0x3f800000 - (12 << 23)) /* |x| >= 0x1p-12 */ - x = log1pf(x + x * x / (sqrtf(x * x + 1) + 1)); - else /* |x| < 0x1p-12, raise inexact if x!=0 */ - fp_barrierf(x + 0x1p120f); - return s ? -x : x; -} - /********************************************************************* * acosh (MSVCR120.@) *

1 0

Alexandre Julliard : msvcrt: Use the exp() implementation from the bundled musl library.
by Alexandre Julliard April 10, 2023

April 10, 2023

Module: wine Branch: master Commit: 5c3de7d79471dd71d07544c117233bf02d444192 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c3de7d79471dd71d07544c117233b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 16:38:57 2023 +0200 msvcrt: Use the exp() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 245 +---------------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- libs/musl/src/math/exp.c | 28 ++---- 3 files changed, 16 insertions(+), 259 deletions(-)

1 0