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

Henri Verbeet : vkd3d-shader/ir: Pass an initialised vsir_program structure to vkd3d_shader_parser_init().
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: 19b552ce1b803e95363427b40204a3ef580058c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/19b552ce1b803e95363427b40204a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:12 2024 +0200 vkd3d-shader/ir: Pass an initialised vsir_program structure to vkd3d_shader_parser_init(). --- libs/vkd3d-shader/d3dbc.c | 11 +++++++++-- libs/vkd3d-shader/dxil.c | 11 ++++++++--- libs/vkd3d-shader/ir.c | 1 + libs/vkd3d-shader/tpf.c | 10 ++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 13 +++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++--- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 2e37549f..43d4374a 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1242,6 +1242,7 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, const uint32_t *code = compile_info->source.code; size_t code_size = compile_info->source.size; struct vkd3d_shader_version version; + struct vsir_program *program; uint16_t shader_type; size_t token_count; @@ -1289,10 +1290,16 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, sm1->start = &code[1]; sm1->end = &code[token_count]; + if (!(program = vkd3d_malloc(sizeof(*program)))) + return VKD3D_ERROR_OUT_OF_MEMORY; /* Estimate instruction count to avoid reallocation in most shaders. */ - if (!vkd3d_shader_parser_init(&sm1->p, message_context, compile_info->source_name, &version, &shader_sm1_parser_ops, - code_size != ~(size_t)0 ? token_count / 4u + 4 : 16)) + if (!vsir_program_init(program, &version, code_size != ~(size_t)0 ? token_count / 4u + 4 : 16)) + { + vkd3d_free(program); return VKD3D_ERROR_OUT_OF_MEMORY; + } + + vkd3d_shader_parser_init(&sm1->p, program, message_context, compile_info->source_name, &shader_sm1_parser_ops); sm1->ptr = sm1->start; return VKD3D_OK; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 3f65f521..7275489f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -10250,14 +10250,19 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const char *sou return VKD3D_ERROR_INVALID_SHADER; } + if (!(program = vkd3d_malloc(sizeof(*program)))) + return VKD3D_ERROR_OUT_OF_MEMORY; /* Estimate instruction count to avoid reallocation in most shaders. */ count = max(token_count, 400) - 400; - vkd3d_shader_parser_init(&sm6->p, message_context, source_name, &version, &sm6_parser_ops, - (count + (count >> 2)) / 2u + 10); + if (!vsir_program_init(program, &version, (count + (count >> 2)) / 2u + 10)) + { + vkd3d_free(program); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + vkd3d_shader_parser_init(&sm6->p, program, message_context, source_name, &sm6_parser_ops); sm6->ptr = &sm6->start[1]; sm6->bitpos = 2; - program = sm6->p.program; input_signature = &program->input_signature; output_signature = &program->output_signature; patch_constant_signature = &program->patch_constant_signature; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 2c78447e..37818d4d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -21,6 +21,7 @@ bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve) { + memset(program, 0, sizeof(*program)); program->shader_version = *version; return shader_instruction_array_init(&program->instructions, reserve); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 704c904f..e7301d72 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2517,6 +2517,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t { struct vkd3d_shader_version version; uint32_t version_token, token_count; + struct vsir_program *program; if (byte_code_size / sizeof(*byte_code) < 2) { @@ -2570,10 +2571,15 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t version.major = VKD3D_SM4_VERSION_MAJOR(version_token); version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + if (!(program = vkd3d_malloc(sizeof(*program)))) + return false; /* Estimate instruction count to avoid reallocation in most shaders. */ - if (!vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version, &shader_sm4_parser_ops, - token_count / 7u + 20)) + if (!vsir_program_init(program, &version, token_count / 7u + 20)) + { + vkd3d_free(program); return false; + } + vkd3d_shader_parser_init(&sm4->p, program, message_context, source_name, &shader_sm4_parser_ops); sm4->ptr = sm4->start; init_sm4_lookup_tables(&sm4->lookup); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 89434b0a..a25b5f4a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -554,24 +554,17 @@ static uint64_t vkd3d_shader_init_config_flags(void) return config_flags; } -bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vsir_program *program, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops, - unsigned int instruction_reserve) + const struct vkd3d_shader_parser_ops *ops) { - bool ret; - parser->message_context = message_context; parser->location.source_name = source_name; parser->location.line = 1; parser->location.column = 0; parser->ops = ops; parser->config_flags = vkd3d_shader_init_config_flags(); - if (!(parser->program = vkd3d_calloc(1, sizeof(*parser->program)))) - return false; - if (!(ret = vsir_program_init(parser->program, version, instruction_reserve))) - vkd3d_free(parser->program); - return ret; + parser->program = program; } void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1a1d01e7..196d92ef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1407,10 +1407,9 @@ struct vkd3d_shader_parser_ops void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); -bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vsir_program *program, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops, - unsigned int instruction_reserve); + const struct vkd3d_shader_parser_ops *ops); void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4);

1 0

Nikolay Sivov : d2d1/effect: Implement SetPassthroughGraph().
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: be646151b9cf966023beef2af3fb50ad2844d146 URL: https://gitlab.winehq.org/wine/wine/-/commit/be646151b9cf966023beef2af3fb50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 16 15:29:28 2024 +0200 d2d1/effect: Implement SetPassthroughGraph(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/effect.c | 17 +++++++++++++++-- dlls/d2d1/tests/d2d1.c | 7 +++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bd6ca55ea96..c3c5c6404ab 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -771,6 +771,9 @@ struct d2d_transform_graph struct d2d_transform_node *output; + bool passthrough; + unsigned int passthrough_input; + struct list nodes; }; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 25a75a31ecb..f32eba886bf 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -659,6 +659,7 @@ static void d2d_transform_graph_clear(struct d2d_transform_graph *graph) { d2d_transform_graph_delete_node(graph, node); } + graph->passthrough = false; } static inline struct d2d_transform_graph *impl_from_ID2D1TransformGraph(ID2D1TransformGraph *iface) @@ -788,6 +789,7 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1Transfor return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); graph->output = node; + graph->passthrough = false; return S_OK; } @@ -821,6 +823,7 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1T graph->inputs[input_index].node = node; graph->inputs[input_index].index = node_index; + graph->passthrough = false; return S_OK; } @@ -836,9 +839,19 @@ static void STDMETHODCALLTYPE d2d_transform_graph_Clear(ID2D1TransformGraph *ifa static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetPassthroughGraph(ID2D1TransformGraph *iface, UINT32 index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= graph->input_count) + return E_INVALIDARG; + + d2d_transform_graph_clear(graph); + + graph->passthrough = true; + graph->passthrough_input = index; + + return S_OK; } static const ID2D1TransformGraphVtbl d2d_transform_graph_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2ec11c342ad..cfe44936864 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12914,6 +12914,13 @@ static void test_transform_graph(BOOL d3d11) todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + /* Passthrough graph. */ + hr = ID2D1TransformGraph_SetPassthroughGraph(graph, 100); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1TransformGraph_SetPassthroughGraph(graph, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID2D1BlendTransform_Release(blend_transform); ID2D1OffsetTransform_Release(offset_transform); ID2D1Effect_Release(effect);

1 0

Nikolay Sivov : d2d1/effect: Implement ConnectNode().
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 4ad75a7ae83abf2d59f979cdaf755d9c5a5172ff URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad75a7ae83abf2d59f979cdaf755d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 16 16:21:44 2024 +0200 d2d1/effect: Implement ConnectNode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/effect.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 5 ----- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index c3c5c6404ab..58507fd2c0b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -753,6 +753,9 @@ struct d2d_transform_node struct list entry; ID2D1TransformNode *object; struct d2d_render_info *render_info; + struct d2d_transform_node **inputs; + unsigned int input_count; + struct d2d_transform_node *output; }; struct d2d_transform_node_connection diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f32eba886bf..cebc492d895 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -620,6 +620,12 @@ static HRESULT d2d_transform_graph_add_node(struct d2d_transform_graph *graph, if (!(node = calloc(1, sizeof(*node)))) return E_OUTOFMEMORY; + node->input_count = ID2D1TransformNode_GetInputCount(object); + if (!(node->inputs = calloc(node->input_count, sizeof(*node->inputs)))) + { + free(node); + return E_OUTOFMEMORY; + } node->object = object; ID2D1TransformNode_AddRef(node->object); @@ -628,6 +634,24 @@ static HRESULT d2d_transform_graph_add_node(struct d2d_transform_graph *graph, return S_OK; } +static void d2d_transform_node_disconnect(struct d2d_transform_node *node) +{ + struct d2d_transform_node *output = node->output; + unsigned int i; + + if (!output) + return; + + for (i = 0; i < output->input_count; ++i) + { + if (output->inputs[i] == node) + { + output->inputs[i] = NULL; + break; + } + } +} + static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, struct d2d_transform_node *node) { @@ -648,6 +672,9 @@ static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, if (node->render_info) ID2D1DrawInfo_Release(&node->render_info->ID2D1DrawInfo_iface); + d2d_transform_node_disconnect(node); + + free(node->inputs); free(node); } @@ -797,9 +824,25 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1Transfor static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectNode(ID2D1TransformGraph *iface, ID2D1TransformNode *from_node, ID2D1TransformNode *to_node, UINT32 index) { - FIXME("iface %p, from_node %p, to_node %p, index %u stub!\n", iface, from_node, to_node, index); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); + struct d2d_transform_node *from, *to; - return E_NOTIMPL; + TRACE("iface %p, from_node %p, to_node %p, index %u.\n", iface, from_node, to_node, index); + + if (!(from = d2d_transform_graph_get_node(graph, from_node))) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + if (!(to = d2d_transform_graph_get_node(graph, to_node))) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + if (index >= to->input_count) + return E_INVALIDARG; + + d2d_transform_node_disconnect(from); + to->inputs[index] = from; + from->output = to; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1TransformGraph *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index cfe44936864..ae0b6f51bdc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12873,7 +12873,6 @@ static void test_transform_graph(BOOL d3d11) ID2D1TransformGraph_Clear(graph); hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); /* Connect added node to un-added node */ @@ -12881,7 +12880,6 @@ static void test_transform_graph(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); /* Connect un-added node to added node */ @@ -12890,7 +12888,6 @@ static void test_transform_graph(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); /* Connect nodes */ @@ -12904,14 +12901,12 @@ static void test_transform_graph(BOOL d3d11) { hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, i); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } /* Connect node to out-of-bounds index */ hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, count); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); /* Passthrough graph. */

1 0

Alexandros Frantzis : user32/tests: Skip affected keyboard tests if a spurious layout change is detected.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 275cced4f38ccd6df20ca0bb9decd49ef5ff9f07 URL: https://gitlab.winehq.org/wine/wine/-/commit/275cced4f38ccd6df20ca0bb9decd4… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 15 12:30:26 2024 +0300 user32/tests: Skip affected keyboard tests if a spurious layout change is detected. In some Win10 testbot images (notably jp and cn), we can get a spurious layout change after creating the test window and also when explicitly activating the offending layout. Detect such behavior and skip tests whose assumptions are invalidate by this spurious change. --- dlls/user32/tests/input.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 81af2aa5f28..af8483b8f0e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -714,7 +714,7 @@ static void get_test_scan( WORD vkey, WORD *scan, WCHAR *wch, WCHAR *wch_shift ) } } -static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, WCHAR wch_shift, WCHAR wch_control ) +static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, WCHAR wch_shift, WCHAR wch_control, HKL hkl ) { #define WIN_MSG(m, w, l, ...) {.func = MSG_TEST_WIN, .message = {.msg = m, .wparam = w, .lparam = l}, ## __VA_ARGS__} #define KBD_HOOK(m, s, v, f, ...) {.func = LL_HOOK_KEYBD, .ll_hook_kbd = {.msg = m, .scan = s, .vkey = v, .flags = f}, ## __VA_ARGS__} @@ -1163,6 +1163,17 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W ok_ne( NULL, hwnd, HWND, "%p" ); wait_messages( 100, FALSE ); + /* If we have had a spurious layout change, wch(_shift) may be incorrect. */ + if (GetKeyboardLayout( 0 ) != hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + hkl, GetKeyboardLayout( 0 ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); + wait_messages( 100, FALSE ); + ok_seq( empty_sequence ); + return; + } + hook = SetWindowsHookExW( WH_KEYBOARD_LL, ll_hook_kbd_proc, GetModuleHandleW( NULL ), 0 ); ok_ne( NULL, hook, HHOOK, "%p" ); @@ -4918,7 +4929,7 @@ static void test_UnregisterDeviceNotification(void) ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); } -static void test_SendInput( WORD vkey, WCHAR wch ) +static void test_SendInput( WORD vkey, WCHAR wch, HKL hkl ) { const struct user_call broken_sequence[] = { @@ -4936,6 +4947,17 @@ static void test_SendInput( WORD vkey, WCHAR wch ) ok_ne( NULL, hwnd, HWND, "%p" ); wait_messages( 100, FALSE ); + /* If we have had a spurious layout change, wch may be incorrect. */ + if (GetKeyboardLayout( 0 ) != hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + hkl, GetKeyboardLayout( 0 ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); + wait_messages( 100, FALSE ); + ok_seq( empty_sequence ); + return; + } + SetLastError( 0xdeadbeef ); ok_ret( 0, SendInput( 0, NULL, 0 ) ); ok_ret( ERROR_INVALID_PARAMETER, GetLastError() ); @@ -5649,7 +5671,7 @@ static void test_keyboard_ll_hook_blocking(void) ok_ret( 1, DestroyWindow( hwnd ) ); } -static void test_LoadKeyboardLayoutEx(void) +static void test_LoadKeyboardLayoutEx( HKL orig_hkl ) { static const WCHAR test_layout_name[] = L"00000429"; static const HKL test_hkl = (HKL)0x04290429; @@ -5661,6 +5683,16 @@ static void test_LoadKeyboardLayoutEx(void) old_hkl = GetKeyboardLayout( 0 ); ok_ne( 0, old_hkl, HKL, "%p" ); + /* If we are dealing with a testbot setup that is prone to spurious + * layout changes, layout activations in this test are likely to + * not have the expected effect, invalidating the test assumptions. */ + if (orig_hkl != old_hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + orig_hkl, old_hkl ); + return; + } + hkl = pLoadKeyboardLayoutEx( NULL, test_layout_name, 0 ); ok_eq( 0, hkl, HKL, "%p" ); @@ -5758,8 +5790,8 @@ static void test_input_desktop( char **argv ) test_SetCursorPos(); get_test_scan( 'F', &scan, &wch, &wch_shift ); - test_SendInput( 'F', wch ); - test_SendInput_keyboard_messages( 'F', scan, wch, wch_shift, '\x06' ); + test_SendInput( 'F', wch, hkl ); + test_SendInput_keyboard_messages( 'F', scan, wch, wch_shift, '\x06', hkl ); test_SendInput_mouse_messages(); test_keyboard_ll_hook_blocking(); @@ -5768,7 +5800,7 @@ static void test_input_desktop( char **argv ) test_GetRawInputData(); test_GetRawInputBuffer(); - test_LoadKeyboardLayoutEx(); + test_LoadKeyboardLayoutEx( hkl ); ok_ret( 1, SetCursorPos( pos.x, pos.y ) ); }

1 0

Alexandros Frantzis : user32/tests: Remove workaround for SendInput keyboard tests on zh_CN.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 59729e2d918eae194f2c24794962b72705193ee1 URL: https://gitlab.winehq.org/wine/wine/-/commit/59729e2d918eae194f2c24794962b7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 15 12:37:31 2024 +0300 user32/tests: Remove workaround for SendInput keyboard tests on zh_CN. The workaround was needed because the zh_CN Win10 testbot may spuriously change to the ru_RU keyboard layout during testing. We now detect such changes and skip the tests, so the workaround is not needed. --- dlls/user32/tests/input.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index af8483b8f0e..d84d543bed8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -705,13 +705,6 @@ static void get_test_scan( WORD vkey, WORD *scan, WCHAR *wch, WCHAR *wch_shift ) ok_ret( 1, ToUnicodeEx( vkey, *scan, state, wch, 1, 0, hkl ) ); state[VK_SHIFT] = 0x80; ok_ret( 1, ToUnicodeEx( vkey, *scan, state, wch_shift, 1, 0, hkl ) ); - - /* zh_CN returns a different WM_(SYS)CHAR, possibly coming from IME */ - if (HIWORD(hkl) == 0x0804) - { - *wch = 0x430; - *wch_shift = 0x410; - } } static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, WCHAR wch_shift, WCHAR wch_control, HKL hkl )

1 0

Rémi Bernon : mfreadwrite/reader: Shutdown the queue when public ref is released.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 2294bf6c1eed343013999197134db0416c21a3de URL: https://gitlab.winehq.org/wine/wine/-/commit/2294bf6c1eed343013999197134db0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 13 14:59:50 2024 +0200 mfreadwrite/reader: Shutdown the queue when public ref is released. Instead of internal ref, otherwise an executing callback might be the one releasing the last ref, and MFUnlockWorkQueue will cancel and then block waiting for the callback itself to finish executing. --- dlls/mfreadwrite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index a9d25848e7b..87ed0fe6cfc 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -258,7 +258,6 @@ static ULONG source_reader_release(struct source_reader *reader) } source_reader_release_responses(reader, NULL); free(reader->streams); - MFUnlockWorkQueue(reader->queue); DeleteCriticalSection(&reader->cs); free(reader); } @@ -1666,6 +1665,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReaderEx *iface) } } + MFUnlockWorkQueue(reader->queue); source_reader_release(reader); }

1 0

Paul Gofman : xaudio2/tests: Fix test failures with xaudio2_8 in test_submix().
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 921e79c2b5508e139b2af147f5f40d4a7f0d1897 URL: https://gitlab.winehq.org/wine/wine/-/commit/921e79c2b5508e139b2af147f5f40d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 14 11:18:02 2024 -0600 xaudio2/tests: Fix test failures with xaudio2_8 in test_submix(). --- dlls/xaudio2_7/tests/xaudio2.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 62f766a827a..a1de2959441 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -859,10 +859,18 @@ static void test_submix(IXAudio2 *xa) hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 0, NULL, NULL); ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); - send_desc.pOutputVoice = (IXAudio2Voice *)sub2; hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); - ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + ok(hr == S_OK || (XAUDIO2_VER >= 8 && hr == XAUDIO2_E_INVALID_CALL), "CreateSubmixVoice failed: %08lx\n", hr); + if (hr == XAUDIO2_E_INVALID_CALL) + { + IXAudio2SubmixVoice_DestroyVoice(sub2); + hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 1, NULL, NULL); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + send_desc.pOutputVoice = (IXAudio2Voice *)sub2; + hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + } IXAudio2SubmixVoice_DestroyVoice(sub2); /* The voice is not destroyed. */ @@ -873,7 +881,13 @@ static void test_submix(IXAudio2 *xa) sends.SendCount = 0; hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); - ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + ok(hr == S_OK || (XAUDIO2_VER >= 8 && hr == XAUDIO2_E_INVALID_CALL), "SetOutputVoices failed: %08lx\n", hr); + if (hr == XAUDIO2_E_INVALID_CALL) + { + sends.pSends = NULL; + hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); + ok(hr == S_OK, "SetOutputVoices failed: %08lx\n", hr); + } IXAudio2SubmixVoice_DestroyVoice(sub2); if (0)

1 0

Paul Gofman : nsiproxy.sys: Return success and zero count from ipv6_forward_enumerate_all() if IPV6 is unsupported.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: d6c41f95c026317457816b2e4c7b2cb27031bc74 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6c41f95c026317457816b2e4c7b2c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 15 12:00:04 2024 -0600 nsiproxy.sys: Return success and zero count from ipv6_forward_enumerate_all() if IPV6 is unsupported. --- dlls/nsiproxy.sys/ip.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 09f033ac634..43c9ad9e9fe 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1578,7 +1578,11 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void UINT rtf_flags; FILE *fp; - if (!(fp = fopen( "/proc/net/ipv6_route", "r" ))) return STATUS_NOT_SUPPORTED; + if (!(fp = fopen( "/proc/net/ipv6_route", "r" ))) + { + *count = 0; + return STATUS_SUCCESS; + } while ((ptr = fgets( buf, sizeof(buf), fp ))) {

1 0

Alexandre Julliard : msvcrt/tests: Don't link to _setmaxstdio.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 11632fdc69e606ceb9e6df6c3244652055587145 URL: https://gitlab.winehq.org/wine/wine/-/commit/11632fdc69e606ceb9e6df6c324465… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 09:45:12 2024 +0200 msvcrt/tests: Don't link to _setmaxstdio. It's missing on some ARM platforms. --- dlls/msvcrt/tests/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9f85e2def69..b81469009cd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -67,6 +67,7 @@ static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); static errno_t (__cdecl *p__get_fmode)(int*); static errno_t (__cdecl *p__set_fmode)(int); +static int (__cdecl *p__setmaxstdio)(int); static const char* get_base_name(const char *path) { @@ -91,6 +92,7 @@ static void init(void) __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); p__get_fmode = (void*)GetProcAddress(hmod, "_get_fmode"); p__set_fmode = (void*)GetProcAddress(hmod, "_set_fmode"); + p__setmaxstdio = (void*)GetProcAddress(hmod, "_setmaxstdio"); } static void test_filbuf( void ) @@ -2349,8 +2351,12 @@ static void test_get_osfhandle(void) static void test_setmaxstdio(void) { - ok(2048 == _setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",_setmaxstdio(2048)); - ok(-1 == _setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",_setmaxstdio(2049)); + if (p__setmaxstdio) + { + ok(2048 == p__setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",p__setmaxstdio(2048)); + ok(-1 == p__setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",p__setmaxstdio(2049)); + } + else win_skip( "_setmaxstdio not supported\n" ); } static void test_stat(void)

1 0

Alexandre Julliard : msvcrt: Update some mangled names on ARM.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: bb3733458168032efcf54e461fa284e62f544092 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb3733458168032efcf54e461fa284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 09:45:22 2024 +0200 msvcrt: Update some mangled names on ARM. --- dlls/msvcrt/msvcrt.spec | 56 +++++++++++++++++----------------- dlls/msvcrt/tests/cpp.c | 74 ++++++++++++++++++++++----------------------- dlls/msvcrt40/msvcrt40.spec | 4 +-- 3 files changed, 68 insertions(+), 66 deletions(-)

1 0