January 2024 - Wine-Commits

Rémi Bernon : dinput/tests: Add some IRawGameController2 interface tests.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 3dce01a2044462ec4cc7ff9f8e93663a51bf24d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dce01a2044462ec4cc7ff9f8e9366… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 00:49:18 2022 +0200 dinput/tests: Add some IRawGameController2 interface tests. --- dlls/dinput/tests/joystick8.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index b4cd4a771de..34c3f94e07c 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -4973,6 +4973,7 @@ static void test_windows_gaming_input(void) static const WCHAR *racing_wheel_class_name = RuntimeClass_Windows_Gaming_Input_RacingWheel; static const WCHAR *gamepad_class_name = RuntimeClass_Windows_Gaming_Input_Gamepad; + IVectorView_SimpleHapticsController *haptics_controllers; IRawGameController *raw_controller, *tmp_raw_controller; IVectorView_RawGameController *controllers_view; IRawGameControllerStatics *controller_statics; @@ -4980,11 +4981,13 @@ static void test_windows_gaming_input(void) IVectorView_RacingWheel *racing_wheels_view; IRacingWheelStatics2 *racing_wheel_statics2; IRacingWheelStatics *racing_wheel_statics; + IRawGameController2 *raw_controller2; IVectorView_Gamepad *gamepads_view; IGamepadStatics *gamepad_statics; IGameController *game_controller; IRacingWheel *racing_wheel; - UINT32 size; + UINT32 size, length; + const WCHAR *buffer; HSTRING str; HRESULT hr; DWORD res; @@ -5095,6 +5098,37 @@ static void test_windows_gaming_input(void) IRawGameController_Release( tmp_raw_controller ); IGameController_Release( game_controller ); + + hr = IRawGameController_QueryInterface( raw_controller, &IID_IRawGameController2, (void **)&raw_controller2 ); + todo_wine + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + if (hr != S_OK) goto skip_tests; + + hr = IRawGameController2_get_DisplayName( raw_controller2, &str ); + ok( hr == S_OK, "get_DisplayName returned %#lx\n", hr ); + buffer = pWindowsGetStringRawBuffer( str, &length ); + ok( !wcscmp( buffer, L"HID-compliant game controller" ), + "get_DisplayName returned %s\n", debugstr_wn( buffer, length ) ); + pWindowsDeleteString( str ); + + hr = IRawGameController2_get_NonRoamableId( raw_controller2, &str ); + ok( hr == S_OK, "get_NonRoamableId returned %#lx\n", hr ); + buffer = pWindowsGetStringRawBuffer( str, &length ); + ok( !wcsncmp( buffer, L"{wgi/nrid/", 10 ), + "get_NonRoamableId returned %s\n", debugstr_wn( buffer, length ) ); + pWindowsDeleteString( str ); + + /* FIXME: What kind of HID reports are needed to make this work? */ + hr = IRawGameController2_get_SimpleHapticsControllers( raw_controller2, &haptics_controllers ); + ok( hr == S_OK, "get_SimpleHapticsControllers returned %#lx\n", hr ); + hr = IVectorView_SimpleHapticsController_get_Size( haptics_controllers, &length ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( length == 0, "got length %u\n", length ); + IVectorView_SimpleHapticsController_Release( haptics_controllers ); + + IRawGameController2_Release( raw_controller2 ); + +skip_tests: IRawGameController_Release( raw_controller ); hr = IRawGameControllerStatics_remove_RawGameControllerAdded( controller_statics, controller_added_token );

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_serialize_root_signature().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 30113c098dfd85abf1ab97dcb2fa6bdd8b6a1c7e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/30113c098dfd85abf1ab97dcb2fa6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:21:33 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_serialize_root_signature(). --- libs/vkd3d/vkd3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 73c0a6ab..6758d302 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -456,7 +456,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, if (error_blob && messages) { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) - ERR("Failed to create error blob, hr %#x.\n", hr); + ERR("Failed to create error blob, hr %s.\n", debugstr_hresult(hr)); } return hresult_from_vkd3d_result(ret); } @@ -464,7 +464,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { - WARN("Failed to create blob object, hr %#x.\n", hr); + WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_shader_code(&dxbc); } return hr;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_create_device().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: a86a21667cfbd5c6bd2f62773eb8d5b6059f769a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a86a21667cfbd5c6bd2f62773eb8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:58:52 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_create_device(). --- libs/vkd3d/vkd3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 245edb5a..73c0a6ab 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -60,7 +60,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, } else if (FAILED(hr = vkd3d_create_instance(create_info->instance_create_info, &instance))) { - WARN("Failed to create instance, hr %#x.\n", hr); + WARN("Failed to create instance, hr %s.\n", debugstr_hresult(hr)); return E_FAIL; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_serialize_versioned_root_signature().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 766f5f039ba4776b5ecda015a54e28976df5dda5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/766f5f039ba4776b5ecda015a54e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:22:14 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_serialize_versioned_root_signature(). --- libs/vkd3d/vkd3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 6758d302..0139de5d 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -497,7 +497,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN if (error_blob && messages) { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) - ERR("Failed to create error blob, hr %#x.\n", hr); + ERR("Failed to create error blob, hr %s.\n", debugstr_hresult(hr)); } return hresult_from_vkd3d_result(ret); } @@ -505,7 +505,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { - WARN("Failed to create blob object, hr %#x.\n", hr); + WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_shader_code(&dxbc); } return hr;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_init_compute().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 1599de9a0d77557d4543f7544bd9a4fbe5abc2f9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1599de9a0d77557d4543f7544bd9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:18:14 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_init_compute(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index fed5c7e2..2b9d24ba 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2474,7 +2474,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st if (FAILED(hr = vkd3d_create_compute_pipeline(device, &desc->cs, &shader_interface, vk_pipeline_layout, &state->u.compute.vk_pipeline))) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); + WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); return hr; }

1 0

Henri Verbeet : vkd3d-shader/ir: Use vsir_instruction_is_dcl() in vsir_validate_instruction().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: eabcaf15fbdff9a003d30559907e5a7373a0dac9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eabcaf15fbdff9a003d30559907e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 22 20:35:28 2024 +0100 vkd3d-shader/ir: Use vsir_instruction_is_dcl() in vsir_validate_instruction(). --- libs/vkd3d-shader/ir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 82d93cc3..45ccea45 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2898,8 +2898,7 @@ static void vsir_validate_instruction(struct validation_context *ctx) * purely structured. In principle we could allow structured * constructs in a block, provided they are confined in a single * block, but need for that hasn't arisen yet, so we don't. */ - if (ctx->cf_type == CF_TYPE_UNKNOWN && !(instruction->handler_idx >= VKD3DSIH_DCL - && instruction->handler_idx <= VKD3DSIH_DCL_VERTICES_OUT)) + if (ctx->cf_type == CF_TYPE_UNKNOWN && !vsir_instruction_is_dcl(instruction)) { if (instruction->handler_idx == VKD3DSIH_LABEL) ctx->cf_type = CF_TYPE_BLOCKS;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_find_and_init_uav_counters().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: c5b5621e2897f3917fd4ab9b5d4b368aaeb372af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5b5621e2897f3917fd4ab9b5d4b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:15:59 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_find_and_init_uav_counters(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c4afa1ed..fed5c7e2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2400,7 +2400,7 @@ static HRESULT d3d12_pipeline_state_find_and_init_uav_counters(struct d3d12_pipe } if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, device, root_signature, &shader_info, stage_flags))) - WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); + WARN("Failed to create descriptor set layout for UAV counters, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_scan_descriptor_info(&shader_info);

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_uav_clear_state_init().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: ad08cbc39032d056fbd7e7bce4744d9cd7de2def URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ad08cbc39032d056fbd7e7bce4744… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:18:54 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_uav_clear_state_init(). --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2b9d24ba..5f383d25 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -4028,14 +4028,14 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, false, &set_binding, set_layouts[i].set_layout))) { - ERR("Failed to create descriptor set layout %u, hr %#x.\n", i, hr); + ERR("Failed to create descriptor set layout %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } if (FAILED(hr = vkd3d_create_pipeline_layout(device, 1, set_layouts[i].set_layout, 1, &push_constant_range, set_layouts[i].pipeline_layout))) { - ERR("Failed to create pipeline layout %u, hr %#x.\n", i, hr); + ERR("Failed to create pipeline layout %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } } @@ -4073,7 +4073,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d vkd3d_shader_free_shader_code(&dxbc); if (FAILED(hr)) { - ERR("Failed to create compute pipeline %u, hr %#x.\n", i, hr); + ERR("Failed to create compute pipeline %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_create_compute_pipeline().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 9c1e661ae39e9dcf413ebb66bd9a1973d9e63f60 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c1e661ae39e9dcf413ebb66bd9a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:57:55 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_create_compute_pipeline(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 12a8cd54..c4afa1ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2272,7 +2272,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); if (vr < 0) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); + WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); return hresult_from_vk_result(vr); }

1 0

Henri Verbeet : vkd3d-shader/ir: Get rid of shader_instruction_is_dcl().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 365ad56888b25c2fb6252210fa9a3b1e910d32fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/365ad56888b25c2fb6252210fa9a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 22 20:32:55 2024 +0100 vkd3d-shader/ir: Get rid of shader_instruction_is_dcl(). --- libs/vkd3d-shader/ir.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f44d0839..82d93cc3 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -39,10 +39,11 @@ static inline bool shader_register_is_phase_instance_id(const struct vkd3d_shade return reg->type == VKD3DSPR_FORKINSTID || reg->type == VKD3DSPR_JOININSTID; } -static bool shader_instruction_is_dcl(const struct vkd3d_shader_instruction *ins) +static bool vsir_instruction_is_dcl(const struct vkd3d_shader_instruction *instruction) { - return (VKD3DSIH_DCL <= ins->handler_idx && ins->handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) - || ins->handler_idx == VKD3DSIH_HS_DECLS; + enum vkd3d_shader_opcode handler_idx = instruction->handler_idx; + return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) + || handler_idx == VKD3DSIH_HS_DECLS; } static void vkd3d_shader_instruction_make_nop(struct vkd3d_shader_instruction *ins) @@ -340,7 +341,7 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal return; } - if (normaliser->phase == VKD3DSIH_INVALID || shader_instruction_is_dcl(ins)) + if (normaliser->phase == VKD3DSIH_INVALID || vsir_instruction_is_dcl(ins)) return; if (normaliser->phase_body_idx == ~0u) @@ -639,7 +640,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i normaliser.phase = ins->handler_idx; break; default: - if (shader_instruction_is_dcl(ins)) + if (vsir_instruction_is_dcl(ins)) break; for (j = 0; j < ins->dst_count; ++j) shader_dst_param_normalise_outpointid(&ins->dst[j], &normaliser); @@ -1332,7 +1333,7 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi memset(normaliser->pc_dcl_params, 0, sizeof(normaliser->pc_dcl_params)); break; default: - if (shader_instruction_is_dcl(ins)) + if (vsir_instruction_is_dcl(ins)) break; for (i = 0; i < ins->dst_count; ++i) shader_dst_param_io_normalise(&ins->dst[i], false, normaliser); @@ -1972,13 +1973,6 @@ static void VKD3D_PRINTF_FUNC(3, 4) cf_flattener_create_block_name(struct cf_fla flattener->block_names[block_id] = buffer.buffer; } -static bool vsir_instruction_is_dcl(const struct vkd3d_shader_instruction *instruction) -{ - enum vkd3d_shader_opcode handler_idx = instruction->handler_idx; - return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) - || handler_idx == VKD3DSIH_HS_DECLS; -} - static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener) { bool main_block_open, is_hull_shader, after_declarations_section;

1 0