Revert PR DarthAffe#339 Corsair-specific changes; route via DeviceHelper again

Reverts the Corsair half of the Aytackydln merge (PR DarthAffe#339) back to
origin/Development. Drops the connection-state event refactor, the
CreateSingleChannelDevice / CreateCorsairDeviceChannel helpers, and
the direct IdGenerator.MakeUnique(typeof(...), ...) call sites — the
provider now goes through DeviceHelper.CreateDeviceName the way every
other provider does.

Reason: PR DarthAffe#339's CorsairRGBDeviceInfo.cs calls
IdGenerator.MakeUnique(object, string) directly, a signature that
only exists in our patched RGB.NET.Core. Downstream consumers
(Chromatics in particular) that load our RGB.NET.Devices.Corsair.dll
alongside an upstream RGB.NET.Core.dll throw MissingMethodException
on first device init — Sentry report traced to exactly this. Routing
the call through DeviceHelper keeps the MakeUnique resolution
internal to whichever Core assembly is loaded at runtime, so the
Corsair DLL no longer needs the patched Core to function.

The Core-level changes from PR DarthAffe#339 (RGBDeviceException catch in
Initialize, [MethodImpl(Synchronized)] on GetUpdateTrigger,
DeviceUpdateTrigger UpdateTask disposal reordering, and the
IdGenerator Assembly->object change shared with PR DarthAffe#338) are
intentionally kept — the OpenRGB provider still depends on the
IdGenerator change. If a similar Sentry report ever lands for
OpenRGB, the same revert recipe applies to RGB.NET.Devices.OpenRGB.

Files reverted to origin/Development:
- RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
- RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
- RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
- RGB.NET.Devices.Corsair/Generic/ICorsairRGBDevice.cs
- RGB.NET.Devices.Corsair/Native/_CUESDK.cs
- RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs

Files deleted (added by PR DarthAffe#339):
- RGB.NET.Devices.Corsair/Enum/CorsairEventId.cs
- RGB.NET.Devices.Corsair/Native/_CorsairDeviceConnectionStatusChangedEvent.cs
- RGB.NET.Devices.Corsair/Native/_CorsairEvent.cs

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: logicallysynced

RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs

@@ -14,11 +14,6 @@ public abstract class CorsairRGBDevice<TDeviceInfo> : AbstractRGBDevice<TDeviceI
 {
     #region Properties & Fields
 
-    /// <summary>
-    /// <inheritdoc cref="ICorsairRGBDevice"/>
-    /// </summary>
-    public string DeviceId => DeviceInfo.DeviceId;
-
     /// <summary>
     /// Gets the mapping of <see cref="LedId"/> to <see cref="CorsairLedId"/> used to update the LEDs of this device.
     /// </summary>
@@ -34,32 +29,14 @@ public abstract class CorsairRGBDevice<TDeviceInfo> : AbstractRGBDevice<TDeviceI
     /// <param name="info">The generic information provided by CUE for the device.</param>
     /// <param name="mapping">The mapping <see cref="LedId"/> to <see cref="CorsairLedId"/> used to update the LEDs of this device.</param>
     /// <param name="updateQueue">The queue used to update this device.</param>
-    protected CorsairRGBDevice(TDeviceInfo info, IUpdateQueue updateQueue)
+    protected CorsairRGBDevice(TDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
         : base(info, updateQueue)
     { }
 
     #endregion
 
     #region Methods
 
-    protected bool Equals(CorsairRGBDevice<TDeviceInfo> other)
-    {
-        return DeviceId == other.DeviceId;
-    }
-
-    public override bool Equals(object? obj)
-    {
-        if (ReferenceEquals(null, obj)) return false;
-        if (ReferenceEquals(this, obj)) return true;
-        if (obj.GetType() != this.GetType()) return false;
-        return Equals((CorsairRGBDevice<TDeviceInfo>)obj);
-    }
-
-    public override int GetHashCode()
-    {
-        return DeviceId.GetHashCode();
-    }
-
     void ICorsairRGBDevice.Initialize() => InitializeLayout();
 
     /// <summary>

RGB.NET.Devices.Corsair/Enum/CorsairEventId.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using RGB.NET.Core;
 using RGB.NET.Devices.Corsair.Native;
 
@@ -36,7 +33,7 @@ public class CorsairRGBDeviceInfo : IRGBDeviceInfo
     /// Returns the unique ID provided by the Corsair-SDK.
     /// Returns string.Empty for Custom devices.
     /// </summary>
-    public string DeviceId { get; init; }
+    public string DeviceId { get; }
 
     /// <inheritdoc />
     public object? LayoutMetadata { get; set; }
@@ -70,14 +67,7 @@ internal CorsairRGBDeviceInfo(RGBDeviceType deviceType, _CorsairDeviceInfo nativ
         this.LedCount = ledCount;
         this.LedOffset = ledOffset;
 
-        if (nativeInfo.id == null)  // this device is 99% unpluggable
-        {
-            DeviceName = IdGenerator.MakeUnique(typeof(CorsairDeviceProvider), Manufacturer + " " + Model);
-        }
-        else
-        {
-            DeviceName = Manufacturer + " " + Model + " #" + HashAndShorten(DeviceId);
-        }
+        DeviceName = DeviceHelper.CreateDeviceName(Manufacturer, Model);
     }
 
     /// <summary>
@@ -96,34 +86,7 @@ internal CorsairRGBDeviceInfo(RGBDeviceType deviceType, _CorsairDeviceInfo nativ
         this.LedCount = ledCount;
         this.LedOffset = ledOffset;
 
-        if (nativeInfo.id == null)
-        {
-            DeviceName = IdGenerator.MakeUnique(typeof(CorsairDeviceProvider),Manufacturer + " " + Model) + " " + ledOffset;;
-        }
-        else
-        {
-            DeviceName = Manufacturer + " " + Model + " #" + HashAndShorten(DeviceId) + " " + ledOffset;
-        }
-    }
-
-    #endregion
-
-    #region Methods
-
-    private static string HashAndShorten(string input)
-    {
-        using SHA256 sha256Hash = SHA256.Create();
-        byte[] bytes = sha256Hash.ComputeHash(Encoding.UTF8.GetBytes(input));
-        // Take the first 4 bytes of the hash
-        byte[] shortenedBytes = new byte[4];
-        Array.Copy(bytes, shortenedBytes, 4);
-        // Convert the bytes to a string
-        StringBuilder shortenedHash = new();
-        foreach (byte b in shortenedBytes)
-        {
-            shortenedHash.Append(b.ToString("X2"));
-        }
-        return shortenedHash.ToString();
+        DeviceName = DeviceHelper.CreateDeviceName(Manufacturer, Model);
     }
 
     #endregion

RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs

@@ -7,7 +7,5 @@ namespace RGB.NET.Devices.Corsair;
 /// </summary>
 public interface ICorsairRGBDevice : IRGBDevice
 {
-    internal string DeviceId { get; }
-
     internal void Initialize();
 }

RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs

@@ -12,7 +12,6 @@
 namespace RGB.NET.Devices.Corsair.Native;
 
 internal delegate void CorsairSessionStateChangedHandler(nint context, _CorsairSessionStateChanged eventData);
-internal delegate void CorsairEventHandler(nint context, _CorsairEvent corsairEvent);
 
 // ReSharper disable once InconsistentNaming
 internal static unsafe class _CUESDK
@@ -51,15 +50,14 @@ internal static unsafe class _CUESDK
     // ReSharper disable once NotAccessedField.Local - This is important, the delegate can be collected if it's not stored!
     private static readonly CorsairSessionStateChangedHandler SESSION_STATE_CHANGED_CALLBACK;
 
-    internal static bool IsConnected => SessionState == CorsairSessionState.Connected;
-    internal static CorsairSessionState SessionState { get; private set; }
+    internal static bool IsConnected => SesionState == CorsairSessionState.Connected;
+    internal static CorsairSessionState SesionState { get; private set; }
 
     #endregion
 
     #region Events
 
     internal static event EventHandler<CorsairSessionState>? SessionStateChanged;
-    internal static event EventHandler<_CorsairDeviceConnectionStatusChangedEvent>? DeviceConnectionEvent;
 
     #endregion
 
@@ -74,45 +72,10 @@ static _CUESDK()
 
     #region Methods
 
-    private static void CorsairSessionStateChangedCallback(nint context, _CorsairSessionStateChanged eventData)
+    private static void CorsairSessionStateChangedCallback(nint context, _CorsairSessionStateChanged eventdata)
     {
-        SessionState = eventData.state;
-        try
-        {
-            SessionStateChanged?.Invoke(null, eventData.state);
-        }
-        catch { /* dont let exception go to sdk */ }
-
-        switch (eventData.state)
-        {
-            case CorsairSessionState.Connected:
-                _corsairSubscribeForEvents(CorsairEventCallback, 0);
-                break;
-            case CorsairSessionState.Closed:
-                _corsairUnsubscribeForEvents();
-                break;
-        }
-    }
-    
-    private static void CorsairEventCallback(nint context, _CorsairEvent eventData)
-    {
-        if (eventData.id != CorsairEventId.DeviceConnectionStatusChangedEvent)
-        {
-            return;
-        }
-
-        try
-        {
-            if (eventData.eventPointer == 0)
-            {
-                return;
-            }
-
-            _CorsairDeviceConnectionStatusChangedEvent connectionStatusChangedEvent =
-                Marshal.PtrToStructure<_CorsairDeviceConnectionStatusChangedEvent>(eventData.eventPointer)!;
-
-            DeviceConnectionEvent?.Invoke(null, connectionStatusChangedEvent);
-        }catch { /* dont let exception go to sdk */ }
+        SesionState = eventdata.state;
+        SessionStateChanged?.Invoke(null, eventdata.state);
     }
 
     #endregion
@@ -146,7 +109,7 @@ private static void LoadCUESDK()
         _corsairGetSessionDetails = (delegate* unmanaged[Cdecl]<nint, CorsairError>)LoadFunction("CorsairGetSessionDetails");
         _corsairDisconnect = (delegate* unmanaged[Cdecl]<CorsairError>)LoadFunction("CorsairDisconnect");
         _corsairGetDevices = (delegate* unmanaged[Cdecl]<_CorsairDeviceFilter, int, nint, out int, CorsairError>)LoadFunction("CorsairGetDevices");
-        _corsairGetDeviceInfo = (delegate* unmanaged[Cdecl]<string, ref _CorsairDeviceInfo, CorsairError>)LoadFunction("CorsairGetDeviceInfo");
+        _corsairGetDeviceInfo = (delegate* unmanaged[Cdecl]<string, _CorsairDeviceInfo, CorsairError>)LoadFunction("CorsairGetDeviceInfo");
         _corsairGetLedPositions = (delegate* unmanaged[Cdecl]<string, int, nint, out int, CorsairError>)LoadFunction("CorsairGetLedPositions");
         _corsairSetLedColors = (delegate* unmanaged[Cdecl]<string, int, nint, CorsairError>)LoadFunction("CorsairSetLedColors");
         _corsairSetLayerPriority = (delegate* unmanaged[Cdecl]<uint, CorsairError>)LoadFunction("CorsairSetLayerPriority");
@@ -155,8 +118,6 @@ private static void LoadCUESDK()
         _corsairReleaseControl = (delegate* unmanaged[Cdecl]<string, CorsairError>)LoadFunction("CorsairReleaseControl");
         _getDevicePropertyInfo = (delegate* unmanaged[Cdecl]<string, CorsairDevicePropertyId, uint, out CorsairDataType, out CorsairPropertyFlag, CorsairError>)LoadFunction("CorsairGetDevicePropertyInfo");
         _readDeviceProperty = (delegate* unmanaged[Cdecl]<string, CorsairDevicePropertyId, uint, nint, CorsairError>)LoadFunction("CorsairReadDeviceProperty");
-        _corsairSubscribeForEvents = (delegate* unmanaged[Cdecl]<CorsairEventHandler, nint, CorsairError>)LoadFunction("CorsairSubscribeForEvents");
-        _corsairUnsubscribeForEvents = (delegate* unmanaged[Cdecl]<CorsairError>)LoadFunction("CorsairSubscribeForEvents");
     }
 
     private static nint LoadFunction(string function)
@@ -209,7 +170,7 @@ internal static void UnloadCUESDK()
     private static delegate* unmanaged[Cdecl]<nint, CorsairError> _corsairGetSessionDetails;
     private static delegate* unmanaged[Cdecl]<CorsairError> _corsairDisconnect;
     private static delegate* unmanaged[Cdecl]<_CorsairDeviceFilter, int, nint, out int, CorsairError> _corsairGetDevices;
-    private static delegate* unmanaged[Cdecl]<string, ref _CorsairDeviceInfo, CorsairError> _corsairGetDeviceInfo;
+    private static delegate* unmanaged[Cdecl]<string, _CorsairDeviceInfo, CorsairError> _corsairGetDeviceInfo;
     private static delegate* unmanaged[Cdecl]<string, int, nint, out int, CorsairError> _corsairGetLedPositions;
     private static delegate* unmanaged[Cdecl]<string, int, nint, CorsairError> _corsairSetLedColors;
     private static delegate* unmanaged[Cdecl]<uint, CorsairError> _corsairSetLayerPriority;
@@ -218,15 +179,12 @@ internal static void UnloadCUESDK()
     private static delegate* unmanaged[Cdecl]<string, CorsairError> _corsairReleaseControl;
     private static delegate* unmanaged[Cdecl]<string, CorsairDevicePropertyId, uint, out CorsairDataType, out CorsairPropertyFlag, CorsairError> _getDevicePropertyInfo;
     private static delegate* unmanaged[Cdecl]<string, CorsairDevicePropertyId, uint, nint, CorsairError> _readDeviceProperty;
-    private static delegate* unmanaged[Cdecl]<CorsairEventHandler, nint, CorsairError> _corsairSubscribeForEvents;
-    private static delegate* unmanaged[Cdecl]<CorsairError> _corsairUnsubscribeForEvents;
 
     #endregion
 
     internal static CorsairError CorsairConnect()
     {
         if (_corsairConnectPtr == null) throw new RGBDeviceException("The Corsair-SDK is not initialized.");
-        if (SessionState is CorsairSessionState.Connecting or CorsairSessionState.Timeout) return CorsairError.Success;
         if (IsConnected) throw new RGBDeviceException("The Corsair-SDK is already connected.");
         return _corsairConnectPtr(SESSION_STATE_CHANGED_CALLBACK, 0);
     }
@@ -251,6 +209,7 @@ internal static CorsairError CorsairGetSessionDetails(out _CorsairSessionDetails
 
     internal static CorsairError CorsairDisconnect()
     {
+        if (!IsConnected) throw new RGBDeviceException("The Corsair-SDK is not connected.");
         return _corsairDisconnect();
     }
 
@@ -273,12 +232,10 @@ internal static CorsairError CorsairGetDevices(_CorsairDeviceFilter filter, out
         }
     }
 
-    internal static CorsairError CorsairGetDeviceInfo(string deviceId, out _CorsairDeviceInfo deviceInfo)
+    internal static CorsairError CorsairGetDeviceInfo(string deviceId, _CorsairDeviceInfo deviceInfo)
     {
         if (!IsConnected) throw new RGBDeviceException("The Corsair-SDK is not connected.");
-
-        deviceInfo = new _CorsairDeviceInfo();
-        return _corsairGetDeviceInfo(deviceId, ref deviceInfo);
+        return _corsairGetDeviceInfo(deviceId, deviceInfo);
     }
 
     internal static CorsairError CorsairGetLedPositions(string deviceId, out _CorsairLedPosition[] ledPositions)

RGB.NET.Devices.Corsair/Generic/ICorsairRGBDevice.cs

@@ -12,7 +12,7 @@ namespace RGB.NET.Devices.Corsair.Native;
 /// iCUE-SDK: contains information about device
 /// </summary>
 [StructLayout(LayoutKind.Sequential)]
-internal struct _CorsairDeviceInfo
+internal sealed class _CorsairDeviceInfo
 {
     /// <summary>
     /// iCUE-SDK: enum describing device type