March 2024 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Skip bindless samplers with no uniform location.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 37d71415edf7670ba5da70fc55c19c4e0f9b0463 URL: https://gitlab.winehq.org/wine/wine/-/commit/37d71415edf7670ba5da70fc55c19c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 16:34:03 2024 -0500 wined3d: Skip bindless samplers with no uniform location. This can happen legitimately if the sampler access was optimized out. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 42cdb585c50..933f134830a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10786,7 +10786,7 @@ static void shader_glsl_load_bindless_samplers(struct shader_glsl_priv *priv, st string_buffer_sprintf(sampler_name, "%s_sampler%u", prefix, entry->bind_idx); name_loc = GL_EXTCALL(glGetUniformLocation(ctx_data->glsl_program->id, sampler_name->buffer)); if (name_loc == -1) - ERR("No uniform location for shader %#x, binding %u, name %s.\n", shader_type, i, sampler_name->buffer); + continue; if ((view = state->shader_resource_view[shader_type][entry->resource_idx])) {

1 0

Eric Pouech : evr: Remove useless code.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: d950e1b61f34e8bc333ec558edcbfc46bfbb9936 URL: https://gitlab.winehq.org/wine/wine/-/commit/d950e1b61f34e8bc333ec558edcbfc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Mar 13 09:22:58 2024 +0100 evr: Remove useless code. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/evr/evr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 52c5de5e2c4..362c4f1e76f 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -409,7 +409,6 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, I /* All other formats are 32-bit, single plane. */ MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); } - MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); IDirect3DSurface9_UnlockRect(surface); }

1 0

Zebediah Figura : wined3d: Recreate buffer textures when renaming the existing buffer storage.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 58c680bacec189a46597d6f0b8f14f7061b423f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/58c680bacec189a46597d6f0b8f14f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 16:33:18 2024 -0500 wined3d: Recreate buffer textures when renaming the existing buffer storage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56438 --- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/view.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 613dac57f5f..24fdb32b829 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -36148,7 +36148,7 @@ static void test_high_resource_count(void) ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)buffers[1], 0); draw_quad(&test_context); - todo_wine_if (!damavand) check_texture_vec4(rt, &expect2, 0); + check_texture_vec4(rt, &expect2, 0); ID3D11Texture2D_Release(rt); ID3D11RenderTargetView_Release(rtv); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a829a3b5ca2..09d1bfd32a1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -269,7 +269,17 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c view->target = GL_TEXTURE_BUFFER; if (!view->name) + { gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + } + else if (gl_info->supported[ARB_BINDLESS_TEXTURE]) + { + /* If we already bound this view to a shader, we acquired a handle to + * it, and it's now immutable. This means we can't bind a new buffer + * storage to it, so recreate the texture. */ + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->name); + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + } wined3d_context_gl_bind_texture(context_gl, GL_TEXTURE_BUFFER, view->name); if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE])

1 0

Zebediah Figura : d3d11/tests: Test discarding a buffer in test_high_resource_count().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 4e13c72f70edc057ac72e9ec86d83617f5e276d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e13c72f70edc057ac72e9ec86d836… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 16:32:14 2024 -0500 d3d11/tests: Test discarding a buffer in test_high_resource_count(). --- dlls/d3d11/tests/d3d11.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 221f17679b0..613dac57f5f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -35619,15 +35619,18 @@ static void test_high_resource_count(void) D3D11_BUFFER_DESC buffer_desc = {0}; ID3D11ShaderResourceView *srvs[100]; ID3D11Texture2D *textures[50], *rt; + D3D11_MAPPED_SUBRESOURCE map_desc; ID3D11SamplerState *samplers[2]; ID3D11DeviceContext *context; ID3D11RenderTargetView *rtv; ID3D11Buffer *buffers[50]; ID3D11PixelShader *ps; ID3D11Device *device; + float *data_ptr; HRESULT hr; static const struct vec4 expect = {1274.0f, 637.0f, 1225.0f, 0.0f}; + static const struct vec4 expect2 = {1274.0f, 637.0f, 1325.0f, 0.0f}; static const DWORD ps_code[] = { @@ -36097,7 +36100,8 @@ static void test_high_resource_count(void) D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; buffer_desc.ByteWidth = sizeof(data); - buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &data_desc, &buffers[i]); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -36134,6 +36138,18 @@ static void test_high_resource_count(void) check_texture_vec4(rt, &expect, 0); + /* Discard the data in one of the buffers and draw again. */ + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffers[1], 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + data_ptr = map_desc.pData; + data_ptr[0] = 102.0f; + data_ptr[1] = 0.0f; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)buffers[1], 0); + draw_quad(&test_context); + + todo_wine_if (!damavand) check_texture_vec4(rt, &expect2, 0); + ID3D11Texture2D_Release(rt); ID3D11RenderTargetView_Release(rtv); for (unsigned int i = 0; i < ARRAY_SIZE(srvs); ++i)

1 0

Paul Gofman : windows.perception.stub: Add stub IHolographicSpaceInterop interface.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: ddff86335502a7c3aa55bb8794e3635daab7a50c URL: https://gitlab.winehq.org/wine/wine/-/commit/ddff86335502a7c3aa55bb8794e363… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 25 16:02:02 2024 -0600 windows.perception.stub: Add stub IHolographicSpaceInterop interface. --- dlls/windows.perception.stub/holographicspace.c | 33 +++++++++++++++++++++++++ dlls/windows.perception.stub/private.h | 1 + dlls/windows.perception.stub/tests/perception.c | 25 ++++++++++--------- include/Makefile.in | 1 + include/holographicspaceinterop.idl | 27 ++++++++++++++++++++ 5 files changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index 8a12147f4a8..53e6be0e712 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -27,6 +27,7 @@ struct holographicspace IActivationFactory IActivationFactory_iface; IHolographicSpaceStatics2 IHolographicSpaceStatics2_iface; IHolographicSpaceStatics3 IHolographicSpaceStatics3_iface; + IHolographicSpaceInterop IHolographicSpaceInterop_iface; LONG ref; }; @@ -65,6 +66,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IHolographicSpaceInterop )) + { + *out = &impl->IHolographicSpaceInterop_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -193,11 +201,36 @@ static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl holographicspace_statics3_get_IsConfigured, }; +DEFINE_IINSPECTABLE( holographicspace_interop, IHolographicSpaceInterop, struct holographicspace, IActivationFactory_iface ) + +static HRESULT WINAPI holographicspace_interop_CreateForWindow( IHolographicSpaceInterop *iface, + HWND window, REFIID iid, void **holographic_space ) +{ + FIXME( "iface %p, window %p, iid %s, holographic_space %p.\n", iface, window, debugstr_guid( iid ), holographic_space ); + + *holographic_space = NULL; + return E_NOTIMPL; +} + +static const struct IHolographicSpaceInteropVtbl holographicspace_interop_vtbl = +{ + holographicspace_interop_QueryInterface, + holographicspace_interop_AddRef, + holographicspace_interop_Release, + /* IInspectable methods */ + holographicspace_interop_GetIids, + holographicspace_interop_GetRuntimeClassName, + holographicspace_interop_GetTrustLevel, + /* IHolographicSpaceInterop methods */ + holographicspace_interop_CreateForWindow, +}; + static struct holographicspace holographicspace_statics = { {&factory_vtbl}, {&holographicspace_statics2_vtbl}, {&holographicspace_statics3_vtbl}, + {&holographicspace_interop_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h index a6ae62916e1..ceaa2944174 100644 --- a/dlls/windows.perception.stub/private.h +++ b/dlls/windows.perception.stub/private.h @@ -36,6 +36,7 @@ #include "windows.perception.spatial.surfaces.h" #define WIDL_using_Windows_Graphics_Holographic #include "windows.graphics.holographic.h" +#include "holographicspaceinterop.h" extern IActivationFactory *observer_factory; extern IActivationFactory *holographicspace_factory; diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index d0bee4eb247..29d7f1ea475 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -32,19 +32,21 @@ #include "windows.perception.spatial.surfaces.h" #define WIDL_using_Windows_Graphics_Holographic #include "windows.graphics.holographic.h" +#include "holographicspaceinterop.h" #include "wine/test.h" -#define check_interface( obj, iid ) check_interface_( __LINE__, obj, iid ) -static void check_interface_( unsigned int line, void *obj, const IID *iid ) +#define check_interface( obj, iid, can_be_broken ) check_interface_( __LINE__, obj, iid, can_be_broken ) +static void check_interface_( unsigned int line, void *obj, const IID *iid, BOOL can_be_broken ) { IUnknown *iface = obj; IUnknown *unk; HRESULT hr; hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); - ok_(__FILE__, line)( hr == S_OK, "got hr %#lx.\n", hr ); - IUnknown_Release( unk ); + ok_(__FILE__, line)( hr == S_OK || broken( can_be_broken && hr == E_NOINTERFACE ), "got hr %#lx.\n", hr ); + if (SUCCEEDED(hr)) + IUnknown_Release( unk ); } static void test_ObserverStatics(void) @@ -69,10 +71,10 @@ static void test_ObserverStatics(void) return; } - check_interface( factory, &IID_IUnknown ); - check_interface( factory, &IID_IInspectable ); - check_interface( factory, &IID_IAgileObject ); - check_interface( factory, &IID_ISpatialSurfaceObserverStatics ); + check_interface( factory, &IID_IUnknown, FALSE ); + check_interface( factory, &IID_IInspectable, FALSE ); + check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_ISpatialSurfaceObserverStatics, FALSE ); hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialSurfaceObserverStatics2, (void **)&observer_statics2 ); if (hr == E_NOINTERFACE) /* win1607 */ @@ -118,9 +120,10 @@ static void test_HolographicSpaceStatics(void) return; } - check_interface( factory, &IID_IUnknown ); - check_interface( factory, &IID_IInspectable ); - check_interface( factory, &IID_IAgileObject ); + check_interface( factory, &IID_IUnknown, FALSE ); + check_interface( factory, &IID_IInspectable, FALSE ); + check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_IHolographicSpaceInterop, TRUE /* broken on Testbot Win1607 */ ); hr = IActivationFactory_QueryInterface( factory, &IID_IHolographicSpaceStatics2, (void **)&holographicspace_statics2 ); if (hr == E_NOINTERFACE) /* win1607 */ diff --git a/include/Makefile.in b/include/Makefile.in index 391ce3c190b..c527a17cec4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -345,6 +345,7 @@ SOURCES = \ highlevelmonitorconfigurationapi.h \ hlguids.h \ hlink.idl \ + holographicspaceinterop.idl \ hrtfapoapi.idl \ hstring.idl \ htiface.idl \ diff --git a/include/holographicspaceinterop.idl b/include/holographicspaceinterop.idl new file mode 100644 index 00000000000..913f60bc7a0 --- /dev/null +++ b/include/holographicspaceinterop.idl @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "inspectable.idl"; + +[ + uuid(5c4ee536-6a98-4b86-a170-587013d6fd4b), +] +interface IHolographicSpaceInterop : IInspectable +{ + HRESULT CreateForWindow( [in] HWND window, [in] REFIID iid, [out, iid_is(iid)] void **holographic_space); +}

1 0

Paul Gofman : ntdll/tests: Add more tests for xstate.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: bb47eb9f723053c512136362a167ddb1cc565d71 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb47eb9f723053c512136362a167dd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 18 13:29:11 2024 -0600 ntdll/tests: Add more tests for xstate. --- dlls/ntdll/tests/exception.c | 100 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 10 deletions(-)

1 0

Paul Gofman : ntdll: Support more xstate features.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 29c73ee17335b30f3f49c8b3562742c6a35b482c URL: https://gitlab.winehq.org/wine/wine/-/commit/29c73ee17335b30f3f49c8b3562742… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 18 12:59:26 2024 -0600 ntdll: Support more xstate features. --- dlls/ntdll/tests/exception.c | 2 +- dlls/ntdll/unix/system.c | 40 ++++++++++++++++++++++++++---- programs/wineboot/wineboot.c | 58 ++++++++++++++++++++++++++++++++------------ 3 files changed, 79 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 67b02cbd8b6..7a4e04ec5e0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -9171,7 +9171,7 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI } else { - ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + ok((xs->Mask & 7) == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); /* The save area has garbage if xsaveopt is available, so we can't test * its contents. */ diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 068eb9d6839..15c4a49e611 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -250,8 +250,8 @@ BOOL xstate_compaction_enabled = FALSE; UINT64 xstate_supported_features_mask; UINT64 xstate_features_size; -static int xstate_feature_offset[64] = {0, 0, 576}; -static int xstate_feature_size[64] = {0, 0, 256}; +static int xstate_feature_offset[64]; +static int xstate_feature_size[64]; static UINT64 xstate_aligned_features; static int next_xstate_offset( int off, UINT64 compaction_mask, int feature_idx ) @@ -345,6 +345,21 @@ __ASM_GLOBAL_FUNC( do_cpuid, "ret" ) #endif +extern UINT64 do_xgetbv( unsigned int cx); +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_xgetbv, + "movl 4(%esp),%ecx\n\t" + "xgetbv\n\t" + "ret" ) +#else +__ASM_GLOBAL_FUNC( do_xgetbv, + "movl %edi,%ecx\n\t" + "xgetbv\n\t" + "shlq $32,%rdx\n\t" + "orq %rdx,%rax\n\t" + "ret" ) +#endif + #ifdef __i386__ extern int have_cpuid(void); __ASM_GLOBAL_FUNC( have_cpuid, @@ -403,8 +418,11 @@ static void get_cpuid_name( char *buffer ) static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { + static const ULONG64 wine_xstate_supported_features = 0xff; /* XSTATE_AVX, XSTATE_MPX_BNDREGS, XSTATE_MPX_BNDCSR, + * XSTATE_AVX512_KMASK, XSTATE_AVX512_ZMM_H, XSTATE_AVX512_ZMM */ unsigned int regs[4], regs2[4], regs3[4]; ULONGLONG features; + unsigned int i; #if defined(__i386__) info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; @@ -454,13 +472,25 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { do_cpuid( 0x0000000d, 1, regs3 ); /* get XSAVE details */ if (regs3[0] & 2) xstate_compaction_enabled = TRUE; - xstate_supported_features_mask = 3; - if (features & CPU_FEATURE_AVX) - xstate_supported_features_mask |= (UINT64)1 << XSTATE_AVX; + + do_cpuid( 0x0000000d, 0, regs3 ); /* get user xstate features */ + xstate_supported_features_mask = ((ULONG64)regs3[3] << 32) | regs3[0]; + xstate_supported_features_mask &= do_xgetbv( 0 ) & wine_xstate_supported_features; + TRACE("xstate_supported_features_mask %#llx.\n", (long long)xstate_supported_features_mask); + for (i = 2; i < 64; ++i) + { + if (!(xstate_supported_features_mask & ((ULONG64)1 << i))) continue; + do_cpuid( 0x0000000d, i, regs3 ); /* get user xstate features */ + xstate_feature_offset[i] = regs3[1]; + xstate_feature_size[i] = regs3[0]; + if (regs3[2] & 2) xstate_aligned_features |= (ULONG64)1 << i; + TRACE("xstate[%d] offset %d, size %d, aligned %d.\n", i, xstate_feature_offset[i], xstate_feature_size[i], !!(regs3[2] & 2)); + } xstate_features_size = xstate_get_size( xstate_compaction_enabled ? 0x8000000000000000 | xstate_supported_features_mask : 0, xstate_supported_features_mask ) - sizeof(XSAVE_AREA_HEADER); xstate_features_size = (xstate_features_size + 15) & ~15; + TRACE("xstate_features_size %lld.\n", (long long)xstate_features_size); } if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1c1ad858fa4..67d9508389f 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -193,10 +193,27 @@ static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value ) #if defined(__i386__) || defined(__x86_64__) +extern UINT64 WINAPI do_xgetbv( unsigned int cx); +#ifdef __i386__ +__ASM_STDCALL_FUNC( do_xgetbv, 4, + "movl 4(%esp),%ecx\n\t" + "xgetbv\n\t" + "ret $4" ) +#else +__ASM_GLOBAL_FUNC( do_xgetbv, + "xgetbv\n\t" + "shlq $32,%rdx\n\t" + "orq %rdx,%rax\n\t" + "ret" ) +#endif + static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) { + static const ULONG64 wine_xstate_supported_features = 0xfc; /* XSTATE_AVX, XSTATE_MPX_BNDREGS, XSTATE_MPX_BNDCSR, + * XSTATE_AVX512_KMASK, XSTATE_AVX512_ZMM_H, XSTATE_AVX512_ZMM */ XSTATE_CONFIGURATION *xstate = &data->XState; - unsigned int i; + ULONG64 supported_mask; + unsigned int i, off; int regs[4]; if (!data->ProcessorFeatures[PF_AVX_INSTRUCTIONS_AVAILABLE]) @@ -215,29 +232,40 @@ static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) __cpuidex(regs, 0xd, 0); TRACE("XSAVE details %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); - if (!(regs[0] & XSTATE_AVX)) + supported_mask = ((ULONG64)regs[3] << 32) | regs[0]; + supported_mask &= do_xgetbv(0) & wine_xstate_supported_features; + if (!(supported_mask >> 2)) return; - xstate->EnabledFeatures = (1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX); + xstate->EnabledFeatures = (1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | supported_mask; xstate->EnabledVolatileFeatures = xstate->EnabledFeatures; - xstate->Size = sizeof(XSAVE_FORMAT) + sizeof(XSTATE); xstate->AllFeatureSize = regs[1]; - xstate->AllFeatures[0] = offsetof(XSAVE_FORMAT, XmmRegisters); - xstate->AllFeatures[1] = sizeof(M128A) * 16; - xstate->AllFeatures[2] = sizeof(YMMCONTEXT); - - for (i = 0; i < 3; ++i) - xstate->Features[i].Size = xstate->AllFeatures[i]; - - xstate->Features[1].Offset = xstate->Features[0].Size; - xstate->Features[2].Offset = sizeof(XSAVE_FORMAT) + offsetof(XSTATE, YmmContext); __cpuidex(regs, 0xd, 1); xstate->OptimizedSave = regs[0] & 1; xstate->CompactionEnabled = !!(regs[0] & 2); - __cpuidex(regs, 0xd, 2); - TRACE("XSAVE feature 2 %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); + xstate->Features[0].Size = xstate->AllFeatures[0] = offsetof(XSAVE_FORMAT, XmmRegisters); + xstate->Features[1].Size = xstate->AllFeatures[1] = sizeof(M128A) * 16; + xstate->Features[1].Offset = xstate->Features[0].Size; + off = sizeof(XSAVE_FORMAT) + sizeof(XSAVE_AREA_HEADER); + supported_mask >>= 2; + for (i = 2; supported_mask; ++i, supported_mask >>= 1) + { + if (!(supported_mask & 1)) continue; + __cpuidex( regs, 0xd, i ); + xstate->Features[i].Offset = regs[1]; + xstate->Features[i].Size = xstate->AllFeatures[i] = regs[0]; + if (regs[2] & 2) + { + xstate->AlignedFeatures |= (ULONG64)1 << i; + off = (off + 63) & ~63; + } + off += xstate->Features[i].Size; + TRACE("xstate[%d] offset %lu, size %lu, aligned %d.\n", i, xstate->Features[i].Offset, xstate->Features[i].Size, !!(regs[2] & 2)); + } + xstate->Size = xstate->CompactionEnabled ? off : xstate->Features[i - 1].Offset + xstate->Features[i - 1].Size; + TRACE("xstate size %lu, compacted %d, optimized %d.\n", xstate->Size, xstate->CompactionEnabled, xstate->OptimizedSave); } static BOOL is_tsc_trusted_by_the_kernel(void)

1 0

Paul Gofman : ntdll: Mind generic xstate masks in server context conversion.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 3dea242677be1ca7f18ca95b6d9d0aacc5c3f1b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dea242677be1ca7f18ca95b6d9d0a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 18 15:14:50 2024 -0600 ntdll: Mind generic xstate masks in server context conversion. --- dlls/ntdll/unix/thread.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 800f2cc1968..7ae5c022fb2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -236,6 +236,7 @@ static void xstate_to_server( context_t *to, const CONTEXT_EX *xctx ) { const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); + if (xs->CompactionMask && !(xs->CompactionMask & 4)) return; to->flags |= SERVER_CTX_YMM_REGISTERS; if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); } @@ -613,8 +614,14 @@ static void xstate_from_server( CONTEXT_EX *xctx, const context_t *from ) XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); unsigned int i; - xs->Mask &= ~4; - if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; + xs->Mask &= ~(ULONG64)4; + + if (xs->CompactionMask) + { + xs->CompactionMask &= ~(UINT64)3; + if (!(xs->CompactionMask & 4)) return; + } + for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) { if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue;

1 0

Paul Gofman : ntdll: Factor out context_to_server() function.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: a9d77d098928f6521bef7c1b1739429b8fe11ebd URL: https://gitlab.winehq.org/wine/wine/-/commit/a9d77d098928f6521bef7c1b173942… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 18 15:29:50 2024 -0600 ntdll: Factor out context_to_server() function. --- dlls/ntdll/unix/thread.c | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 0d98473f01b..800f2cc1968 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -227,6 +227,20 @@ static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_ } +/*********************************************************************** + * xstate_to_server + * + * Copy xstate to the server format. + */ +static void xstate_to_server( context_t *to, const CONTEXT_EX *xctx ) +{ + const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); + + to->flags |= SERVER_CTX_YMM_REGISTERS; + if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); +} + + /*********************************************************************** * context_to_server * @@ -303,13 +317,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void memcpy( to->ext.i386_regs, from->ExtendedRegisters, sizeof(to->ext.i386_regs) ); } if (flags & CONTEXT_I386_XSTATE) - { - const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1); - const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); - - to->flags |= SERVER_CTX_YMM_REGISTERS; - if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); - } + xstate_to_server( to, (const CONTEXT_EX *)(from + 1) ); return STATUS_SUCCESS; } @@ -367,13 +375,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void fpu_to_fpux( (XMM_SAVE_AREA32 *)to->fp.x86_64_regs.fpregs, &from->FloatSave ); } if (flags & CONTEXT_I386_XSTATE) - { - const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1); - const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); - - to->flags |= SERVER_CTX_YMM_REGISTERS; - if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); - } + xstate_to_server( to, (const CONTEXT_EX *)(from + 1) ); return STATUS_SUCCESS; } @@ -434,13 +436,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void to->debug.x86_64_regs.dr7 = from->Dr7; } if (flags & CONTEXT_AMD64_XSTATE) - { - const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1); - const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); - - to->flags |= SERVER_CTX_YMM_REGISTERS; - if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); - } + xstate_to_server( to, (const CONTEXT_EX *)(from + 1) ); return STATUS_SUCCESS; } @@ -505,13 +501,7 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void to->debug.i386_regs.dr7 = from->Dr7; } if (flags & CONTEXT_AMD64_XSTATE) - { - const CONTEXT_EX *xctx = (const CONTEXT_EX *)(from + 1); - const XSTATE *xs = (const XSTATE *)((const char *)xctx + xctx->XState.Offset); - - to->flags |= SERVER_CTX_YMM_REGISTERS; - if (xs->Mask & 4) memcpy( &to->ymm.regs.ymm_high, &xs->YmmContext, sizeof(xs->YmmContext) ); - } + xstate_to_server( to, (const CONTEXT_EX *)(from + 1) ); return STATUS_SUCCESS; }

1 0

Paul Gofman : ntdll: Factor out xstate_from_server() function.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 25e0a2580758282d679dafa557b2c1771410e970 URL: https://gitlab.winehq.org/wine/wine/-/commit/25e0a2580758282d679dafa557b2c1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 18 15:00:06 2024 -0600 ntdll: Factor out xstate_from_server() function. --- dlls/ntdll/unix/thread.c | 82 +++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 60c833b0320..0d98473f01b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -613,6 +613,28 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void } +/*********************************************************************** + * xstate_from_server + * + * Copy xstate from the server format. + */ +static void xstate_from_server( CONTEXT_EX *xctx, const context_t *from ) +{ + XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); + unsigned int i; + + xs->Mask &= ~4; + if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; + for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) + { + if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; + memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); + xs->Mask |= 4; + break; + } +} + + /*********************************************************************** * context_from_server * @@ -686,20 +708,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma memcpy( to->ExtendedRegisters, from->ext.i386_regs, sizeof(to->ExtendedRegisters) ); } if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_I386_XSTATE)) - { - CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1); - XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); - - xs->Mask &= ~4; - if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; - for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) - { - if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; - memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); - xs->Mask |= 4; - break; - } - } + xstate_from_server( (CONTEXT_EX *)(to + 1), from ); return STATUS_SUCCESS; } @@ -760,20 +769,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma to->Dr7 = from->debug.x86_64_regs.dr7; } if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_I386_XSTATE)) - { - CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1); - XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); - - xs->Mask &= ~4; - if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; - for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) - { - if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; - memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); - xs->Mask |= 4; - break; - } - } + xstate_from_server( (CONTEXT_EX *)(to + 1), from ); return STATUS_SUCCESS; } @@ -835,20 +831,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma to->Dr7 = from->debug.x86_64_regs.dr7; } if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_AMD64_XSTATE)) - { - CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1); - XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); - - xs->Mask &= ~4; - if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; - for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) - { - if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; - memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); - xs->Mask |= 4; - break; - } - } + xstate_from_server( (CONTEXT_EX *)(to + 1), from ); return STATUS_SUCCESS; } @@ -917,20 +900,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma to->Dr7 = from->debug.i386_regs.dr7; } if ((from->flags & SERVER_CTX_YMM_REGISTERS) && (to_flags & CONTEXT_AMD64_XSTATE)) - { - CONTEXT_EX *xctx = (CONTEXT_EX *)(to + 1); - XSTATE *xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); - - xs->Mask &= ~4; - if (xs->CompactionMask) xs->CompactionMask = 0x8000000000000004; - for (i = 0; i < ARRAY_SIZE( from->ymm.regs.ymm_high); i++) - { - if (!from->ymm.regs.ymm_high[i].low && !from->ymm.regs.ymm_high[i].high) continue; - memcpy( &xs->YmmContext, &from->ymm.regs, sizeof(xs->YmmContext) ); - xs->Mask |= 4; - break; - } - } + xstate_from_server( (CONTEXT_EX *)(to + 1), from ); return STATUS_SUCCESS; }

1 0