January 2024 - Wine-commits

Conor McCarthy : vkd3d-shader/spirv: Handle the TAN instruction in spirv_compiler_emit_ext_glsl_instruction().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: f954724870e5e7e5329f69772b779f21a3d56a43 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f954724870e5e7e5329f69772b779… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 16:03:02 2024 +1000 vkd3d-shader/spirv: Handle the TAN instruction in spirv_compiler_emit_ext_glsl_instruction(). --- libs/vkd3d-shader/spirv.c | 2 ++ tests/hlsl/trigonometry.shader_test | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 185b93c0..6821a78f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6982,6 +6982,7 @@ static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( {VKD3DSIH_ROUND_Z, GLSLstd450Trunc}, {VKD3DSIH_RSQ, GLSLstd450InverseSqrt}, {VKD3DSIH_SQRT, GLSLstd450Sqrt}, + {VKD3DSIH_TAN, GLSLstd450Tan}, {VKD3DSIH_UMAX, GLSLstd450UMax}, {VKD3DSIH_UMIN, GLSLstd450UMin}, }; @@ -9555,6 +9556,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_ROUND_Z: case VKD3DSIH_RSQ: case VKD3DSIH_SQRT: + case VKD3DSIH_TAN: case VKD3DSIH_UMAX: case VKD3DSIH_UMIN: spirv_compiler_emit_ext_glsl_instruction(compiler, instruction); diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 7f95a99f..90eac333 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -13,7 +13,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.00000000, 0.0) probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 1.55740772, 0.0) 1024 probe ( 2, 0) rgba ( 0.90929743, -0.41614684, -2.18503986, 0.0) 1024 @@ -72,5 +72,5 @@ float4 main() : sv_target % tan(pi/2) is an asymtote and therefore undefined % so check 0, pi/4, 3pi/4, pi uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (0, 1000, -1000.0, 0)

1 0

Henri Verbeet : vkd3d-shader: Start an if-block on VKD3DSIH_IFC in vkd3d_shader_scan_instruction().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: fee3b94563eb549426829c5c685089dad4328a56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fee3b94563eb549426829c5c68508… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 19:18:28 2024 +0100 vkd3d-shader: Start an if-block on VKD3DSIH_IFC in vkd3d_shader_scan_instruction(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 9b7d5d22..ac13be89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1137,6 +1137,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte instruction->declaration.structured_resource.byte_stride, false, instruction->flags); break; case VKD3DSIH_IF: + case VKD3DSIH_IFC: cf_info = vkd3d_shader_scan_push_cf_info(context); cf_info->type = VKD3D_SHADER_BLOCK_IF; cf_info->inside_block = true;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_fence_AddRef().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 5a2b82fbd5ca6f7a338425b36e4986670655561c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a2b82fbd5ca6f7a338425b36e498… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:22:57 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_fence_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d146e322..77621009 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -926,7 +926,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence1 *iface, static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence1 *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence1(iface); - ULONG refcount = InterlockedIncrement(&fence->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&fence->refcount); TRACE("%p increasing refcount to %u.\n", fence, refcount); @@ -941,7 +941,7 @@ static void d3d12_fence_incref(struct d3d12_fence *fence) static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence1(iface); - ULONG refcount = InterlockedDecrement(&fence->refcount); + ULONG refcount = InterlockedDecrement((LONG *)&fence->refcount); TRACE("%p decreasing refcount to %u.\n", fence, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2841122a..763606fd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -622,7 +622,7 @@ struct d3d12_fence { ID3D12Fence1 ID3D12Fence1_iface; LONG internal_refcount; - LONG refcount; + unsigned int refcount; D3D12_FENCE_FLAGS flags;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_fence_Release().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 1b4f1ac8a05765512d29d692746d690d4a11bfc4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b4f1ac8a05765512d29d692746d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:24:17 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_fence_Release(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 77621009..5df15b64 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -941,7 +941,7 @@ static void d3d12_fence_incref(struct d3d12_fence *fence) static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence1(iface); - ULONG refcount = InterlockedDecrement((LONG *)&fence->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&fence->refcount); TRACE("%p decreasing refcount to %u.\n", fence, refcount);

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle globally coherent UAVs.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: adfbecef3c8fcbfea488920c99fb8a76d0b66450 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/adfbecef3c8fcbfea488920c99fb8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 16 00:09:11 2023 +1000 vkd3d-shader/spirv: Handle globally coherent UAVs. --- libs/vkd3d-shader/spirv.c | 3 +++ libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 299b4e96..e50b35ac 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6237,6 +6237,9 @@ static void spirv_compiler_emit_resource_declaration(struct spirv_compiler *comp if (!(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ)) vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0); + if (d->uav_flags & VKD3DSUF_GLOBALLY_COHERENT) + vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationCoherent, NULL, 0); + if (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER) { assert(structure_stride); /* counters are valid only for structured buffers */ diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 00f2f5d3..9b7d5d22 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1016,7 +1016,7 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, - unsigned int sample_count, unsigned int structure_stride, bool raw) + unsigned int sample_count, unsigned int structure_stride, bool raw, uint32_t flags) { struct vkd3d_shader_descriptor_info1 *d; enum vkd3d_shader_descriptor_type type; @@ -1032,6 +1032,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont d->structure_stride = structure_stride; if (raw) d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER; + if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + d->uav_flags = flags; } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -1090,7 +1092,7 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca } vkd3d_shader_scan_resource_declaration(context, &semantic->resource, - semantic->resource_type, resource_data_type, semantic->sample_count, 0, false); + semantic->resource_type, resource_data_type, semantic->sample_count, 0, false, instruction->flags); } static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, @@ -1126,13 +1128,13 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_UAV_RAW: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.raw_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0, true); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0, true, instruction->flags); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, - instruction->declaration.structured_resource.byte_stride, false); + instruction->declaration.structured_resource.byte_stride, false, instruction->flags); break; case VKD3DSIH_IF: cf_info = vkd3d_shader_scan_push_cf_info(context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 51daf215..f6dd12ff 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1339,6 +1339,7 @@ struct vkd3d_shader_descriptor_info1 unsigned int buffer_size; unsigned int structure_stride; unsigned int count; + uint32_t uav_flags; }; struct vkd3d_shader_scan_descriptor_info1

1 0

Conor McCarthy : vkd3d-shader/spirv: Include Uniform in the memory semantics for UAV barriers.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 18e9148f5891085e962ff8c6a8a6ac5957548c0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18e9148f5891085e962ff8c6a8a6a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 16 13:25:35 2023 +1000 vkd3d-shader/spirv: Include Uniform in the memory semantics for UAV barriers. The UniformMemory semantic applies the constraints to Uniform storage class memory, which matches how UAV variables are declared. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e50b35ac..04ef128e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9346,7 +9346,7 @@ static void spirv_compiler_emit_sync(struct spirv_compiler *compiler, if (flags & VKD3DSSF_GLOBAL_UAV) { memory_scope = SpvScopeDevice; - memory_semantics |= SpvMemorySemanticsImageMemoryMask; + memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsImageMemoryMask; flags &= ~VKD3DSSF_GLOBAL_UAV; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle thread group UAV barriers.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 8ae69c745b133f2d0b2a737ec336bdf48c9ac7ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ae69c745b133f2d0b2a737ec336b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 16 13:46:10 2023 +1000 vkd3d-shader/spirv: Handle thread group UAV barriers. --- libs/vkd3d-shader/d3d_asm.c | 5 +++++ libs/vkd3d-shader/spirv.c | 15 ++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 6ec7a9c9..7f67be8c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -445,6 +445,11 @@ static void shader_dump_sync_flags(struct vkd3d_d3d_asm_compiler *compiler, uint vkd3d_string_buffer_printf(&compiler->buffer, "_uglobal"); sync_flags &= ~VKD3DSSF_GLOBAL_UAV; } + if (sync_flags & VKD3DSSF_THREAD_GROUP_UAV) + { + vkd3d_string_buffer_printf(&compiler->buffer, "_ugroup"); + sync_flags &= ~VKD3DSSF_THREAD_GROUP_UAV; + } if (sync_flags & VKD3DSSF_GROUP_SHARED_MEMORY) { vkd3d_string_buffer_printf(&compiler->buffer, "_g"); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 04ef128e..185b93c0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9343,11 +9343,20 @@ static void spirv_compiler_emit_sync(struct spirv_compiler *compiler, flags &= ~VKD3DSSF_THREAD_GROUP; } - if (flags & VKD3DSSF_GLOBAL_UAV) + if (flags & (VKD3DSSF_THREAD_GROUP_UAV | VKD3DSSF_GLOBAL_UAV)) { - memory_scope = SpvScopeDevice; + bool group_uav = flags & VKD3DSSF_THREAD_GROUP_UAV; + bool global_uav = flags & VKD3DSSF_GLOBAL_UAV; + + if (group_uav && global_uav) + { + WARN("Invalid UAV sync flag combination; assuming global.\n"); + spirv_compiler_warning(compiler, VKD3D_SHADER_WARNING_SPV_INVALID_UAV_FLAGS, + "The flags for a UAV sync instruction are contradictory; assuming global sync."); + } + memory_scope = global_uav ? SpvScopeDevice : SpvScopeWorkgroup; memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsImageMemoryMask; - flags &= ~VKD3DSSF_GLOBAL_UAV; + flags &= ~(VKD3DSSF_THREAD_GROUP_UAV | VKD3DSSF_GLOBAL_UAV); } if (flags) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f6dd12ff..b16a69f0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -99,6 +99,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_INVALID_SHADER = 2009, VKD3D_SHADER_WARNING_SPV_INVALID_SWIZZLE = 2300, + VKD3D_SHADER_WARNING_SPV_INVALID_UAV_FLAGS = 2301, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, @@ -730,6 +731,7 @@ enum vkd3d_shader_sync_flags { VKD3DSSF_THREAD_GROUP = 0x1, VKD3DSSF_GROUP_SHARED_MEMORY = 0x2, + VKD3DSSF_THREAD_GROUP_UAV = 0x4, VKD3DSSF_GLOBAL_UAV = 0x8, };

1 0

Rémi Bernon : dinput/tests: Relax the mouse move count test.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: wine Branch: master Commit: dcfba0a2aa505645cf3bab6e7cb0f9a6724726ed URL: https://gitlab.winehq.org/wine/wine/-/commit/dcfba0a2aa505645cf3bab6e7cb0f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 07:41:46 2024 +0100 dinput/tests: Relax the mouse move count test. It is prone to spurious failures and we don't really care about it being precise yet. --- dlls/dinput/tests/device8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 0f586c69f6a..d6d3a03b7bd 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1744,7 +1744,7 @@ static void test_hid_mouse(void) ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ todo_wine - ok( mouse_move_count == 1, "got mouse_move_count %u\n", mouse_move_count ); + ok( mouse_move_count >= 1, "got mouse_move_count %u\n", mouse_move_count ); GetCursorPos( &pos ); todo_wine

1 0

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

24 Jan '24

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

Rémi Bernon : windows.gaming.input: Stub IRawGameController2 interface.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: wine Branch: master Commit: e2b637c8dcd39f6174a36e0b7ab2632f4b88aae7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2b637c8dcd39f6174a36e0b7ab263… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 15:18:15 2022 +0100 windows.gaming.input: Stub IRawGameController2 interface. --- dlls/dinput/tests/joystick8.c | 32 ++++++++++-------- dlls/windows.gaming.input/controller.c | 60 ++++++++++++++++++++++++++++++++++ include/windows.devices.haptics.idl | 3 ++ 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 34c3f94e07c..38e20072962 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5069,7 +5069,6 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IInspectable, TRUE ); check_interface( raw_controller, &IID_IAgileObject, TRUE ); check_interface( raw_controller, &IID_IRawGameController, TRUE ); - todo_wine check_interface( raw_controller, &IID_IRawGameController2, TRUE ); check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); @@ -5082,7 +5081,6 @@ static void test_windows_gaming_input(void) check_interface( game_controller, &IID_IInspectable, TRUE ); check_interface( game_controller, &IID_IAgileObject, TRUE ); check_interface( game_controller, &IID_IRawGameController, TRUE ); - todo_wine check_interface( game_controller, &IID_IRawGameController2, TRUE ); check_interface( game_controller, &IID_IGameController, TRUE ); check_interface( game_controller, &IID_IGamepad, FALSE ); @@ -5100,23 +5098,31 @@ static void test_windows_gaming_input(void) 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 ); + todo_wine 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 ); + if (hr == S_OK) + { + buffer = pWindowsGetStringRawBuffer( str, &length ); + todo_wine + 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 ); + todo_wine 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 ); + if (hr == S_OK) + { + buffer = pWindowsGetStringRawBuffer( str, &length ); + todo_wine + 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 ); @@ -5127,8 +5133,6 @@ static void test_windows_gaming_input(void) IVectorView_SimpleHapticsController_Release( haptics_controllers ); IRawGameController2_Release( raw_controller2 ); - -skip_tests: IRawGameController_Release( raw_controller ); hr = IRawGameControllerStatics_remove_RawGameControllerAdded( controller_statics, controller_added_token ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index bd3d441c445..e1749a3032d 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -61,6 +61,7 @@ struct controller IGameControllerImpl IGameControllerImpl_iface; IGameControllerInputSink IGameControllerInputSink_iface; IRawGameController IRawGameController_iface; + IRawGameController2 IRawGameController2_iface; IGameController *IGameController_outer; LONG ref; @@ -99,6 +100,12 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return S_OK; } + if (IsEqualGUID( iid, &IID_IRawGameController2 )) + { + IInspectable_AddRef( (*out = &impl->IRawGameController2_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -330,6 +337,58 @@ static const struct IRawGameControllerVtbl raw_controller_vtbl = raw_controller_GetSwitchKind, }; +DEFINE_IINSPECTABLE_OUTER( raw_controller_2, IRawGameController2, struct controller, IGameController_outer ) + +static HRESULT WINAPI raw_controller_2_get_SimpleHapticsControllers( IRawGameController2 *iface, IVectorView_SimpleHapticsController** value) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_SimpleHapticsController, + .view = &IID_IVectorView_SimpleHapticsController, + .iterable = &IID_IIterable_SimpleHapticsController, + .iterator = &IID_IIterator_SimpleHapticsController, + }; + IVector_SimpleHapticsController *vector; + HRESULT hr; + + FIXME( "iface %p, value %p stub!\n", iface, value ); + + if (SUCCEEDED(hr = vector_create( &iids, (void **)&vector ))) + { + hr = IVector_SimpleHapticsController_GetView( vector, value ); + IVector_SimpleHapticsController_Release( vector ); + } + + return hr; +} + +static HRESULT WINAPI raw_controller_2_get_NonRoamableId( IRawGameController2 *iface, HSTRING* value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_2_get_DisplayName( IRawGameController2 *iface, HSTRING* value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IRawGameController2Vtbl raw_controller_2_vtbl = +{ + raw_controller_2_QueryInterface, + raw_controller_2_AddRef, + raw_controller_2_Release, + /* IInspectable methods */ + raw_controller_2_GetIids, + raw_controller_2_GetRuntimeClassName, + raw_controller_2_GetTrustLevel, + /* IRawGameController2 methods */ + raw_controller_2_get_SimpleHapticsControllers, + raw_controller_2_get_NonRoamableId, + raw_controller_2_get_DisplayName, +}; + struct controller_statics { IActivationFactory IActivationFactory_iface; @@ -525,6 +584,7 @@ static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameContro impl->IGameControllerImpl_iface.lpVtbl = &controller_vtbl; impl->IGameControllerInputSink_iface.lpVtbl = &input_sink_vtbl; impl->IRawGameController_iface.lpVtbl = &raw_controller_vtbl; + impl->IRawGameController2_iface.lpVtbl = &raw_controller_2_vtbl; impl->ref = 1; TRACE( "created RawGameController %p\n", impl ); diff --git a/include/windows.devices.haptics.idl b/include/windows.devices.haptics.idl index c056ab4941c..506525a6d3c 100644 --- a/include/windows.devices.haptics.idl +++ b/include/windows.devices.haptics.idl @@ -30,7 +30,10 @@ namespace Windows.Devices.Haptics { runtimeclass SimpleHapticsController; declare { + interface Windows.Foundation.Collections.IIterator<Windows.Devices.Haptics.SimpleHapticsController *>; + interface Windows.Foundation.Collections.IIterable<Windows.Devices.Haptics.SimpleHapticsController *>; interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsController *>; + interface Windows.Foundation.Collections.IVector<Windows.Devices.Haptics.SimpleHapticsController *>; interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsControllerFeedback *>; }

1 0