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

Rémi Bernon : imm32/tests: Cleanup the cross thread IMC tests.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: ff08b083fd25b29cd2d8c965bfec58efebcaa1c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff08b083fd25b29cd2d8c965bfec58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 8 09:36:41 2023 +0200 imm32/tests: Cleanup the cross thread IMC tests. --- dlls/imm32/tests/imm32.c | 543 +++++++++++++++++++++++++++-------------------- 1 file changed, 311 insertions(+), 232 deletions(-)

1 0

Rémi Bernon : imm32: Use INPUTCONTEXT directly in ImmGetOpenStatus.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 0af582947632fd827bd0edeb348aa29162e3c470 URL: https://gitlab.winehq.org/wine/wine/-/commit/0af582947632fd827bd0edeb348aa2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 7 21:27:00 2023 +0200 imm32: Use INPUTCONTEXT directly in ImmGetOpenStatus. --- dlls/imm32/imm.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 268d9142732..753213b623f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1919,20 +1919,18 @@ UINT WINAPI ImmGetIMEFileNameW( HKL hkl, WCHAR *buffer, UINT length ) /*********************************************************************** * ImmGetOpenStatus (IMM32.@) */ -BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) +BOOL WINAPI ImmGetOpenStatus( HIMC himc ) { - struct imc *data = get_imc_data( hIMC ); - static int i; + INPUTCONTEXT *ctx; + BOOL status; - if (!data) - return FALSE; - - TRACE("(%p): semi-stub\n", hIMC); + TRACE( "himc %p\n", himc ); - if (!i++) - FIXME("(%p): semi-stub\n", hIMC); + if (!(ctx = ImmLockIMC( himc ))) return FALSE; + status = ctx->fOpen; + ImmUnlockIMC( himc ); - return data->IMC.fOpen; + return status; } /***********************************************************************

1 0

Rémi Bernon : imm32: Serialize ImeInquire / ImeDestroy calls.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 3cd1dc5273b9118e54ac113b52336da0f17e5f32 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cd1dc5273b9118e54ac113b52336d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 3 11:33:24 2023 +0200 imm32: Serialize ImeInquire / ImeDestroy calls. --- dlls/imm32/imm.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 25d1df47a1c..268d9142732 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -441,11 +441,14 @@ BOOL WINAPI ImmFreeLayout( HKL hkl ) EnterCriticalSection( &ime_cs ); if ((ime = find_ime_from_hkl( hkl )) && ime->refcount) ime = NULL; - if (ime) list_remove( &ime->entry ); + if (ime) + { + list_remove( &ime->entry ); + if (!ime->pImeDestroy( 0 )) WARN( "ImeDestroy failed\n" ); + } LeaveCriticalSection( &ime_cs ); if (!ime) return TRUE; - if (!ime->pImeDestroy( 0 )) WARN( "ImeDestroy failed\n" ); FreeLibrary( ime->module ); free( ime ); return TRUE; @@ -460,12 +463,11 @@ BOOL WINAPI ImmLoadIME( HKL hkl ) TRACE( "hkl %p\n", hkl ); EnterCriticalSection( &ime_cs ); - ime = find_ime_from_hkl( hkl ); - LeaveCriticalSection( &ime_cs ); - if (ime) return TRUE; - - if (!(ime = calloc( 1, sizeof(*ime) ))) return FALSE; - ime->hkl = hkl; + if ((ime = find_ime_from_hkl( hkl )) || !(ime = calloc( 1, sizeof(*ime) ))) + { + LeaveCriticalSection( &ime_cs ); + return !!ime; + } if (!ImmGetIMEFileNameW( hkl, buffer, MAX_PATH )) use_default_ime = TRUE; else if (!(ime->module = LoadLibraryW( buffer ))) use_default_ime = TRUE; @@ -481,6 +483,7 @@ BOOL WINAPI ImmLoadIME( HKL hkl ) if (!(ime->p##f = (void *)GetProcAddress( ime->module, #f )) && \ !(ime->p##f = use_default_ime ? (void *)f : NULL)) \ { \ + LeaveCriticalSection( &ime_cs ); \ WARN( "Can't find function %s in HKL %p IME\n", #f, hkl ); \ goto failed; \ } @@ -502,12 +505,16 @@ BOOL WINAPI ImmLoadIME( HKL hkl ) LOAD_FUNCPTR( ImeGetImeMenuItems ); #undef LOAD_FUNCPTR - if (!ime->pImeInquire( &ime->info, buffer, 0 )) goto failed; + ime->hkl = hkl; + if (!ime->pImeInquire( &ime->info, buffer, 0 )) + { + LeaveCriticalSection( &ime_cs ); + goto failed; + } if (ime_is_unicode( ime )) lstrcpynW( ime->ui_class, buffer, ARRAY_SIZE(ime->ui_class) ); else MultiByteToWideChar( CP_ACP, 0, (char *)buffer, -1, ime->ui_class, ARRAY_SIZE(ime->ui_class) ); - EnterCriticalSection( &ime_cs ); list_add_tail( &ime_list, &ime->entry ); LeaveCriticalSection( &ime_cs );

1 0

Rémi Bernon : imm32/tests: Reduce the number of IME installations.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 152d6e8b2760fc316b1fa06e97b225c536275a63 URL: https://gitlab.winehq.org/wine/wine/-/commit/152d6e8b2760fc316b1fa06e97b225… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 8 08:53:26 2023 +0200 imm32/tests: Reduce the number of IME installations. --- dlls/imm32/tests/imm32.c | 184 +++++++++++++++++++++-------------------------- 1 file changed, 81 insertions(+), 103 deletions(-)

1 0

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

April 11, 2023

Module: wine Branch: master Commit: d70a652da8b67ae78e4cac7b5731fd4806074fcf URL: https://gitlab.winehq.org/wine/wine/-/commit/d70a652da8b67ae78e4cac7b5731fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 14:08:41 2023 +0200 msvcrt: Use the _dclass()/_fdclass() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fc9c44dbf5..a4d53934c04 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -207,36 +207,6 @@ float CDECL _chgsignf( float num ) #endif -/********************************************************************* - * _fdclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassifyf.c - */ -short CDECL _fdclass(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - -/********************************************************************* - * _dclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassify.c - */ -short CDECL _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - #ifndef __i386__ /********************************************************************* @@ -291,6 +261,8 @@ float CDECL MSVCRT_atanf( float x ) #endif #ifdef __x86_64__ +extern short CDECL _fdclass(float x); + static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -411,6 +383,8 @@ double CDECL MSVCRT_exp( double x ) #endif #if defined(__x86_64__) || defined(__i386__) +extern short CDECL _dclass(double x); + static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x);

1 0

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

April 11, 2023

Module: wine Branch: master Commit: 75eb9877688b074642457caa2ccc959ea2d30d47 URL: https://gitlab.winehq.org/wine/wine/-/commit/75eb9877688b074642457caa2ccc95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 13:53:09 2023 +0200 msvcrt: Use the sqrt() 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 | 107 +++----------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- libs/musl/src/math/sqrt.c | 2 +- 13 files changed, 18 insertions(+), 115 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 98d729b9eb1..c9aa44fcf91 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -468,7 +468,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c969c9d307..3ebbe6cef16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1790,7 +1790,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a071b0ead42..1032c9e4c7a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2148,7 +2148,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3a502f9a8fe..ca11ea4b49d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2359,7 +2359,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index fe281841198..253df1cdbd8 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -816,7 +816,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ed9de904884..5f3bf499ad4 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -811,7 +811,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2c3faa2233e..9b040615693 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1471,7 +1471,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 11fa5fc1f61..e9043c8c926 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1443,7 +1443,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9d020e1f20d..7fc9c44dbf5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -77,12 +77,14 @@ void msvcrt_init_math( void *module ) #endif } +#if defined(__i386__) || defined(__x86_64__) static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; return (x - x) / (x - x); } +#endif #define SET_X87_CW(MASK) \ "subl $4, %esp\n\t" \ @@ -408,6 +410,7 @@ double CDECL MSVCRT_exp( double x ) } #endif +#if defined(__x86_64__) || defined(__i386__) static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); @@ -433,7 +436,6 @@ static BOOL sqrt_validate( double *x, BOOL update_sw ) return TRUE; } -#if defined(__x86_64__) || defined(__i386__) double CDECL sse2_sqrt(double); __ASM_GLOBAL_FUNC( sse2_sqrt, "sqrtsd %xmm0, %xmm0\n\t" @@ -452,10 +454,8 @@ __ASM_GLOBAL_FUNC( x87_sqrt, /********************************************************************* * sqrt (MSVCRT.@) - * - * Copied from musl: src/math/sqrt.c */ -double CDECL sqrt( double x ) +double CDECL MSVCRT_sqrt( double x ) { #ifdef __x86_64__ if (!sqrt_validate(&x, TRUE)) @@ -468,104 +468,7 @@ double CDECL sqrt( double x ) return x87_sqrt(x); #else - static const double tiny = 1.0e-300; - - double z; - int sign = 0x80000000; - int ix0,s0,q,m,t,i; - unsigned int r,t1,s1,ix1,q1; - ULONGLONG ix; - - if (!sqrt_validate(&x, TRUE)) - return x; - - ix = *(ULONGLONG*)&x; - ix0 = ix >> 32; - ix1 = ix; - - /* normalize x */ - m = ix0 >> 20; - if (m == 0) { /* subnormal x */ - while (ix0 == 0) { - m -= 21; - ix0 |= (ix1 >> 11); - ix1 <<= 21; - } - for (i=0; (ix0 & 0x00100000) == 0; i++) - ix0 <<= 1; - m -= i - 1; - ix0 |= ix1 >> (32 - i); - ix1 <<= i; - } - m -= 1023; /* unbias exponent */ - ix0 = (ix0 & 0x000fffff) | 0x00100000; - if (m & 1) { /* odd m, double x to make it even */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - } - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ - r = 0x00200000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s0 + r; - if (t <= ix0) { - s0 = t + r; - ix0 -= t; - q += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - r = sign; - while (r != 0) { - t1 = s1 + r; - t = s0; - if (t < ix0 || (t == ix0 && t1 <= ix1)) { - s1 = t1 + r; - if ((t1&sign) == sign && (s1 & sign) == 0) - s0++; - ix0 -= t; - if (ix1 < t1) - ix0--; - ix1 -= t1; - q1 += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if ((ix0 | ix1) != 0) { - z = 1.0 - tiny; /* raise inexact flag */ - if (z >= 1.0) { - z = 1.0 + tiny; - if (q1 == (unsigned int)0xffffffff) { - q1 = 0; - q++; - } else if (z > 1.0) { - if (q1 == (unsigned int)0xfffffffe) - q++; - q1 += 2; - } else - q1 += q1 & 1; - } - } - ix0 = (q >> 1) + 0x3fe00000; - ix1 = q1 >> 1; - if (q & 1) - ix1 |= sign; - ix = ix0 + ((unsigned int)m << 20); - ix <<= 32; - ix |= ix1; - return *(double*)&ix; + return sqrt( x ); #endif } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7e0d3d62ba4..22da5acfcce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1422,7 +1422,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index e1f9e0a6cf3..2ab89d244cc 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -769,7 +769,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7394e3cc5d0..cad6cf1c381 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1778,7 +1778,7 @@ @ cdecl -arch=!i386 _o_sinf(float) sinf @ cdecl _o_sinh(double) sinh @ cdecl -arch=!i386 _o_sinhf(float) sinhf -@ cdecl _o_sqrt(double) sqrt +@ cdecl _o_sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ cdecl _o_srand(long) srand @ cdecl _o_strcat_s(str long str) strcat_s @@ -2494,7 +2494,7 @@ @ cdecl -arch=!i386 sinf(float) @ cdecl sinh(double) @ cdecl -arch=!i386 sinhf(float) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) diff --git a/libs/musl/src/math/sqrt.c b/libs/musl/src/math/sqrt.c index f0185ec855e..beee70a42b3 100644 --- a/libs/musl/src/math/sqrt.c +++ b/libs/musl/src/math/sqrt.c @@ -35,7 +35,7 @@ double __cdecl sqrt(double x) if (ix == 0x7ff0000000000000) return x; if (ix > 0x7ff0000000000000) - return __math_invalid(x); + return math_error(_DOMAIN, "sqrt", x, 0, (x - x) / (x - x)); /* x is subnormal, normalize it. */ ix = asuint64(x * 0x1p52); top = ix >> 52;

1 0

Paul Gofman : winex11.drv: Fix bit shifts in pixel format description for RGBA formats.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 01c59b3f18dca1f4db42425eda2f95296da61a63 URL: https://gitlab.winehq.org/wine/wine/-/commit/01c59b3f18dca1f4db42425eda2f95… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 10 16:20:38 2023 -0600 winex11.drv: Fix bit shifts in pixel format description for RGBA formats. --- dlls/opengl32/tests/opengl.c | 15 ++++++++++++++- dlls/winex11.drv/opengl.c | 13 ++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index fca0aea73e7..ca66818c408 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -288,7 +288,20 @@ static void test_choosepixelformat(void) pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 32; - ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, &ret_fmt), "Simple pfd failed\n" ); + ok( ret_fmt.cColorBits == 32, "Got %u.\n", ret_fmt.cColorBits ); + ok( !ret_fmt.cBlueShift, "Got %u.\n", ret_fmt.cBlueShift ); + ok( ret_fmt.cBlueBits == 8, "Got %u.\n", ret_fmt.cBlueBits ); + ok( ret_fmt.cRedBits == 8, "Got %u.\n", ret_fmt.cRedBits ); + ok( ret_fmt.cGreenBits == 8, "Got %u.\n", ret_fmt.cGreenBits ); + ok( ret_fmt.cGreenShift == 8, "Got %u.\n", ret_fmt.cGreenShift ); + ok( ret_fmt.cRedShift == 16, "Got %u.\n", ret_fmt.cRedShift ); + ok( !ret_fmt.cAlphaBits || ret_fmt.cAlphaBits == 8, "Got %u.\n", ret_fmt.cAlphaBits ); + if (ret_fmt.cAlphaBits) + ok( ret_fmt.cAlphaShift == 24, "Got %u.\n", ret_fmt.cAlphaShift ); + else + ok( !ret_fmt.cAlphaShift, "Got %u.\n", ret_fmt.cAlphaShift ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8c1ab90595a..aadc0b99cd1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1601,14 +1601,17 @@ static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_BLUE_SIZE, &bb); pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ALPHA_SIZE, &ab); - ppfd->cRedBits = rb; - ppfd->cRedShift = gb + bb + ab; ppfd->cBlueBits = bb; - ppfd->cBlueShift = ab; + ppfd->cBlueShift = 0; ppfd->cGreenBits = gb; - ppfd->cGreenShift = bb + ab; + ppfd->cGreenShift = bb; + ppfd->cRedBits = rb; + ppfd->cRedShift = gb + bb; ppfd->cAlphaBits = ab; - ppfd->cAlphaShift = 0; + if (ab) + ppfd->cAlphaShift = rb + gb + bb; + else + ppfd->cAlphaShift = 0; } else { ppfd->cRedBits = 0; ppfd->cRedShift = 0;

1 0

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

April 11, 2023

Module: wine Branch: master Commit: 20c53e72c9f1e8c3290d9026ddfc884c5c5c1b98 URL: https://gitlab.winehq.org/wine/wine/-/commit/20c53e72c9f1e8c3290d9026ddfc88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 13:44:42 2023 +0200 msvcrt: Use the sqrtf() implementation from the bundled musl library. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 62 +++------------------------------------------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- libs/musl/src/math/sqrtf.c | 2 +- 9 files changed, 12 insertions(+), 68 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6ef7befa344..3c969c9d307 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1791,7 +1791,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bd44b4476cd..a071b0ead42 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2149,7 +2149,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d4757be4a6f..3a502f9a8fe 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2360,7 +2360,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a1273d7d995..2c3faa2233e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1472,7 +1472,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e199475aa30..11fa5fc1f61 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1444,7 +1444,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f2d39076fd3..9d020e1f20d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -288,6 +288,7 @@ float CDECL MSVCRT_atanf( float x ) } #endif +#ifdef __x86_64__ static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -303,7 +304,6 @@ static BOOL sqrtf_validate( float *x ) return TRUE; } -#if defined(__x86_64__) || defined(__i386__) float CDECL sse2_sqrtf(float); __ASM_GLOBAL_FUNC( sse2_sqrtf, "sqrtss %xmm0, %xmm0\n\t" @@ -312,10 +312,8 @@ __ASM_GLOBAL_FUNC( sse2_sqrtf, /********************************************************************* * sqrtf (MSVCRT.@) - * - * Copied from musl: src/math/sqrtf.c */ -float CDECL sqrtf( float x ) +float CDECL MSVCRT_sqrtf( float x ) { #ifdef __x86_64__ if (!sqrtf_validate(&x)) @@ -323,61 +321,7 @@ float CDECL sqrtf( float x ) return sse2_sqrtf(x); #else - static const float tiny = 1.0e-30; - - float z; - int ix,s,q,m,t,i; - unsigned int r; - - ix = *(int*)&x; - - if (!sqrtf_validate(&x)) - return x; - - /* normalize x */ - m = ix >> 23; - if (m == 0) { /* subnormal x */ - for (i = 0; (ix & 0x00800000) == 0; i++) - ix <<= 1; - m -= i - 1; - } - m -= 127; /* unbias exponent */ - ix = (ix & 0x007fffff) | 0x00800000; - if (m & 1) /* odd m, double x to make it even */ - ix += ix; - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix += ix; - q = s = 0; /* q = sqrt(x) */ - r = 0x01000000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s + r; - if (t <= ix) { - s = t + r; - ix -= t; - q += r; - } - ix += ix; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if (ix != 0) { - z = 1.0f - tiny; /* raise inexact flag */ - if (z >= 1.0f) { - z = 1.0f + tiny; - if (z > 1.0f) - q += 2; - else - q += q & 1; - } - } - ix = (q >> 1) + 0x3f000000; - r = ix + ((unsigned int)m << 23); - z = *(float*)&r; - return z; + return sqrtf( x ); #endif } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3566e1e4728..7e0d3d62ba4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 258a1aa945a..7394e3cc5d0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1779,7 +1779,7 @@ @ cdecl _o_sinh(double) sinh @ cdecl -arch=!i386 _o_sinhf(float) sinhf @ cdecl _o_sqrt(double) sqrt -@ cdecl -arch=!i386 _o_sqrtf(float) sqrtf +@ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ cdecl _o_srand(long) srand @ cdecl _o_strcat_s(str long str) strcat_s @ cdecl _o_strcoll(str str) strcoll @@ -2495,7 +2495,7 @@ @ cdecl sinh(double) @ cdecl -arch=!i386 sinhf(float) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) diff --git a/libs/musl/src/math/sqrtf.c b/libs/musl/src/math/sqrtf.c index d22a2a26141..45559f0bb66 100644 --- a/libs/musl/src/math/sqrtf.c +++ b/libs/musl/src/math/sqrtf.c @@ -24,7 +24,7 @@ float __cdecl sqrtf(float x) if (ix == 0x7f800000) return x; if (ix > 0x7f800000) - return __math_invalidf(x); + return math_error(_DOMAIN, "sqrtf", x, 0, (x - x) / (x - x)); /* x is subnormal, normalize it. */ ix = asuint(x * 0x1p23f); ix -= 23 << 23;

1 0

Stefan Dösinger : include: X86 msvc has _InterlockedExchangePointer and _InterlockedCompareExchangePointer.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 64eed89a537faaf57da3cad0cd4681b8e0128c13 URL: https://gitlab.winehq.org/wine/wine/-/commit/64eed89a537faaf57da3cad0cd4681… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 28 16:27:15 2023 +0300 include: X86 msvc has _InterlockedExchangePointer and _InterlockedCompareExchangePointer. I fixed this issue in ad05f33d67, but a40973f20 regressed this again. I was carrying a patch for quite a while, feeling dejavu. According to boost they are available since MSVC 2015. I don't have old versions of msvc hanging around, and we don't put much value in keeping old versions working, so just use them unconditionally. --- include/winnt.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e15ac364ef2..15c254fbcff 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6541,8 +6541,10 @@ typedef enum _FIRMWARE_TYPE #pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6556,10 +6558,12 @@ BOOLEAN _BitScanReverse(unsigned long*,unsigned long); long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*); long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +void * _InterlockedExchangePointer(void *volatile*,void*); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6569,19 +6573,15 @@ DECLSPEC_NORETURN void __fastfail(unsigned int); #ifndef __i386__ #pragma intrinsic(_InterlockedAnd64) -#pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedDecrement64) #pragma intrinsic(_InterlockedExchangeAdd64) -#pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement64) #pragma intrinsic(_InterlockedOr64) #pragma intrinsic(_InterlockedXor64) __int64 _InterlockedAnd64(__int64 volatile *, __int64); -void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*); __int64 _InterlockedDecrement64(__int64 volatile *); __int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); -void * _InterlockedExchangePointer(void *volatile*,void*); __int64 _InterlockedIncrement64(__int64 volatile *); __int64 _InterlockedOr64(__int64 volatile *, __int64); __int64 _InterlockedXor64(__int64 volatile *, __int64); @@ -6595,11 +6595,6 @@ static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val return prev; } -static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) -{ - return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); -} - static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __int64 val ) { __int64 prev; @@ -6607,11 +6602,6 @@ static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __i return prev; } -static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) -{ - return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); -} - static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest ) { return InterlockedExchangeAdd64( dest, 1 ) + 1;

1 0

Alexandre Julliard : msvcrt: Use the erf()/erfc()/erff()/erfcf() implementation from the bundled musl library.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: bfc3a2bdb3d189ca9221943aa606d66e692c4f89 URL: https://gitlab.winehq.org/wine/wine/-/commit/bfc3a2bdb3d189ca9221943aa606d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 18:00:27 2023 +0200 msvcrt: Use the erf()/erfc()/erff()/erfcf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 369 ---------------------------------------------- libs/musl/src/math/erf.c | 5 +- libs/musl/src/math/erff.c | 5 +- 3 files changed, 8 insertions(+), 371 deletions(-)

1 0