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

Eric Pouech : winedbg: Don't crash when no search path has been set.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 24069aad307829c710f4eaee5aa2b35586bd7f14 URL: https://gitlab.winehq.org/wine/wine/-/commit/24069aad307829c710f4eaee5aa2b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:09:38 2023 +0200 winedbg: Don't crash when no search path has been set. Note: it's anyway wrong to search source files inside modules' path (a proper fix will require revisiting source file handling). This fix will actually be sufficient when running wine from within its build tree. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/source.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index 044eccaab5e..74f31d986c6 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -122,17 +122,18 @@ static BOOL source_locate_file(const char* srcfile, char* path) strcpy(path, srcfile); found = TRUE; } - else if (dbg_curr_process->search_path) + else { const char* spath; - + const char* sp = dbg_curr_process->search_path; + if (!sp) sp = "."; spath = srcfile; while (!found) { while (*spath && *spath != '/' && *spath != '\\') spath++; if (!*spath) break; spath++; - found = SearchPathA(dbg_curr_process->search_path, spath, NULL, MAX_PATH, path, NULL); + found = SearchPathA(sp, spath, NULL, MAX_PATH, path, NULL); } } return found;

1 0

Eric Pouech : kernel32/tests: Workaround broken behavior in Win7 Pro64.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 8ad9ddaa28b6f6449d0987079f3e43004d82f539 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ad9ddaa28b6f6449d0987079f3e43… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:04:09 2023 +0200 kernel32/tests: Workaround broken behavior in Win7 Pro64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/console.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8d569ad6410..c2a8e99458f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3300,10 +3300,12 @@ static void test_ReadConsole(HANDLE input) SetLastError(0xdeadbeef); ret = GetFileSize(input, NULL); - ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#lx\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE || - GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ - "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + ok(ret == INVALID_FILE_SIZE || broken(TRUE), /* only Win7 pro64 on 64bit returns a valid file size here */ + "expected INVALID_FILE_SIZE, got %#lx\n", ret); + if (ret == INVALID_FILE_SIZE) + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ + "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); bytes = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

Zebediah Figura : quartz/vmr9: Do not clear the previous allocator and presenter in IVMRFilterConfig9::SetRenderingMode().
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: f6c1548bf87b6f9e7c543908e1eff735d3db62c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6c1548bf87b6f9e7c543908e1eff7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:37:59 2023 -0500 quartz/vmr9: Do not clear the previous allocator and presenter in IVMRFilterConfig9::SetRenderingMode(). There cannot be any previous allocator and presenter. They can only be set by this function, which cannot be called more than once, or by IVMRSurfaceAllocatorNotify9::AdviseSurfaceAllocator(), which can only be called after setting the rendering mode. --- dlls/quartz/vmr9.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2330f8fc0c9..d2840f6fb76 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1344,14 +1344,6 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface return VFW_E_WRONG_STATE; } - if (This->allocator) - IVMRSurfaceAllocator9_Release(This->allocator); - if (This->presenter) - IVMRImagePresenter9_Release(This->presenter); - - This->allocator = NULL; - This->presenter = NULL; - switch (mode) { case VMR9Mode_Windowed:

1 0

Zebediah Figura : quartz/vmr9: Return a default_presenter structure from the default presenter constructor.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 0ea07738b8f26156eb5a94fbc64ca4b2926dcec8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ea07738b8f26156eb5a94fbc64ca4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:45:36 2023 -0500 quartz/vmr9: Return a default_presenter structure from the default presenter constructor. --- dlls/quartz/vmr9.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d2840f6fb76..7e50748a822 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -201,7 +201,7 @@ static inline struct default_presenter *impl_from_IVMRSurfaceAllocator9(IVMRSurf return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocator9_iface); } -static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); +static HRESULT default_presenter_create(struct quartz_vmr *parent, struct default_presenter **presenter); static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) { @@ -1332,6 +1332,7 @@ static HRESULT WINAPI VMR9FilterConfig_GetRenderingPrefs(IVMRFilterConfig9 *ifac static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface, DWORD mode) { + struct default_presenter *default_presenter; HRESULT hr = S_OK; struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); @@ -1350,21 +1351,14 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface case VMR9Mode_Windowless: This->cookie = ~0; - if (FAILED(hr = VMR9DefaultAllocatorPresenterImpl_create(This, (void **)&This->presenter))) + if (FAILED(hr = default_presenter_create(This, &default_presenter))) { ERR("Failed to create default presenter, hr %#lx.\n", hr); break; } - - if (FAILED(hr = IVMRImagePresenter9_QueryInterface(This->presenter, - &IID_IVMRSurfaceAllocator9, (void **)&This->allocator))) - { - ERR("Failed to query for IVMRSurfaceAllocator9, hr %#lx.\n", hr); - IVMRImagePresenter9_Release(This->presenter); - This->allocator = NULL; - This->presenter = NULL; - break; - } + This->allocator = &default_presenter->IVMRSurfaceAllocator9_iface; + This->presenter = &default_presenter->IVMRImagePresenter9_iface; + IVMRImagePresenter9_AddRef(This->presenter); hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; @@ -3102,7 +3096,7 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) return d3d9_create(D3D_SDK_VERSION); } -static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) +static HRESULT default_presenter_create(struct quartz_vmr *parent, struct default_presenter **presenter) { struct default_presenter *object; @@ -3124,6 +3118,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren object->pVMR9 = parent; TRACE("Created default presenter %p.\n", object); - *ppv = &object->IVMRImagePresenter9_iface; + *presenter = object; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Do not bother setting the cookie when using the default presenter.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 966bad6aa5736ebf02510bf494edfd0c52825fc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/966bad6aa5736ebf02510bf494edfd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:46:55 2023 -0500 quartz/vmr9: Do not bother setting the cookie when using the default presenter. We do not use it in this case. --- dlls/quartz/vmr9.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7e50748a822..80c2d7bedb9 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1349,8 +1349,6 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface { case VMR9Mode_Windowed: case VMR9Mode_Windowless: - This->cookie = ~0; - if (FAILED(hr = default_presenter_create(This, &default_presenter))) { ERR("Failed to create default presenter, hr %#lx.\n", hr);

1 0

Zebediah Figura : quartz/vmr9: Do not set the mode if we failed to create the default presenter.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 4a441e7b41fe1fe5aa548c29b6224ab70b721f56 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a441e7b41fe1fe5aa548c29b6224a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:50:05 2023 -0500 quartz/vmr9: Do not set the mode if we failed to create the default presenter. --- dlls/quartz/vmr9.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 80c2d7bedb9..8eee6587182 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1352,13 +1352,14 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface if (FAILED(hr = default_presenter_create(This, &default_presenter))) { ERR("Failed to create default presenter, hr %#lx.\n", hr); - break; + LeaveCriticalSection(&This->renderer.filter.filter_cs); + return hr; } This->allocator = &default_presenter->IVMRSurfaceAllocator9_iface; This->presenter = &default_presenter->IVMRImagePresenter9_iface; IVMRImagePresenter9_AddRef(This->presenter); - hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); + IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break;

1 0

Alexandre Julliard : msvcrt: Use the nan()/nanf() implementation from the bundled musl library.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 0750079ace273e390429b3cfb0dd1f191c6ed828 URL: https://gitlab.winehq.org/wine/wine/-/commit/0750079ace273e390429b3cfb0dd1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:09:18 2023 +0200 msvcrt: Use the nan()/nanf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c0d9baab361..e87441d1427 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -9796,23 +9796,6 @@ float CDECL tgammaf(float x) return tgamma(x); } -/********************************************************************* - * nan (MSVCR120.@) - */ -double CDECL nan(const char *tagp) -{ - /* Windows ignores input (MSDN) */ - return NAN; -} - -/********************************************************************* - * nanf (MSVCR120.@) - */ -float CDECL nanf(const char *tagp) -{ - return NAN; -} - /********************************************************************* * _except1 (MSVCR120.@) * TODO:

1 0

Alexandre Julliard : msvcrt: Use the scalbn() implementation from the bundled musl library.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 52621691fdadc62113a7edcd45a8a01c50424615 URL: https://gitlab.winehq.org/wine/wine/-/commit/52621691fdadc62113a7edcd45a8a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:09:52 2023 +0200 msvcrt: Use the scalbn() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 44 ++++++-------------------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e87441d1427..61c95512448 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -295,38 +295,6 @@ float CDECL _logbf(float x) #endif -/* Copied from musl: src/math/scalbn.c */ -static double __scalbn(double x, int n) -{ - union {double f; UINT64 i;} u; - double y = x; - - if (n > 1023) { - y *= 0x1p1023; - n -= 1023; - if (n > 1023) { - y *= 0x1p1023; - n -= 1023; - if (n > 1023) - n = 1023; - } - } else if (n < -1022) { - /* make sure final n < -53 to avoid double - rounding in the subnormal range */ - y *= 0x1p-1022 * 0x1p53; - n += 1022 - 53; - if (n < -1022) { - y *= 0x1p-1022 * 0x1p53; - n += 1022 - 53; - if (n < -1022) - n = -1022; - } - } - u.i = (UINT64)(0x3ff + n) << 52; - x = y * u.f; - return x; -} - /* Copied from musl: src/math/__rem_pio2_large.c */ static int __rem_pio2_large(double *x, double *y, int e0, int nx, int prec) { @@ -391,7 +359,7 @@ recompute: } /* compute n */ - z = __scalbn(z, q0); /* actual value of z */ + z = scalbn(z, q0); /* actual value of z */ z -= 8.0 * floor(z * 0.125); /* trim off integer >= 8 */ n = (INT32)z; z -= (double)n; @@ -431,7 +399,7 @@ recompute: if (ih == 2) { z = 1.0 - z; if (carry != 0) - z -= __scalbn(1.0, q0); + z -= scalbn(1.0, q0); } } @@ -462,7 +430,7 @@ recompute: q0 -= 24; } } else { /* break z into 24-bit if necessary */ - z = __scalbn(z, -q0); + z = scalbn(z, -q0); if (z >= 0x1p24) { fw = (double)(INT32)(0x1p-24 * z); iq[jz] = (INT32)(z - 0x1p24 * fw); @@ -474,7 +442,7 @@ recompute: } /* convert integer "bit" chunk to floating-point value */ - fw = __scalbn(1.0, q0); + fw = scalbn(1.0, q0); for (i = jz; i >= 0; i--) { q[i] = fw * (double)iq[i]; fw *= 0x1p-24; @@ -4853,7 +4821,7 @@ double CDECL fma( double x, double y, double z ) r = i; } } - return __scalbn(r, e); + return scalbn(r, e); } /********************************************************************* @@ -5338,7 +5306,7 @@ int * CDECL __fpecode(void) */ double CDECL ldexp(double num, int exp) { - double z = __scalbn(num, exp); + double z = scalbn(num, exp); if (isfinite(num) && !isfinite(z)) return math_error(_OVERFLOW, "ldexp", num, exp, z);

1 0

Alexandre Julliard : msvcrt: Use the ilogb()/ilogbf() implementation from the bundled musl library.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: d1ba9a30dc7269aad8d8b6b0162917296c79db61 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1ba9a30dc7269aad8d8b6b0162917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:12:25 2023 +0200 msvcrt: Use the ilogb()/ilogbf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 55 ++------------------------------------------- libs/musl/src/math/ilogb.c | 3 --- libs/musl/src/math/ilogbf.c | 3 --- 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 61c95512448..a000d9196df 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -259,24 +259,6 @@ float CDECL _nextafterf( float x, float y ) return y; } -/* Copied from musl: src/math/ilogbf.c */ -static int __ilogbf(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) - { - u.i <<= 9; - if (u.i == 0) return FP_ILOGB0; - /* subnormal x */ - for (e = -0x7f; u.i >> 31 == 0; e--, u.i <<= 1); - return e; - } - if (e == 0xff) return u.i << 9 ? FP_ILOGBNAN : INT_MAX; - return e - 0x7f; -} - /********************************************************************* * _logbf (MSVCRT.@) * @@ -290,7 +272,7 @@ float CDECL _logbf(float x) *_errno() = ERANGE; return -1 / (x * x); } - return __ilogbf(x); + return ilogbf(x); } #endif @@ -4522,24 +4504,6 @@ __int64 CDECL _abs64( __int64 n ) return n >= 0 ? n : -n; } -/* Copied from musl: src/math/ilogb.c */ -static int __ilogb(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) - { - u.i <<= 12; - if (u.i == 0) return FP_ILOGB0; - /* subnormal x */ - for (e = -0x3ff; u.i >> 63 == 0; e--, u.i <<= 1); - return e; - } - if (e == 0x7ff) return u.i << 12 ? FP_ILOGBNAN : INT_MAX; - return e - 0x3ff; -} - /********************************************************************* * _logb (MSVCRT.@) * @@ -4551,7 +4515,7 @@ double CDECL _logb(double x) return x * x; if (x == 0) return math_error(_SING, "_logb", x, 0, -1 / (x * x)); - return __ilogb(x); + return ilogb(x); } /********************************************************************* @@ -9866,19 +9830,4 @@ double CDECL MSVCR120_creal(_Dcomplex z) return z._Val[0]; } -/********************************************************************* - * ilogb (MSVCR120.@) - */ -int CDECL ilogb(double x) -{ - return __ilogb(x); -} - -/********************************************************************* - * ilogbf (MSVCR120.@) - */ -int CDECL ilogbf(float x) -{ - return __ilogbf(x); -} #endif /* _MSVCR_VER>=120 */ diff --git a/libs/musl/src/math/ilogb.c b/libs/musl/src/math/ilogb.c index 9351411a5aa..12738446ef0 100644 --- a/libs/musl/src/math/ilogb.c +++ b/libs/musl/src/math/ilogb.c @@ -3,7 +3,6 @@ int __cdecl ilogb(double x) { - #pragma STDC FENV_ACCESS ON union {double f; uint64_t i;} u = {x}; uint64_t i = u.i; int e = i>>52 & 0x7ff; @@ -11,7 +10,6 @@ int __cdecl ilogb(double x) if (!e) { i <<= 12; if (i == 0) { - FORCE_EVAL(0/0.0f); return FP_ILOGB0; } /* subnormal x */ @@ -19,7 +17,6 @@ int __cdecl ilogb(double x) return e; } if (e == 0x7ff) { - FORCE_EVAL(0/0.0f); return i<<12 ? FP_ILOGBNAN : INT_MAX; } return e - 0x3ff; diff --git a/libs/musl/src/math/ilogbf.c b/libs/musl/src/math/ilogbf.c index 65ee300531b..2eab40cd1a4 100644 --- a/libs/musl/src/math/ilogbf.c +++ b/libs/musl/src/math/ilogbf.c @@ -3,7 +3,6 @@ int __cdecl ilogbf(float x) { - #pragma STDC FENV_ACCESS ON union {float f; uint32_t i;} u = {x}; uint32_t i = u.i; int e = i>>23 & 0xff; @@ -11,7 +10,6 @@ int __cdecl ilogbf(float x) if (!e) { i <<= 9; if (i == 0) { - FORCE_EVAL(0/0.0f); return FP_ILOGB0; } /* subnormal x */ @@ -19,7 +17,6 @@ int __cdecl ilogbf(float x) return e; } if (e == 0xff) { - FORCE_EVAL(0/0.0f); return i<<9 ? FP_ILOGBNAN : INT_MAX; } return e - 0x7f;

1 0

Alexandre Julliard : msvcrt: Use the logb()/logbf() implementation from the bundled musl library.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 1cff65b69fb05e960a998d8b43acbdd8dbb2d7a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cff65b69fb05e960a998d8b43acbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:14:30 2023 +0200 msvcrt: Use the logb()/logbf() 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 | 10 +++++----- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/math.c | 32 +------------------------------- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 20 ++++++++++---------- libs/musl/src/internal/libm.h | 2 ++ libs/musl/src/math/logb.c | 2 +- libs/musl/src/math/logbf.c | 5 ++++- 15 files changed, 37 insertions(+), 62 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index c66cea5bade..3a90ad7ef74 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -179,7 +179,7 @@ @ cdecl _loaddll(str) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl _locking(long long long) -@ cdecl _logb(double) +@ cdecl _logb(double) logb @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a42fe349cf5..1b9abbfdec2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1052,8 +1052,8 @@ @ cdecl _lock(long) @ cdecl _lock_file(ptr) @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2bccd8c6fe9..bba1222a44e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1409,8 +1409,8 @@ @ cdecl _lock(long) @ cdecl _lock_file(ptr) @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ed0f69b49bc..654fb4071f8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1420,8 +1420,8 @@ @ cdecl _lock(long) @ cdecl _lock_file(ptr) @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -2266,9 +2266,9 @@ @ cdecl log2(double) @ cdecl log2f(float) @ cdecl log2l(double) log2 -@ cdecl logb(double) _logb -@ cdecl logbf(float) _logbf -@ cdecl logbl(double) _logb +@ cdecl logb(double) +@ cdecl logbf(float) +@ cdecl logbl(double) logb @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) @ cdecl lrintf(float) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index cb3a92cf395..1e02dc95d2d 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -408,7 +408,7 @@ @ cdecl _localtime64(ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) -@ cdecl _logb(double) +@ cdecl _logb(double) logb @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index a559b5cc376..1a075986ddd 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -403,7 +403,7 @@ @ cdecl _localtime64(ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) -@ cdecl _logb(double) +@ cdecl _logb(double) logb @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 06d0bdf82cd..2ea91c0ce8a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -724,8 +724,8 @@ @ cdecl _lock(long) @ cdecl _lock_file(ptr) @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d020de98a02..fb274878d39 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -702,8 +702,8 @@ @ cdecl _lock(long) @ cdecl _lock_file(ptr) @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a000d9196df..94da43ec3f6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -131,7 +131,7 @@ int CDECL _matherr(struct _exception *e) } -static double math_error(int type, const char *name, double arg1, double arg2, double retval) +double math_error(int type, const char *name, double arg1, double arg2, double retval) { struct _exception exception = {type, (char *)name, arg1, arg2, retval}; @@ -259,22 +259,6 @@ float CDECL _nextafterf( float x, float y ) return y; } -/********************************************************************* - * _logbf (MSVCRT.@) - * - * Copied from musl: src/math/logbf.c - */ -float CDECL _logbf(float x) -{ - if (!isfinite(x)) - return x * x; - if (x == 0) { - *_errno() = ERANGE; - return -1 / (x * x); - } - return ilogbf(x); -} - #endif /* Copied from musl: src/math/__rem_pio2_large.c */ @@ -4504,20 +4488,6 @@ __int64 CDECL _abs64( __int64 n ) return n >= 0 ? n : -n; } -/********************************************************************* - * _logb (MSVCRT.@) - * - * Copied from musl: src/math/logb.c - */ -double CDECL _logb(double x) -{ - if (!isfinite(x)) - return x * x; - if (x == 0) - return math_error(_SING, "_logb", x, 0, -1 / (x * x)); - return ilogb(x); -} - /********************************************************************* * ceil (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43259d7abad..f339757438f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -670,8 +670,8 @@ @ cdecl _lock(long) @ cdecl _lock_file(ptr) @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 5cb09d92c74..68fa80d532f 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -385,7 +385,7 @@ @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl _lock(long) @ cdecl _locking(long long long) -@ cdecl _logb(double) +@ cdecl _logb(double) logb @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 87a266198bd..51137681f14 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -568,8 +568,8 @@ @ cdecl _lock_file(ptr) @ cdecl _lock_locales() @ cdecl _locking(long long long) -@ cdecl _logb(double) -@ cdecl -arch=!i386 _logbf(float) +@ cdecl _logb(double) logb +@ cdecl -arch=!i386 _logbf(float) logbf @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -1142,8 +1142,8 @@ @ cdecl _o__localtime64_s(ptr ptr) _localtime64_s @ cdecl _o__lock_file(ptr) _lock_file @ cdecl _o__locking(long long long) _locking -@ cdecl _o__logb(double) _logb -@ cdecl -arch=!i386 _o__logbf(float) _logbf +@ cdecl _o__logb(double) logb +@ cdecl -arch=!i386 _o__logbf(float) logbf @ cdecl _o__lsearch(ptr ptr ptr long ptr) _lsearch @ stub _o__lsearch_s @ cdecl _o__lseek(long long long) _lseek @@ -1699,9 +1699,9 @@ @ cdecl _o_log2(double) log2 @ cdecl _o_log2f(float) log2f @ cdecl _o_log2l(double) log2 -@ cdecl _o_logb(double) _logb -@ cdecl _o_logbf(float) _logbf -@ cdecl _o_logbl(double) _logb +@ cdecl _o_logb(double) logb +@ cdecl _o_logbf(float) logbf +@ cdecl _o_logbl(double) logb @ cdecl -arch=!i386 _o_logf(float) logf @ cdecl _o_lrint(double) lrint @ cdecl _o_lrintf(float) lrintf @@ -2401,9 +2401,9 @@ @ cdecl log2(double) @ cdecl log2f(float) @ cdecl log2l(double) log2 -@ cdecl logb(double) _logb -@ cdecl logbf(float) _logbf -@ cdecl logbl(double) _logb +@ cdecl logb(double) +@ cdecl logbf(float) +@ cdecl logbl(double) logb @ cdecl -arch=!i386 logf(float) @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) diff --git a/libs/musl/src/internal/libm.h b/libs/musl/src/internal/libm.h index 39233282750..a1e9bc08716 100644 --- a/libs/musl/src/internal/libm.h +++ b/libs/musl/src/internal/libm.h @@ -10,6 +10,8 @@ typedef float float_t; typedef double double_t; +hidden double math_error(int type, const char *name, double arg1, double arg2, double retval); + #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 #elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN union ldshape { diff --git a/libs/musl/src/math/logb.c b/libs/musl/src/math/logb.c index 7c0423fb6c0..ce496e6bf18 100644 --- a/libs/musl/src/math/logb.c +++ b/libs/musl/src/math/logb.c @@ -13,6 +13,6 @@ double __cdecl logb(double x) if (!isfinite(x)) return x * x; if (x == 0) - return -1/(x*x); + return math_error(_SING, "_logb", x, 0, -1 / (x * x)); return ilogb(x); } diff --git a/libs/musl/src/math/logbf.c b/libs/musl/src/math/logbf.c index 743af679ab0..9f1728fc118 100644 --- a/libs/musl/src/math/logbf.c +++ b/libs/musl/src/math/logbf.c @@ -1,10 +1,13 @@ #include <math.h> +#include "libm.h" float __cdecl logbf(float x) { if (!isfinite(x)) return x * x; - if (x == 0) + if (x == 0) { + errno = ERANGE; return -1/(x*x); + } return ilogbf(x); }

1 0