- Wine-Commits - list.winehq.org

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

April 6, 2023

Module: wine Branch: master Commit: 248a17377cd535afed8ae611ce7d8401815e3629 URL: https://gitlab.winehq.org/wine/wine/-/commit/248a17377cd535afed8ae611ce7d84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:41:52 2023 +0200 msvcrt: Use the coshf() implementation from the bundled musl library. With the changes from 361143252bf23b6f29eead49a3715fdd6d552e8a. --- dlls/msvcrt/math.c | 39 --------------------------------------- libs/musl/src/math/coshf.c | 5 +++++ 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f368790f3d4..1c6fd5d7d70 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -985,45 +985,6 @@ float CDECL cosf( float x ) extern float __expo2f(float x, float sign); -/********************************************************************* - * coshf (MSVCRT.@) - * - * Copied from musl: src/math/coshf.c - */ -float CDECL coshf( float x ) -{ - UINT32 ui = *(UINT32*)&x; - UINT32 sign = ui & 0x80000000; - float t; - - /* |x| */ - ui &= 0x7fffffff; - x = *(float*)&ui; - - /* |x| < log(2) */ - if (ui < 0x3f317217) { - if (ui < 0x3f800000 - (12 << 23)) { - fp_barrierf(x + 0x1p120f); - return 1; - } - t = expm1f(x); - return 1 + t * t / (2 * (1 + t)); - } - - /* |x| < log(FLT_MAX) */ - if (ui < 0x42b17217) { - t = expf(x); - return 0.5f * (t + 1 / t); - } - - /* |x| > log(FLT_MAX) or nan */ - if (ui > 0x7f800000) - *(UINT32*)&t = ui | sign | 0x400000; - else - t = __expo2f(x, 1.0f); - return t; -} - /********************************************************************* * expf (MSVCRT.@) */ diff --git a/libs/musl/src/math/coshf.c b/libs/musl/src/math/coshf.c index 2fc004682da..44f29113559 100644 --- a/libs/musl/src/math/coshf.c +++ b/libs/musl/src/math/coshf.c @@ -3,6 +3,7 @@ float __cdecl coshf(float x) { union {float f; uint32_t i;} u = {.f = x}; + uint32_t sign = u.i & 0x80000000; uint32_t w; float t; @@ -28,6 +29,10 @@ float __cdecl coshf(float x) } /* |x| > log(FLT_MAX) or nan */ + if (w > 0x7f800000) { + u.i |= sign | 0x400000; + return u.f; + } t = __expo2f(x, 1.0f); return t; }

1 0

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

April 6, 2023

Module: wine Branch: master Commit: 66bef6db20f72e88a38c4b264e13639015d7817d URL: https://gitlab.winehq.org/wine/wine/-/commit/66bef6db20f72e88a38c4b264e1363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:43:10 2023 +0200 msvcrt: Use the sinhf() implementation from the bundled musl library. With the changes from 4fd9daea4a79d0826c9e5ab6466291043e40d579. --- dlls/msvcrt/math.c | 36 ------------------------------------ libs/musl/src/math/sinhf.c | 5 +++++ 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1c6fd5d7d70..9741100b2b9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -983,8 +983,6 @@ float CDECL cosf( float x ) } } -extern float __expo2f(float x, float sign); - /********************************************************************* * expf (MSVCRT.@) */ @@ -1277,40 +1275,6 @@ float CDECL sinf( float x ) } } -/********************************************************************* - * sinhf (MSVCRT.@) - */ -float CDECL sinhf( float x ) -{ - UINT32 ui = *(UINT32*)&x; - float t, h, absx; - - h = 0.5; - if (ui >> 31) - h = -h; - /* |x| */ - ui &= 0x7fffffff; - absx = *(float*)&ui; - - /* |x| < log(FLT_MAX) */ - if (ui < 0x42b17217) { - t = expm1f(absx); - if (ui < 0x3f800000) { - if (ui < 0x3f800000 - (12 << 23)) - return x; - return h * (2 * t - t * t / (t + 1)); - } - return h * (t + t / (t + 1)); - } - - /* |x| > logf(FLT_MAX) or nan */ - if (ui > 0x7f800000) - *(DWORD*)&t = *(DWORD*)&x | 0x400000; - else - t = __expo2f(absx, 2 * h); - return t; -} - static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); diff --git a/libs/musl/src/math/sinhf.c b/libs/musl/src/math/sinhf.c index a9abf634e85..60bca2b5a36 100644 --- a/libs/musl/src/math/sinhf.c +++ b/libs/musl/src/math/sinhf.c @@ -3,6 +3,7 @@ float __cdecl sinhf(float x) { union {float f; uint32_t i;} u = {.f = x}; + uint32_t sign = u.i & 0x80000000; uint32_t w; float t, h, absx; @@ -26,6 +27,10 @@ float __cdecl sinhf(float x) } /* |x| > logf(FLT_MAX) or nan */ + if (w > 0x7f800000) { + u.i = w | sign | 0x400000; + return u.f; + } t = __expo2f(absx, 2*h); return t; }

1 0

Alexandre Julliard : msvcrt: Use the log()/logf() implementation from the bundled musl library.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: f0c700502a7adc34c7f83d5d9650947363f59034 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0c700502a7adc34c7f83d5d965094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 16:32:12 2023 +0200 msvcrt: Use the log()/logf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 454 ---------------------------------------------- libs/musl/src/math/log.c | 8 +- libs/musl/src/math/logf.c | 8 +- 3 files changed, 10 insertions(+), 460 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the log10()/log10f() implementation from the bundled musl library.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: c53bd233f0bc79eb5260f8da79781b8892443163 URL: https://gitlab.winehq.org/wine/wine/-/commit/c53bd233f0bc79eb5260f8da79781b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 16:32:31 2023 +0200 msvcrt: Use the log10()/log10f() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 146 -------------------------------------------- libs/musl/src/math/log10.c | 8 ++- libs/musl/src/math/log10f.c | 6 +- 3 files changed, 9 insertions(+), 151 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c35d997ef52..425eccb9c9e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1084,69 +1084,6 @@ float CDECL expf( float x ) return y; } -/********************************************************************* - * log10f (MSVCRT.@) - */ -float CDECL log10f( float x ) -{ - static const float ivln10hi = 4.3432617188e-01, - ivln10lo = -3.1689971365e-05, - log10_2hi = 3.0102920532e-01, - log10_2lo = 7.9034151668e-07, - Lg1 = 0xaaaaaa.0p-24, - Lg2 = 0xccce13.0p-25, - Lg3 = 0x91e9ee.0p-25, - Lg4 = 0xf89e26.0p-26; - - union {float f; UINT32 i;} u = {x}; - float hfsq, f, s, z, R, w, t1, t2, dk, hi, lo; - UINT32 ix; - int k; - - ix = u.i; - k = 0; - if (ix < 0x00800000 || ix >> 31) { /* x < 2**-126 */ - if (ix << 1 == 0) - return math_error(_SING, "log10f", x, 0, -1 / (x * x)); - if ((ix & ~(1u << 31)) > 0x7f800000) - return x; - if (ix >> 31) - return math_error(_DOMAIN, "log10f", x, 0, (x - x) / (x - x)); - /* subnormal number, scale up x */ - k -= 25; - x *= 0x1p25f; - u.f = x; - ix = u.i; - } else if (ix >= 0x7f800000) { - return x; - } else if (ix == 0x3f800000) - return 0; - - /* reduce x into [sqrt(2)/2, sqrt(2)] */ - ix += 0x3f800000 - 0x3f3504f3; - k += (int)(ix >> 23) - 0x7f; - ix = (ix & 0x007fffff) + 0x3f3504f3; - u.i = ix; - x = u.f; - - f = x - 1.0f; - s = f / (2.0f + f); - z = s * s; - w = z * z; - t1= w * (Lg2 + w * Lg4); - t2= z * (Lg1 + w * Lg3); - R = t2 + t1; - hfsq = 0.5f * f * f; - - hi = f - hfsq; - u.f = hi; - u.i &= 0xfffff000; - hi = u.f; - lo = f - hi - hfsq + s * (hfsq + R); - dk = k; - return dk * log10_2lo + (lo + hi) * ivln10lo + lo * ivln10hi + hi * ivln10hi + dk * log10_2hi; -} - /* Subnormal input is normalized so ix has negative biased exponent. Output is multiplied by POWF_SCALE (where 1 << 5). */ static double powf_log2(UINT32 ix) @@ -2599,89 +2536,6 @@ double CDECL exp( double x ) return scale + scale * tmp; } -/********************************************************************* - * log10 (MSVCRT.@) - */ -double CDECL log10( double x ) -{ - static const double ivln10hi = 4.34294481878168880939e-01, - ivln10lo = 2.50829467116452752298e-11, - log10_2hi = 3.01029995663611771306e-01, - log10_2lo = 3.69423907715893078616e-13, - Lg1 = 6.666666666666735130e-01, - Lg2 = 3.999999999940941908e-01, - Lg3 = 2.857142874366239149e-01, - Lg4 = 2.222219843214978396e-01, - Lg5 = 1.818357216161805012e-01, - Lg6 = 1.531383769920937332e-01, - Lg7 = 1.479819860511658591e-01; - - union {double f; UINT64 i;} u = {x}; - double hfsq, f, s, z, R, w, t1, t2, dk, y, hi, lo, val_hi, val_lo; - UINT32 hx; - int k; - - hx = u.i >> 32; - k = 0; - if (hx < 0x00100000 || hx >> 31) { - if (u.i << 1 == 0) - return math_error(_SING, "log10", x, 0, -1 / (x * x)); - if ((u.i & ~(1ULL << 63)) > 0x7ff0000000000000ULL) - return x; - if (hx >> 31) - return math_error(_DOMAIN, "log10", x, 0, (x - x) / (x - x)); - /* subnormal number, scale x up */ - k -= 54; - x *= 0x1p54; - u.f = x; - hx = u.i >> 32; - } else if (hx >= 0x7ff00000) { - return x; - } else if (hx == 0x3ff00000 && u.i<<32 == 0) - return 0; - - /* reduce x into [sqrt(2)/2, sqrt(2)] */ - hx += 0x3ff00000 - 0x3fe6a09e; - k += (int)(hx >> 20) - 0x3ff; - hx = (hx & 0x000fffff) + 0x3fe6a09e; - u.i = (UINT64)hx << 32 | (u.i & 0xffffffff); - x = u.f; - - f = x - 1.0; - hfsq = 0.5 * f * f; - s = f / (2.0 + f); - z = s * s; - w = z * z; - t1 = w * (Lg2 + w * (Lg4 + w * Lg6)); - t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7))); - R = t2 + t1; - - /* hi+lo = f - hfsq + s*(hfsq+R) ~ log(1+f) */ - hi = f - hfsq; - u.f = hi; - u.i &= (UINT64)-1 << 32; - hi = u.f; - lo = f - hi - hfsq + s * (hfsq + R); - - /* val_hi+val_lo ~ log10(1+f) + k*log10(2) */ - val_hi = hi * ivln10hi; - dk = k; - y = dk * log10_2hi; - val_lo = dk * log10_2lo + (lo + hi) * ivln10lo + lo * ivln10hi; - - /* - * Extra precision in for adding y is not strictly needed - * since there is no very large cancellation near x = sqrt(2) or - * x = 1/sqrt(2), but we do it anyway since it costs little on CPUs - * with some parallelism and it reduces the error for many args. - */ - w = y + val_hi; - val_lo += (y - w) + val_hi; - val_hi = w; - - return val_lo + val_hi; -} - /* Compute y+TAIL = log(x) where the rounded result is y and TAIL has about additional 15 bits precision. IX is the bit representation of x, but normalized in the subnormal range using the sign bit for the exponent. */ diff --git a/libs/musl/src/math/log10.c b/libs/musl/src/math/log10.c index df7d591c292..6ec431bfe22 100644 --- a/libs/musl/src/math/log10.c +++ b/libs/musl/src/math/log10.c @@ -45,9 +45,11 @@ double __cdecl log10(double x) k = 0; if (hx < 0x00100000 || hx>>31) { if (u.i<<1 == 0) - return -1/(x*x); /* log(+-0)=-inf */ - if (hx>>31) - return (x-x)/0.0; /* log(-#) = NaN */ + return math_error(_SING, "log10", x, 0, -1 / (x * x)); + if ((u.i & ~(1ULL << 63)) > 0x7ff0000000000000ULL) + return x; + if (hx >> 31) + return math_error(_DOMAIN, "log10", x, 0, (x - x) / (x - x)); /* subnormal number, scale x up */ k -= 54; x *= 0x1p54; diff --git a/libs/musl/src/math/log10f.c b/libs/musl/src/math/log10f.c index 64cf8c85be0..0233e2ff332 100644 --- a/libs/musl/src/math/log10f.c +++ b/libs/musl/src/math/log10f.c @@ -39,9 +39,11 @@ float __cdecl log10f(float x) k = 0; if (ix < 0x00800000 || ix>>31) { /* x < 2**-126 */ if (ix<<1 == 0) - return -1/(x*x); /* log(+-0)=-inf */ + return math_error(_SING, "log10f", x, 0, -1 / (x * x)); + if ((ix & ~(1u << 31)) > 0x7f800000) + return x; if (ix>>31) - return (x-x)/0.0f; /* log(-#) = NaN */ + return math_error(_DOMAIN, "log10f", x, 0, (x - x) / (x - x)); /* subnormal number, scale up x */ k -= 25; x *= 0x1p25f;

1 0

Alexandre Julliard : msvcrt: Use the __expo2()/__expo2f() implementation from the bundled musl library.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: bbc8c347356e19c39572061f295818d29f341ec4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbc8c347356e19c39572061f295818… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 17:39:15 2023 +0200 msvcrt: Use the __expo2()/__expo2f() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 425eccb9c9e..f368790f3d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -983,16 +983,7 @@ float CDECL cosf( float x ) } } -/* Copied from musl: src/math/__expo2f.c */ -static float __expo2f(float x, float sign) -{ - static const int k = 235; - static const float kln2 = 0x1.45c778p+7f; - float scale; - - *(UINT32*)&scale = (UINT32)(0x7f + k/2) << 23; - return expf(x - kln2) * (sign * scale) * scale; -} +extern float __expo2f(float x, float sign); /********************************************************************* * coshf (MSVCRT.@) @@ -2237,15 +2228,7 @@ double CDECL cos( double x ) } } -static double __expo2(double x, double sign) -{ - static const int k = 2043; - static const double kln2 = 0x1.62066151add8bp+10; - double scale; - - *(UINT64*)&scale = (UINT64)(0x3ff + k / 2) << 52; - return exp(x - kln2) * (sign * scale) * scale; -} +extern double __expo2(double x, double sign); /********************************************************************* * cosh (MSVCRT.@)

1 0

Rémi Bernon : dinput/tests: Mark some tests as flaky to work around fvwm bug.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 3fad9cac5bd9ee69e0f1d37881aaf8f4c6fc40ba URL: https://gitlab.winehq.org/wine/wine/-/commit/3fad9cac5bd9ee69e0f1d37881aaf8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 6 10:06:45 2023 +0200 dinput/tests: Mark some tests as flaky to work around fvwm bug. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54594 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54713 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54774 --- dlls/dinput/tests/device8.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index a649fe53b41..523c2506a39 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -395,11 +395,13 @@ void test_overlapped_format( DWORD version ) /* press D */ keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE, 0 ); res = WaitForSingleObject( event, 5000 ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res ); count = 10; hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( count == 1, "got count %lu\n", count ); memset( &state, 0xFF, sizeof(state) ); @@ -415,11 +417,13 @@ void test_overlapped_format( DWORD version ) /* release D */ keybd_event( 0, DIK_D, KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, 0 ); res = WaitForSingleObject( event, 5000 ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", res ); count = 10; hr = IDirectInputDevice_GetDeviceData( keyboard, data_size, NULL, &count, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( count == 1, "got count %lu\n", count ); @@ -682,14 +686,19 @@ static void test_mouse_keyboard(void) IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_FOREGROUND|DISCL_EXCLUSIVE); hr = IDirectInputDevice8_Acquire(di_keyboard); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); hr = IDirectInputDevice8_Acquire(di_mouse); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); raw_devices_count = ARRAY_SIZE(raw_devices); memset(raw_devices, 0, sizeof(raw_devices)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(hr == 3, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(raw_devices[0].dwFlags == (RIDEV_CAPTUREMOUSE|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); + flaky_wine_if( GetForegroundWindow() != hwnd ) /* FIXME: fvwm sometimes steals input focus */ ok(raw_devices[2].dwFlags == (RIDEV_NOHOTKEYS|RIDEV_NOLEGACY), "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); hr = IDirectInputDevice8_Unacquire(di_keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %#lx\n", hr); @@ -1581,7 +1590,7 @@ cleanup: localized = old_localized; } -static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd ) +static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd, DWORD version ) { static const struct key2dik { @@ -1685,6 +1694,7 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn keybd_event( vkey, scan, KEYEVENTF_KEYUP, 0 ); res = WaitForSingleObject( event, 5000 ); + flaky_wine_if( GetForegroundWindow() != hwnd && version == 0x800 ) /* FIXME: fvwm sometimes steals input focus */ ok( !res, "WaitForSingleObject returned %#lx\n", res ); winetest_pop_context(); @@ -2190,7 +2200,7 @@ skip_key_tests: ActivateKeyboardLayout( old_hkl, 0 ); UnloadKeyboardLayout( hkl ); - test_dik_codes( device, event, hwnd ); + test_dik_codes( device, event, hwnd, version ); CloseHandle( event ); DestroyWindow( hwnd );

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionGraphicsDevice definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 048b0421ffa3e31dccfdd4ff6cd25b18a8857e5f URL: https://gitlab.winehq.org/wine/wine/-/commit/048b0421ffa3e31dccfdd4ff6cd25b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 21:01:47 2023 -0400 include: Add Windows.UI.Composition.CompositionGraphicsDevice definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index b3919711934..92ca136c05a 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -68,6 +68,10 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunctionStatics; interface ICompositionEffectBrush; interface ICompositionEffectFactory; + interface ICompositionGraphicsDevice; + interface ICompositionGraphicsDevice2; + interface ICompositionGraphicsDevice3; + interface ICompositionGraphicsDevice4; interface ICompositionObject; interface ICompositionObject2; interface ICompositionObject3; @@ -102,6 +106,7 @@ namespace Windows.UI.Composition { interface IInsetClip; interface ILinearEasingFunction; interface IQuaternionKeyFrameAnimation; + interface IRenderingDeviceReplacedEventArgs; interface IScalarKeyFrameAnimation; interface ISpriteVisual; interface ISpriteVisual2; @@ -126,6 +131,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionEasingFunction; runtimeclass CompositionEffectBrush; runtimeclass CompositionEffectFactory; + runtimeclass CompositionGraphicsDevice; runtimeclass CompositionObject; runtimeclass CompositionPropertySet; runtimeclass CompositionScopedBatch; @@ -139,6 +145,7 @@ namespace Windows.UI.Composition { runtimeclass LinearEasingFunction; runtimeclass KeyFrameAnimation; runtimeclass QuaternionKeyFrameAnimation; + runtimeclass RenderingDeviceReplacedEventArgs; runtimeclass ScalarKeyFrameAnimation; runtimeclass SpriteVisual; runtimeclass Vector2KeyFrameAnimation; @@ -155,6 +162,7 @@ namespace Windows.UI.Composition { interface Windows.Foundation.Collections.IIterator<Windows.UI.Composition.CompositionAnimation *>; interface Windows.Foundation.Collections.IIterator<Windows.UI.Composition.Visual *>; interface Windows.Foundation.TypedEventHandler<IInspectable *, Windows.UI.Composition.CompositionBatchCompletedEventArgs *>; + interface Windows.Foundation.TypedEventHandler<Windows.UI.Composition.CompositionGraphicsDevice *, Windows.UI.Composition.RenderingDeviceReplacedEventArgs *>; } [ @@ -485,6 +493,24 @@ namespace Windows.UI.Composition { [propget] HRESULT LoadStatus([out, retval] Windows.UI.Composition.CompositionEffectFactoryLoadStatus *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionGraphicsDevice), + uuid(fb22c6e1-80a2-4667-9936-dbeaf6eefe95) + ] + interface ICompositionGraphicsDevice : IInspectable + { + HRESULT CreateDrawingSurface( + [in] Windows.Foundation.Size pixels, [in] Windows.Graphics.DirectX.DirectXPixelFormat format, + [in] Windows.Graphics.DirectX.DirectXAlphaMode mode, [out, retval] Windows.UI.Composition.CompositionDrawingSurface **result + ); + [eventadd] HRESULT RenderingDeviceReplaced( + [in] Windows.Foundation.TypedEventHandler<Windows.UI.Composition.CompositionGraphicsDevice *, Windows.UI.Composition.RenderingDeviceReplacedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT RenderingDeviceReplaced([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionPropertySet), @@ -729,6 +755,16 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.RenderingDeviceReplacedEventArgs), + uuid(3a31ac7d-28bf-4e7a-8524-71679d480f38) + ] + interface IRenderingDeviceReplacedEventArgs : IInspectable + { + [propget] HRESULT GraphicsDevice([out, retval] Windows.UI.Composition.CompositionGraphicsDevice **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.ScalarKeyFrameAnimation), @@ -986,6 +1022,19 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionEffectFactory; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionGraphicsDevice : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionGraphicsDevice; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice2; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice3; + [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice4; + } + [ composable(Windows.UI.Composition.ICompositionObjectFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0), @@ -1131,6 +1180,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IQuaternionKeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass RenderingDeviceReplacedEventArgs : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.IRenderingDeviceReplacedEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionDrawingSurface definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 191dbcc807b281fac7e2d01d716bb2371581062e URL: https://gitlab.winehq.org/wine/wine/-/commit/191dbcc807b281fac7e2d01d716bb2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:56:08 2023 -0400 include: Add Windows.UI.Composition.CompositionDrawingSurface definition. Needed by Windows.UI.Composition.CompositionGraphicsDevice. --- include/windows.ui.composition.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index cfe665501f7..b3919711934 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -60,6 +60,9 @@ namespace Windows.UI.Composition { interface ICompositionClipFactory; interface ICompositionColorBrush; interface ICompositionCommitBatch; + interface ICompositionDrawingSurface; + interface ICompositionDrawingSurface2; + interface ICompositionDrawingSurfaceFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; @@ -119,6 +122,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionClip; runtimeclass CompositionColorBrush; runtimeclass CompositionCommitBatch; + runtimeclass CompositionDrawingSurface; runtimeclass CompositionEasingFunction; runtimeclass CompositionEffectBrush; runtimeclass CompositionEffectFactory; @@ -419,6 +423,27 @@ namespace Windows.UI.Composition { [eventremove] HRESULT Completed([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionDrawingSurface), + uuid(a166c300-fad0-4d11-9e67-e433162ff49e) + ] + interface ICompositionDrawingSurface : IInspectable + { + [propget] HRESULT AlphaMode([out, retval] Windows.Graphics.DirectX.DirectXAlphaMode *value); + [propget] HRESULT PixelFormat([out, retval] Windows.Graphics.DirectX.DirectXPixelFormat *value); + [propget] HRESULT Size([out, retval] Windows.Foundation.Size *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.UI.Composition.CompositionDrawingSurface), + uuid(9497b00a-312d-46b9-9db3-412fd79464c8) + ] + interface ICompositionDrawingSurfaceFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -916,6 +941,19 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionCommitBatch; } + [ + composable(Windows.UI.Composition.ICompositionDrawingSurfaceFactory, public, Windows.Foundation.UniversalApiContract, 4.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionDrawingSurface : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionDrawingSurface; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionDrawingSurface2; + interface Windows.UI.Composition.ICompositionSurface; + } + [ composable(Windows.UI.Composition.ICompositionEasingFunctionFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.Vector4KeyFrameAnimation definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 62ac0262861eab1d92d479dfd070ef0d89136624 URL: https://gitlab.winehq.org/wine/wine/-/commit/62ac0262861eab1d92d479dfd070ef… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:29:07 2023 -0400 include: Add Windows.UI.Composition.Vector4KeyFrameAnimation definition. Needed by Windows.UI.Composition.Compositor. --- include/windows.ui.composition.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 23dba7d73b4..0793b8fee1c 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -77,6 +77,7 @@ namespace Windows.UI.Composition { interface ISpriteVisual2; interface IVector2KeyFrameAnimation; interface IVector3KeyFrameAnimation; + interface IVector4KeyFrameAnimation; interface IVisual; interface IVisual2; interface IVisual3; @@ -109,6 +110,7 @@ namespace Windows.UI.Composition { runtimeclass SpriteVisual; runtimeclass Vector2KeyFrameAnimation; runtimeclass Vector3KeyFrameAnimation; + runtimeclass Vector4KeyFrameAnimation; runtimeclass Visual; runtimeclass VisualCollection; @@ -579,6 +581,20 @@ namespace Windows.UI.Composition { ); } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.Vector4KeyFrameAnimation), + uuid(2457945b-addd-4385-9606-b6a3d5e4e1b9) + ] + interface IVector4KeyFrameAnimation : IInspectable + { + [overload("InsertKeyFrame")] HRESULT InsertKeyFrame([in] FLOAT key, [in] Windows.Foundation.Numerics.Vector4 value); + [overload("InsertKeyFrame")] HRESULT InsertKeyFrameWithEasingFunction( + [in] FLOAT key, [in] Windows.Foundation.Numerics.Vector4 value, + [in] Windows.UI.Composition.CompositionEasingFunction *function + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.Visual), @@ -877,6 +893,16 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.IVector3KeyFrameAnimation; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass Vector4KeyFrameAnimation : Windows.UI.Composition.KeyFrameAnimation + { + [default] interface Windows.UI.Composition.IVector4KeyFrameAnimation; + } + [ composable(Windows.UI.Composition.IVisualFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.Compositor definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 3de1dab6574ffedec41afbc4be17ba7f1769618f URL: https://gitlab.winehq.org/wine/wine/-/commit/3de1dab6574ffedec41afbc4be17ba… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 20:39:17 2023 -0400 include: Add Windows.UI.Composition.Compositor definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 106 +++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 5b112ffa73e..927a793d223 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -35,6 +35,7 @@ import "windows.ui.core.idl"; namespace Windows.UI.Composition { typedef enum CompositionBackfaceVisibility CompositionBackfaceVisibility; + typedef enum CompositionBatchTypes CompositionBatchTypes; typedef enum CompositionBitmapInterpolationMode CompositionBitmapInterpolationMode; typedef enum CompositionBorderMode CompositionBorderMode; typedef enum CompositionColorSpace CompositionColorSpace; @@ -66,6 +67,18 @@ namespace Windows.UI.Composition { interface ICompositionSurfaceBrush3; interface ICompositionTarget; interface ICompositionTargetFactory; + interface ICompositor; + interface ICompositor2; + interface ICompositor3; + interface ICompositor4; + interface ICompositor5; + interface ICompositor6; + interface ICompositor7; + interface ICompositorStatics; + interface ICompositorWithBlurredWallpaperBackdropBrush; + interface ICompositorWithProjectedShadow; + interface ICompositorWithRadialGradient; + interface ICompositorWithVisualSurface; interface IContainerVisual; interface IContainerVisualFactory; interface ICubicBezierEasingFunction; @@ -101,6 +114,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionScopedBatch; runtimeclass CompositionSurfaceBrush; runtimeclass CompositionTarget; + runtimeclass Compositor; runtimeclass ContainerVisual; runtimeclass CubicBezierEasingFunction; runtimeclass ExpressionAnimation; @@ -134,6 +148,21 @@ namespace Windows.UI.Composition { Hidden = 2, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + flags + ] + enum CompositionBatchTypes + { + None = 0x0, + Animation = 0x1, + Effect = 0x2, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + InfiniteAnimation = 0x4, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + AllAnimations = 0x5, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0) ] @@ -465,6 +494,60 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.Compositor), + uuid(b403ca50-7f8c-4e83-985f-cc45060036d8) + ] + interface ICompositor : IInspectable + { + HRESULT CreateColorKeyFrameAnimation([out, retval] Windows.UI.Composition.ColorKeyFrameAnimation **result); + [overload("CreateColorBrush")] HRESULT CreateColorBrush([out, retval] Windows.UI.Composition.CompositionColorBrush **result); + [overload("CreateColorBrush")] HRESULT CreateColorBrushWithColor( + [in] Windows.UI.Color color, [out, retval] Windows.UI.Composition.CompositionColorBrush **result + ); + HRESULT CreateContainerVisual([out, retval] Windows.UI.Composition.ContainerVisual **result); + HRESULT CreateCubicBezierEasingFunction( + [in] Windows.Foundation.Numerics.Vector2 point1, [in] Windows.Foundation.Numerics.Vector2 point2, + [out, retval] Windows.UI.Composition.CubicBezierEasingFunction **result + ); + [overload("CreateEffectFactory")] HRESULT CreateEffectFactory( + [in] Windows.Graphics.Effects.IGraphicsEffect *effect, [out, retval] Windows.UI.Composition.CompositionEffectFactory **result + ); + [overload("CreateEffectFactory")] HRESULT CreateEffectFactoryWithProperties( + [in] Windows.Graphics.Effects.IGraphicsEffect *effect, [in] Windows.Foundation.Collections.IIterable<HSTRING> *animatable, + [out, retval] Windows.UI.Composition.CompositionEffectFactory **result + ); + [overload("CreateExpressionAnimation")] HRESULT CreateExpressionAnimation([out, retval] Windows.UI.Composition.ExpressionAnimation **result); + [overload("CreateExpressionAnimation")] HRESULT CreateExpressionAnimationWithExpression( + [in] HSTRING expression, [out, retval] Windows.UI.Composition.ExpressionAnimation **result + ); + [overload("CreateInsetClip")] HRESULT CreateInsetClip([out, retval] Windows.UI.Composition.InsetClip **result); + [overload("CreateInsetClip")] HRESULT CreateInsetClipWithInsets( + [in] FLOAT left, [in] FLOAT top, [in] FLOAT right, [in] FLOAT bottom, + [out, retval] Windows.UI.Composition.InsetClip **result + ); + HRESULT CreateLinearEasingFunction([out, retval] Windows.UI.Composition.LinearEasingFunction **result); + HRESULT CreatePropertySet([out, retval] Windows.UI.Composition.CompositionPropertySet **result); + HRESULT CreateQuaternionKeyFrameAnimation([out, retval] Windows.UI.Composition.QuaternionKeyFrameAnimation **result); + HRESULT CreateScalarKeyFrameAnimation([out, retval] Windows.UI.Composition.ScalarKeyFrameAnimation **result); + HRESULT CreateScopedBatch( + [in] Windows.UI.Composition.CompositionBatchTypes type, [out, retval] Windows.UI.Composition.CompositionScopedBatch **result + ); + HRESULT CreateSpriteVisual([out, retval] Windows.UI.Composition.SpriteVisual **result); + [overload("CreateSurfaceBrush")] HRESULT CreateSurfaceBrush([out, retval] Windows.UI.Composition.CompositionSurfaceBrush **result); + [overload("CreateSurfaceBrush")] HRESULT CreateSurfaceBrushWithSurface( + [in] Windows.UI.Composition.ICompositionSurface *surface, [out, retval] Windows.UI.Composition.CompositionSurfaceBrush **result + ); + HRESULT CreateTargetForCurrentView([out, retval] Windows.UI.Composition.CompositionTarget **result); + HRESULT CreateVector2KeyFrameAnimation([out, retval] Windows.UI.Composition.Vector2KeyFrameAnimation **result); + HRESULT CreateVector3KeyFrameAnimation([out, retval] Windows.UI.Composition.Vector3KeyFrameAnimation **result); + HRESULT CreateVector4KeyFrameAnimation([out, retval] Windows.UI.Composition.Vector4KeyFrameAnimation **result); + HRESULT GetCommitBatch( + [in] Windows.UI.Composition.CompositionBatchTypes type, [out, retval] Windows.UI.Composition.CompositionCommitBatch **result + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.ContainerVisual), @@ -819,6 +902,29 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionTarget; } + [ + activatable(Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.UI.Composition.ICompositorStatics, Windows.Foundation.UniversalApiContract, 6.0), + threading(both) + ] + runtimeclass Compositor + { + [default] interface Windows.UI.Composition.ICompositor; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositor2; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositor3; + [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositor4; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositor5; + [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositor6; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithProjectedShadow; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithRadialGradient; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithVisualSurface; + [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositor7; + [contract(Windows.Foundation.UniversalApiContract, 13.0)] interface Windows.UI.Composition.ICompositorWithBlurredWallpaperBackdropBrush; + interface Windows.Foundation.IClosable; + } + [ composable(Windows.UI.Composition.IContainerVisualFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0