From 640bf37674ffd3cd424a6c959855bfd9cda248ca Mon Sep 17 00:00:00 2001 From: JosepMariaPujol Date: Wed, 7 Jan 2026 14:52:04 +0100 Subject: [PATCH 1/2] Removing QueryUserIdCommand superseded by QueryPairedUserAccountCommand --- .../Devices/Commands/QueryUserIdCommand.cs | 44 ------------------- .../Commands/QueryUserIdCommand.cs.meta | 11 ----- 2 files changed, 55 deletions(-) delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs deleted file mode 100644 index 1e6a2dc814..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using UnityEngine.InputSystem.Utilities; - -////TODO: remove this one; superseded by QueryPairedUserAccountCommand - -namespace UnityEngine.InputSystem.LowLevel -{ - [StructLayout(LayoutKind.Explicit, Size = kSize)] - internal unsafe struct QueryUserIdCommand : IInputDeviceCommandInfo - { - public static FourCC Type { get { return new FourCC('U', 'S', 'E', 'R'); } } - - public const int kMaxIdLength = 256; - internal const int kSize = InputDeviceCommand.kBaseCommandSize + kMaxIdLength * 2; - - [FieldOffset(0)] - public InputDeviceCommand baseCommand; - - [FieldOffset(InputDeviceCommand.kBaseCommandSize)] - public fixed byte idBuffer[kMaxIdLength * 2]; - - public string ReadId() - { - fixed(QueryUserIdCommand * thisPtr = &this) - { - return StringHelpers.ReadStringFromBuffer(new IntPtr(thisPtr->idBuffer), kMaxIdLength); - } - } - - public FourCC typeStatic - { - get { return Type; } - } - - public static QueryUserIdCommand Create() - { - return new QueryUserIdCommand - { - baseCommand = new InputDeviceCommand(Type, kSize), - }; - } - } -} diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta deleted file mode 100644 index 08b1b4f263..0000000000 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6c784a1510a154625903484b84c8ddaf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 7179692948d9deb9ad194c8ad1175c013ce528eb Mon Sep 17 00:00:00 2001 From: josepmariapujol-unity <59828124+josepmariapujol-unity@users.noreply.github.com> Date: Thu, 8 Jan 2026 16:57:59 +0100 Subject: [PATCH 2/2] Update InitiateUserAccountPairingCommand.cs --- .../Devices/Commands/InitiateUserAccountPairingCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs index b4ad1358ca..405c9a9832 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs @@ -9,7 +9,7 @@ namespace UnityEngine.InputSystem.LowLevel /// /// /// If successful, the platform should then send an - /// to signal that the device configuration has been changed. In response, a + /// to signal that the device configuration has been changed. In response, a /// may be sent to fetch the paired user ID from the device. /// [StructLayout(LayoutKind.Explicit, Size = kSize)]