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

Daniel Lehman : oleaut32: Return success from GetSizeMax if not dirty.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: c1f5f98f79b0dce78a19bc6f44e3f0f029fe9668 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1f5f98f79b0dce78a19bc6f44e3f0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Mar 13 21:23:02 2024 -0700 oleaut32: Return success from GetSizeMax if not dirty. --- dlls/oleaut32/olepicture.c | 3 ++- dlls/oleaut32/tests/olepicture.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 78fd3fc5681..e4bfafe6fd0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1882,7 +1882,8 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(IPersistStream *iface, ULARGE_IN FIXME("(%p), PICTYPE_BITMAP (format UNKNOWN, using BMP?) not implemented!\n",This); break; } - } + } else hr = S_OK; + break; case PICTYPE_METAFILE: FIXME("(%p), PICTYPE_METAFILE not implemented!\n",This); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 66cc41646c5..07d9ba98f1b 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1262,7 +1262,6 @@ static void test_load_save_bmp(void) maxsize.QuadPart = 0; hr = IPersistStream_GetSizeMax(src_stream, &maxsize); - todo_wine ok(hr == S_OK, "GetSizeMax error %#lx\n", hr); ok(maxsize.QuadPart == 74, "expected 74, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart));

1 0

Zebediah Figura : d3d9/tests: Remove a no longer accurate comment.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: fc18e54e63bdda5bd93a7bed428a3f74a7839d0f URL: https://gitlab.winehq.org/wine/wine/-/commit/fc18e54e63bdda5bd93a7bed428a3f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 12 22:34:06 2024 -0500 d3d9/tests: Remove a no longer accurate comment. Fixes: 7641980a9efe98a1112e773699a75090d703dea9 --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2d54920ddba..8f7fa4be12b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3366,7 +3366,7 @@ static void generate_bumpmap_textures(IDirect3DDevice9 *device) { for (y = 0; y < 128; ++y) { if(i) - { /* Set up black texture with 2x2 texel white spot in the middle */ + { DWORD *ptr = (DWORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); for (x = 0; x < 128; ++x) {

1 0

Zebediah Figura : d3d11/tests: Add a test for using a large number of SRV resources.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: a81bcbe0a90395eef972b494986fed1f3813fdb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a81bcbe0a90395eef972b494986fed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 10 16:39:19 2024 -0500 d3d11/tests: Add a test for using a large number of SRV resources. --- dlls/d3d11/tests/d3d11.c | 538 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 538 insertions(+)

1 0

Zebediah Figura : wined3d: Rename the shader_select_compute method to shader_apply_compute_state.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 8e77d28165866412c5ee63aac0bbca3e6dd96b6a URL: https://gitlab.winehq.org/wine/wine/-/commit/8e77d28165866412c5ee63aac0bbca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 10 23:40:33 2024 -0500 wined3d: Rename the shader_select_compute method to shader_apply_compute_state. Following shader_apply_draw_state. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a9fe27beaef..edb9d40cfcf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4753,7 +4753,7 @@ static void shader_arb_apply_draw_state(void *shader_priv, struct wined3d_contex shader_arb_load_constants_internal(priv, context_gl, state, use_ps(state), use_vs(state), FALSE); } -static void shader_arb_select_compute(void *shader_priv, struct wined3d_context *context, +static void shader_arb_apply_compute_state(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { ERR("Compute pipeline not supported by the ARB shader backend.\n"); @@ -5709,7 +5709,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend = shader_arb_handle_instruction, shader_arb_precompile, shader_arb_apply_draw_state, - shader_arb_select_compute, + shader_arb_apply_compute_state, shader_arb_disable, shader_arb_update_float_vertex_constants, shader_arb_update_float_pixel_constants, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b4b84b60e16..c32157556db 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4445,7 +4445,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) { - device->shader_backend->shader_select_compute(device->shader_priv, &context_gl->c, state); + device->shader_backend->shader_apply_compute_state(device->shader_priv, &context_gl->c, state); context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e52d9a09e58..3f13e66e2fd 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3870,7 +3870,7 @@ VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk if (context_vk->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) { - device_vk->d.shader_backend->shader_select_compute(device_vk->d.shader_priv, &context_vk->c, state); + device_vk->d.shader_backend->shader_apply_compute_state(device_vk->d.shader_priv, &context_vk->c, state); if (!context_vk->compute.vk_pipeline) { ERR("No compute pipeline set.\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0314c2f5761..619f9890c40 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10766,7 +10766,7 @@ static void shader_glsl_apply_draw_state(void *shader_priv, struct wined3d_conte } /* Context activation is done by the caller. */ -static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, +static void shader_glsl_apply_compute_state(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); @@ -11548,7 +11548,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = shader_glsl_handle_instruction, shader_glsl_precompile, shader_glsl_apply_draw_state, - shader_glsl_select_compute, + shader_glsl_apply_compute_state, shader_glsl_disable, shader_glsl_update_float_vertex_constants, shader_glsl_update_float_pixel_constants, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 37a521d54e1..78b92526f03 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1929,7 +1929,7 @@ struct shader_none_priv static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} static void shader_none_precompile(void *shader_priv, struct wined3d_shader *shader) {} -static void shader_none_select_compute(void *shader_priv, struct wined3d_context *context, +static void shader_none_apply_compute_state(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) {} static void shader_none_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) {} @@ -2035,7 +2035,7 @@ const struct wined3d_shader_backend_ops none_shader_backend = shader_none_handle_instruction, shader_none_precompile, shader_none_apply_draw_state, - shader_none_select_compute, + shader_none_apply_compute_state, shader_none_disable, shader_none_update_float_vertex_constants, shader_none_update_float_pixel_constants, diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 3919368ac45..7b054c7cd9d 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -876,7 +876,7 @@ fail: context_vk->graphics.vk_pipeline_layout = VK_NULL_HANDLE; } -static void shader_spirv_select_compute(void *shader_priv, +static void shader_spirv_apply_compute_state(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_context_vk *context_vk = wined3d_context_vk(context); @@ -1122,7 +1122,7 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = .shader_handle_instruction = shader_spirv_handle_instruction, .shader_precompile = shader_spirv_precompile, .shader_apply_draw_state = shader_spirv_apply_draw_state, - .shader_select_compute = shader_spirv_select_compute, + .shader_apply_compute_state = shader_spirv_apply_compute_state, .shader_disable = shader_spirv_disable, .shader_update_float_vertex_constants = shader_spirv_update_float_vertex_constants, .shader_update_float_pixel_constants = shader_spirv_update_float_pixel_constants, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 75aeb15dc2e..4b928781117 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1555,7 +1555,7 @@ struct wined3d_shader_backend_ops void (*shader_precompile)(void *shader_priv, struct wined3d_shader *shader); void (*shader_apply_draw_state)(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state); - void (*shader_select_compute)(void *shader_priv, struct wined3d_context *context, + void (*shader_apply_compute_state)(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state); void (*shader_disable)(void *shader_priv, struct wined3d_context *context); void (*shader_update_float_vertex_constants)(struct wined3d_device *device, UINT start, UINT count);

1 0

Zebediah Figura : wined3d: Move checking shader_update_mask to shader_glsl_apply_compute_state().
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 6e619d98a3051d836ae99e911f1d32e5a307acbc URL: https://gitlab.winehq.org/wine/wine/-/commit/6e619d98a3051d836ae99e911f1d32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 10 23:43:45 2024 -0500 wined3d: Move checking shader_update_mask to shader_glsl_apply_compute_state(). --- dlls/wined3d/context_gl.c | 7 ++----- dlls/wined3d/glsl_shader.c | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c32157556db..1c1dbe52b9d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4443,11 +4443,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co } memset(context_gl->c.dirty_compute_states, 0, sizeof(*context_gl->c.dirty_compute_states)); - if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) - { - device->shader_backend->shader_apply_compute_state(device->shader_priv, &context_gl->c, state); - context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); - } + device->shader_backend->shader_apply_compute_state(device->shader_priv, &context_gl->c, state); if (context_gl->c.update_compute_shader_resource_bindings) { @@ -4478,6 +4474,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co context_gl->c.last_was_blit = FALSE; context_gl->c.last_was_ffp_blit = FALSE; + context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 619f9890c40..015b62986b3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10765,14 +10765,11 @@ static void shader_glsl_apply_draw_state(void *shader_priv, struct wined3d_conte shader_glsl_load_constants(priv, context, state); } -/* Context activation is done by the caller. */ -static void shader_glsl_apply_compute_state(void *shader_priv, struct wined3d_context *context, - const struct wined3d_state *state) +static void shader_glsl_update_compute_program(struct shader_glsl_priv *priv, + struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct glsl_context_data *ctx_data = context->shader_backend_data; + struct glsl_context_data *ctx_data = context_gl->c.shader_backend_data; const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct shader_glsl_priv *priv = shader_priv; GLuint program_id, prev_id; prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; @@ -10787,13 +10784,23 @@ static void shader_glsl_apply_compute_state(void *shader_priv, struct wined3d_co checkGLcall("glUseProgram"); } - context->shader_update_mask |= (1u << WINED3D_SHADER_TYPE_PIXEL) + context_gl->c.shader_update_mask |= (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) | (1u << WINED3D_SHADER_TYPE_GEOMETRY) | (1u << WINED3D_SHADER_TYPE_HULL) | (1u << WINED3D_SHADER_TYPE_DOMAIN); } +static void shader_glsl_apply_compute_state(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct shader_glsl_priv *priv = shader_priv; + + if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + shader_glsl_update_compute_program(priv, context_gl, state); +} + /* "context" is not necessarily the currently active context. */ static void shader_glsl_invalidate_current_program(struct wined3d_context *context) {

1 0

Andrew Wesie : wined3d: Use bindless textures for GLSL shaders if possible.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: f6a1844dbed91b441ad69e7b15b5be242d063e87 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6a1844dbed91b441ad69e7b15b5be… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 11 21:56:53 2024 -0500 wined3d: Use bindless textures for GLSL shaders if possible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44514 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/adapter_gl.c | 15 ++++++++++ dlls/wined3d/context_gl.c | 38 ++++++++++++++++++++++++-- dlls/wined3d/device.c | 24 ++++++++++++++++ dlls/wined3d/glsl_shader.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/texture.c | 20 +++++++++----- dlls/wined3d/view.c | 31 +++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 22 +++++++++++++++ 8 files changed, 209 insertions(+), 11 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Skip segment register tests on ARM64EC.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 97f07ae21171a470058d8e1af783541ef7a923fe URL: https://gitlab.winehq.org/wine/wine/-/commit/97f07ae21171a470058d8e1af78354… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 10:50:03 2024 +0100 ntdll/tests: Skip segment register tests on ARM64EC. --- dlls/ntdll/tests/exception.c | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 822f85d6a3f..db25a3aa2e6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -656,8 +656,8 @@ static void test_unwind(void) NtCurrentTeb()->Tib.ExceptionList = frame1->Prev; } -static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +static DWORD prot_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { const struct exception *except = *(const struct exception **)(frame + 1); unsigned int i, parameter_count, entry = except - exceptions; @@ -719,10 +719,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram } skip_params: - /* don't handle exception if it's not the address we expected */ - if (context->Eip != (DWORD_PTR)code_mem + except->offset) return ExceptionContinueSearch; - - context->Eip += except->length; + context->Eip = (DWORD_PTR)code_mem + except->offset + except->length; return ExceptionContinueExecution; } @@ -738,7 +735,7 @@ static void test_prot_fault(void) continue; } got_exception = 0; - run_exception_test(handler, &exceptions[i], &exceptions[i].code, + run_exception_test(prot_fault_handler, &exceptions[i], &exceptions[i].code, sizeof(exceptions[i].code), 0); if (!i && !got_exception) { @@ -2658,8 +2655,8 @@ static void run_exception_test(void *handler, const void* context, run_exception_test_flags(handler, context, code, code_size, access, UNW_FLAG_EHANDLER); } -static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, - CONTEXT *context, DISPATCHER_CONTEXT *dispatcher ) +static DWORD WINAPI prot_fault_handler( EXCEPTION_RECORD *rec, ULONG64 frame, + CONTEXT *context, DISPATCHER_CONTEXT *dispatcher ) { const struct exception *except = *(const struct exception **)(dispatcher->HandlerData); unsigned int i, parameter_count, entry = except - exceptions; @@ -2677,6 +2674,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "Unexpected exception address %p/%p\n", rec->ExceptionAddress, (char*)context->Rip ); #ifndef __arm64ec__ + if (!is_arm64ec) { USHORT ds, es, fs, gs, ss; __asm__ volatile( "movw %%ds,%0" : "=g" (ds) ); @@ -2744,10 +2742,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, skip_params: winetest_pop_context(); - /* don't handle exception if it's not the address we expected */ - if (context->Rip != (DWORD_PTR)code_mem + except->offset) return ExceptionContinueSearch; - - context->Rip += except->length; + context->Rip = (DWORD_PTR)code_mem + except->offset + except->length; return ExceptionContinueExecution; } @@ -3016,11 +3011,13 @@ static void test_exceptions(void) got_exception = 0; run_exception_test(direction_flag_handler, NULL, direction_flag_code, sizeof(direction_flag_code), 0); ok(got_exception == 1, "got %d exceptions, expected 1\n", got_exception); + if (is_arm64ec) __asm__ volatile( "cld" ); /* needed on Windows */ /* test int3 handling */ run_exception_test(int3_handler, NULL, int3_code, sizeof(int3_code), 0); #ifndef __arm64ec__ + if (!is_arm64ec) { USHORT ds, es, fs, gs, ss; /* test segment registers */ @@ -3177,7 +3174,7 @@ static void test_prot_fault(void) for (i = 0; i < ARRAY_SIZE(exceptions); i++) { got_exception = 0; - run_exception_test(handler, &exceptions[i], &exceptions[i].code, + run_exception_test(prot_fault_handler, &exceptions[i], &exceptions[i].code, sizeof(exceptions[i].code), 0); ok( got_exception == (exceptions[i].status != 0), "%u: bad exception count %d\n", i, got_exception ); @@ -4243,7 +4240,8 @@ static void test_wow64_context(void) context.ContextFlags = CONTEXT_ALL; ret = pNtGetContextThread( pi.hThread, &context ); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); - ok( context.ContextFlags == CONTEXT_ALL, "got context flags %#lx\n", context.ContextFlags ); + ok( context.ContextFlags == is_arm64ec ? CONTEXT_FULL : CONTEXT_ALL, + "got context flags %#lx\n", context.ContextFlags ); ok( !context.Rsi, "rsi is not zero %Ix\n", context.Rsi ); ok( !context.Rdi, "rdi is not zero %Ix\n", context.Rdi ); ok( !context.Rbp, "rbp is not zero %Ix\n", context.Rbp ); @@ -4257,12 +4255,14 @@ static void test_wow64_context(void) ok( !context.R15, "r15 is not zero %Ix\n", context.R15 ); ok( context.MxCsr == 0x1f80, "wrong mxcsr %08lx\n", context.MxCsr ); ok( context.FltSave.ControlWord == 0x27f, "wrong control %08x\n", context.FltSave.ControlWord ); - ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04lx\n", context.SegDs, ctx.SegDs ); - ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04lx\n", context.SegEs, ctx.SegEs ); - ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04lx\n", context.SegFs, ctx.SegFs ); - ok( context.SegGs == ctx.SegGs, "wrong gs %04x / %04lx\n", context.SegGs, ctx.SegGs ); - ok( context.SegSs == ctx.SegSs, "wrong ss %04x / %04lx\n", context.SegSs, ctx.SegSs ); - + if (LOWORD(context.ContextFlags) & CONTEXT_SEGMENTS) + { + ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04lx\n", context.SegDs, ctx.SegDs ); + ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04lx\n", context.SegEs, ctx.SegEs ); + ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04lx\n", context.SegFs, ctx.SegFs ); + ok( context.SegGs == ctx.SegGs, "wrong gs %04x / %04lx\n", context.SegGs, ctx.SegGs ); + ok( context.SegSs == ctx.SegSs, "wrong ss %04x / %04lx\n", context.SegSs, ctx.SegSs ); + } cs32 = ctx.SegCs; cs64 = context.SegCs; if (cs32 == cs64) @@ -4381,11 +4381,14 @@ static void test_wow64_context(void) trace( "in 64-bit mode %04x\n", context.SegCs ); ok( ctx.Eip != context.Rip, "cs64: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip); ok( ctx.SegCs == cs32, "cs64: wrong cs %04lx / %04x\n", ctx.SegCs, cs32 ); - ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs ); - ok( ctx.SegEs == context.SegEs, "cs64: wrong es %04lx / %04x\n", ctx.SegEs, context.SegEs ); - ok( ctx.SegFs == context.SegFs, "cs64: wrong fs %04lx / %04x\n", ctx.SegFs, context.SegFs ); - ok( ctx.SegGs == context.SegGs, "cs64: wrong gs %04lx / %04x\n", ctx.SegGs, context.SegGs ); - ok( ctx.SegSs == context.SegSs, "cs64: wrong ss %04lx / %04x\n", ctx.SegSs, context.SegSs ); + if (!is_arm64ec) + { + ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs ); + ok( ctx.SegEs == context.SegEs, "cs64: wrong es %04lx / %04x\n", ctx.SegEs, context.SegEs ); + ok( ctx.SegFs == context.SegFs, "cs64: wrong fs %04lx / %04x\n", ctx.SegFs, context.SegFs ); + ok( ctx.SegGs == context.SegGs, "cs64: wrong gs %04lx / %04x\n", ctx.SegGs, context.SegGs ); + ok( ctx.SegSs == context.SegSs, "cs64: wrong ss %04lx / %04x\n", ctx.SegSs, context.SegSs ); + } if (teb32.DeallocationStack) ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase, "cs64: esp not inside 32-bit stack %08lx / %08lx-%08lx\n", ctx.Esp, @@ -4445,6 +4448,7 @@ static void test_wow64_context(void) pRtlWow64SetThreadContext( pi.hThread, &ctx ); } got64 = TRUE; + if (is_arm64ec) break; /* no 32-bit %cs on arm64ec */ } } if (!got32) skip( "failed to test 32-bit context\n" );

1 0

Alexandre Julliard : ntdll/tests: Fix debug register tests on ARM64EC.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 3036dddca4b896a22fd19bfa8c93130d312c926c URL: https://gitlab.winehq.org/wine/wine/-/commit/3036dddca4b896a22fd19bfa8c9313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 10:55:02 2024 +0100 ntdll/tests: Fix debug register tests on ARM64EC. --- dlls/ntdll/tests/exception.c | 100 +++++++++++++++++++++++++++++++------------ 1 file changed, 72 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index db25a3aa2e6..2b6ddecf9e5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -38,6 +38,7 @@ static void *code_mem; static HMODULE hntdll; +static BOOL is_arm64ec; static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); @@ -140,8 +141,6 @@ typedef struct _UNWIND_INFO */ } UNWIND_INFO; -static BOOL is_arm64ec; - static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); @@ -7746,17 +7745,29 @@ static void test_debug_registers(void) status = pNtSetContextThread(GetCurrentThread(), &ctx); ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %08lx\n", status); - memset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0xcc, sizeof(ctx)); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; status = pNtGetContextThread(GetCurrentThread(), &ctx); ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08lx\n", status); - ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0); - ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1); - ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2); - ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3); - ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); - ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); + if (is_arm64ec) /* setting debug registers is silently ignored */ + { + ok(!ctx.Dr0, "test %d: expected 0, got %Ix\n", i, (DWORD_PTR)ctx.Dr0); + ok(!ctx.Dr1, "test %d: expected 0, got %Ix\n", i, (DWORD_PTR)ctx.Dr1); + ok(!ctx.Dr2, "test %d: expected 0, got %Ix\n", i, (DWORD_PTR)ctx.Dr2); + ok(!ctx.Dr3, "test %d: expected 0, got %Ix\n", i, (DWORD_PTR)ctx.Dr3); + ok(!ctx.Dr6, "test %d: expected 0, got %Ix\n", i, (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "test %d: expected 0, got %Ix\n", i, (DWORD_PTR)ctx.Dr7); + } + else + { + ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0); + ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1); + ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2); + ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3); + ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); + ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); + } } memset(&ctx, 0, sizeof(ctx)); @@ -7824,30 +7835,52 @@ static void test_debug_registers_wow64(void) ok(bret, "SetThreadContext failed\n"); if (bret) { - ZeroMemory(&ctx, sizeof(ctx)); + memset(&ctx, 0xcc, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); ok(bret, "GetThreadContext failed\n"); if (bret) { - ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %Ix\n", ctx.Dr0); - ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %Ix\n", ctx.Dr1); - ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %Ix\n", ctx.Dr2); - ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %Ix\n", ctx.Dr3); - ok(ctx.Dr7 == 0x155, "expected 0x155, got %Ix\n", ctx.Dr7); + if (is_arm64ec) + { + ok(!ctx.Dr0, "expected 0, got %Ix\n", ctx.Dr0); + ok(!ctx.Dr1, "expected 0, got %Ix\n", ctx.Dr1); + ok(!ctx.Dr2, "expected 0, got %Ix\n", ctx.Dr2); + ok(!ctx.Dr3, "expected 0, got %Ix\n", ctx.Dr3); + ok(!ctx.Dr7, "expected 0, got %Ix\n", ctx.Dr7); + } + else + { + ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %Ix\n", ctx.Dr0); + ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %Ix\n", ctx.Dr1); + ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %Ix\n", ctx.Dr2); + ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %Ix\n", ctx.Dr3); + ok(ctx.Dr7 == 0x155, "expected 0x155, got %Ix\n", ctx.Dr7); + } } - ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + memset(&wow64_ctx, 0xcc, sizeof(wow64_ctx)); wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); if (ret == STATUS_SUCCESS) { - ok(wow64_ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", wow64_ctx.Dr0); - ok(wow64_ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", wow64_ctx.Dr1); - ok(wow64_ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", wow64_ctx.Dr2); - ok(wow64_ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", wow64_ctx.Dr3); - ok(wow64_ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", wow64_ctx.Dr7); + if (is_arm64ec) + { + ok(!wow64_ctx.Dr0, "expected 0, got %lx\n", wow64_ctx.Dr0); + ok(!wow64_ctx.Dr1, "expected 0, got %lx\n", wow64_ctx.Dr1); + ok(!wow64_ctx.Dr2, "expected 0, got %lx\n", wow64_ctx.Dr2); + ok(!wow64_ctx.Dr3, "expected 0, got %lx\n", wow64_ctx.Dr3); + ok(!wow64_ctx.Dr7, "expected 0, got %lx\n", wow64_ctx.Dr7); + } + else + { + ok(wow64_ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", wow64_ctx.Dr0); + ok(wow64_ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", wow64_ctx.Dr1); + ok(wow64_ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", wow64_ctx.Dr2); + ok(wow64_ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", wow64_ctx.Dr3); + ok(wow64_ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", wow64_ctx.Dr7); + } } } @@ -7859,7 +7892,7 @@ static void test_debug_registers_wow64(void) ret = pRtlWow64SetThreadContext(pi.hThread, &wow64_ctx); ok(ret == STATUS_SUCCESS, "Wow64SetThreadContext failed with %lx\n", ret); - ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + memset(&wow64_ctx, 0xcc, sizeof(wow64_ctx)); wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); @@ -7872,17 +7905,28 @@ static void test_debug_registers_wow64(void) ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); } - ZeroMemory(&ctx, sizeof(ctx)); + memset(&ctx, 0xcc, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); ok(bret, "GetThreadContext failed\n"); if (bret) { - ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %Ix\n", ctx.Dr0); - ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %Ix\n", ctx.Dr1); - ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %Ix\n", ctx.Dr2); - ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %Ix\n", ctx.Dr3); - ok(ctx.Dr7 == 0x101, "expected 0x101, got %Ix\n", ctx.Dr7); + if (is_arm64ec) + { + ok(!ctx.Dr0, "expected 0, got %Ix\n", ctx.Dr0); + ok(!ctx.Dr1, "expected 0, got %Ix\n", ctx.Dr1); + ok(!ctx.Dr2, "expected 0, got %Ix\n", ctx.Dr2); + ok(!ctx.Dr3, "expected 0, got %Ix\n", ctx.Dr3); + ok(!ctx.Dr7, "expected 0, got %Ix\n", ctx.Dr7); + } + else + { + ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %Ix\n", ctx.Dr0); + ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %Ix\n", ctx.Dr1); + ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %Ix\n", ctx.Dr2); + ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %Ix\n", ctx.Dr3); + ok(ctx.Dr7 == 0x101, "expected 0x101, got %Ix\n", ctx.Dr7); + } } ResumeThread(pi.hThread);

1 0

Andrew Nguyen : oleaut32: Bump version resource to Windows 10.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 50a1c5bc92ed075104dea8a8eba6dd2ec3a25630 URL: https://gitlab.winehq.org/wine/wine/-/commit/50a1c5bc92ed075104dea8a8eba6dd… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 13 18:00:42 2024 -0500 oleaut32: Bump version resource to Windows 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55876 --- dlls/oleaut32/oleaut32.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index c4614f2e4bb..e1033816353 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -41,8 +41,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "oleaut32.dll" -#define WINE_FILEVERSION 6, 0, 6001, 18000 /* version from Vista SP1 */ -#define WINE_FILEVERSION_STR "6.0.6001.18000" +#define WINE_FILEVERSION 10, 0, 19043, 1466 /* version from Win10 2009 */ +#define WINE_FILEVERSION_STR "10.0.19043.1466" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit an error if COUNTBITS has a 64-bit source.
by Alexandre Julliard 13 Mar '24

13 Mar '24

Module: vkd3d Branch: master Commit: a64eb75c1dd01b4e8b0774b1796dad30b5748132 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a64eb75c1dd01b4e8b0774b1796da… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Mar 13 14:24:22 2024 +1000 vkd3d-shader/spirv: Emit an error if COUNTBITS has a 64-bit source. --- libs/vkd3d-shader/spirv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 56c89f76..86cf678a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7020,6 +7020,15 @@ static enum vkd3d_result spirv_compiler_emit_alu_instruction(struct spirv_compil SpvOp op = SpvOpMax; unsigned int i; + if (src->reg.data_type == VKD3D_DATA_UINT64 && instruction->handler_idx == VKD3DSIH_COUNTBITS) + { + /* At least some drivers support this anyway, but if validation is enabled it will fail. */ + FIXME("Unsupported 64-bit source for bit count.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED, + "64-bit source for bit count is not supported."); + return VKD3D_ERROR_INVALID_SHADER; + } + if (src->reg.data_type == VKD3D_DATA_BOOL) { if (dst->reg.data_type == VKD3D_DATA_BOOL)

1 0