fix: hardware Ids

csutorasa · csutorasa · commit 8645e8056932 · 2021-01-01T14:41:37.000+01:00
diff --git a/XOutput/ApplicationConfiguration.cs b/XOutput/ApplicationConfiguration.cs
@@ -16,9 +16,9 @@ public static ArgumentParser GetArgumentParser()
             return new ArgumentParser();
         }
         [ResolverMethod]
-        public static HidGuardianManager GetHidGuardianManager(RegistryModifier registryModifier)
+        public static HidGuardianManager GetHidGuardianManager()
         {
-            return new HidGuardianManager(registryModifier);
+            return new HidGuardianManager();
         }
         [ResolverMethod]
         public static RegistryModifier GetRegistryModifier()
diff --git a/XOutput/Devices/Input/DirectInput/DirectDevice.cs b/XOutput/Devices/Input/DirectInput/DirectDevice.cs
@@ -1,4 +1,5 @@
-﻿using SharpDX;
+﻿using Microsoft.Win32;
+using SharpDX;
 using SharpDX.DirectInput;
 using System;
 using System.Collections.Generic;
@@ -8,6 +9,7 @@
 using System.Windows;
 using System.Windows.Interop;
 using XOutput.Logging;
+using XOutput.Tools;
 
 namespace XOutput.Devices.Input.DirectInput
 {
@@ -98,6 +100,23 @@ public string HardwareID
                     var match = hidRegex.Match(path);
                     if (match.Success)
                     {
+                        string key = $"SYSTEM\\CurrentControlSet\\Enum\\USB\\{match.Groups[2].Value}";
+                        if (RegistryModifier.KeyExists(Registry.LocalMachine, key))
+                        {
+                            foreach (string subkey in RegistryModifier.GetSubKeyNames(Registry.LocalMachine, key))
+                            {
+                                string parentIdPrefix = (string) RegistryModifier.GetValue(Registry.LocalMachine, $"{key}\\{subkey}", "ParentIdPrefix");
+                                if (parentIdPrefix == null || !match.Groups[3].Value.StartsWith(parentIdPrefix))
+                                {
+                                    continue;
+                                }
+                                object registryHardwareIds = RegistryModifier.GetValue(Registry.LocalMachine, $"{key}\\{subkey}", "HardwareID");
+                                if (registryHardwareIds is string[])
+                                {
+                                    return (registryHardwareIds as string[]).Select(id => id.Replace("USB\\", "HID\\")).FirstOrDefault();
+                                }
+                            }
+                        }
                         return string.Join("\\", new string[] { match.Groups[1].Value, match.Groups[2].Value, match.Groups[3].Value }).ToUpper();
                     }
                     if (path.Contains("hid#"))
diff --git a/XOutput/Tools/HidGuardianManager.cs b/XOutput/Tools/HidGuardianManager.cs
@@ -9,25 +9,18 @@ public class HidGuardianManager
         static readonly string WHITE_LIST = PARAMETERS + "\\Whitelist";
         static readonly string AFFECTED_DEVICES = "AffectedDevices";
 
-        private RegistryModifier registryModifier;
-
-        public HidGuardianManager(RegistryModifier registryModifier)
-        {
-            this.registryModifier = registryModifier;
-        }
-
         public void ResetPid(int pid)
         {
-            if (registryModifier.KeyExists(Registry.LocalMachine, WHITE_LIST))
+            if (RegistryModifier.KeyExists(Registry.LocalMachine, WHITE_LIST))
             {
-                registryModifier.DeleteTree(Registry.LocalMachine, WHITE_LIST);
+                RegistryModifier.DeleteTree(Registry.LocalMachine, WHITE_LIST);
             }
-            registryModifier.CreateKey(Registry.LocalMachine, WHITE_LIST + "\\" + pid);
+            RegistryModifier.CreateKey(Registry.LocalMachine, WHITE_LIST + "\\" + pid);
         }
 
         public List<string> GetDevices()
         {
-            object value = registryModifier.GetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES);
+            object value = RegistryModifier.GetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES);
             if (value is string[])
             {
                 return new List<string>(value as string[]);
@@ -43,7 +36,7 @@ public void AddAffectedDevice(string device)
             }
             var devices = GetDevices();
             devices.Add(device);
-            registryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());
+            RegistryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());
         }
 
         public bool RemoveAffectedDevice(string device)
@@ -56,7 +49,7 @@ public bool RemoveAffectedDevice(string device)
             bool removed = devices.Remove(device);
             if (removed)
             {
-                registryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());
+                RegistryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());
             }
             return removed;
         }
diff --git a/XOutput/Tools/RegistryModifier.cs b/XOutput/Tools/RegistryModifier.cs
@@ -74,42 +74,47 @@ public void ClearAutostart()
             }
         }
 
-        private RegistryKey GetRegistryKey(bool writeable = true)
+        private static RegistryKey GetRegistryKey(bool writeable = true)
         {
             return Registry.CurrentUser.OpenSubKey(AutostartRegistry, writeable);
         }
 
-        public bool KeyExists(RegistryKey registryKey, string subkey)
+        public static bool KeyExists(RegistryKey registryKey, string subkey)
         {
             using (var registry = registryKey.OpenSubKey(subkey))
             {
                 return registry != null;
             }
         }
 
-        public void DeleteTree(RegistryKey registryKey, string subkey)
+        public static void DeleteTree(RegistryKey registryKey, string subkey)
         {
             registryKey.DeleteSubKeyTree(subkey, false);
             registryKey.Close();
         }
 
-        public void CreateKey(RegistryKey registryKey, string subkey)
+        public static void CreateKey(RegistryKey registryKey, string subkey)
         {
             var registry = registryKey.CreateSubKey(subkey);
             registry.Close();
         }
 
-        public object GetValue(RegistryKey registryKey, string subkey, string key)
+        public static object GetValue(RegistryKey registryKey, string subkey, string key)
         {
             return registryKey.OpenSubKey(subkey).GetValue(key);
         }
 
-        public void SetValue(RegistryKey registryKey, string subkey, string key, object value)
+        public static void SetValue(RegistryKey registryKey, string subkey, string key, object value)
         {
             using (var registry = registryKey.OpenSubKey(subkey, true))
             {
                 registry.SetValue(key, value);
             }
         }
+
+        public static string[] GetSubKeyNames(RegistryKey registryKey, string subkey)
+        {
+            return registryKey.OpenSubKey(subkey).GetSubKeyNames();
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ public static ArgumentParser GetArgumentParser()`
`16`	`16`	`return new ArgumentParser();`
`17`	`17`	`}`
`18`	`18`	`[ResolverMethod]`
`19`		`- public static HidGuardianManager GetHidGuardianManager(RegistryModifier registryModifier)`
	`19`	`+ public static HidGuardianManager GetHidGuardianManager()`
`20`	`20`	`{`
`21`		`- return new HidGuardianManager(registryModifier);`
	`21`	`+ return new HidGuardianManager();`
`22`	`22`	`}`
`23`	`23`	`[ResolverMethod]`
`24`	`24`	`public static RegistryModifier GetRegistryModifier()`
Original file line number	Diff line number	Diff line change
`@@ -9,25 +9,18 @@ public class HidGuardianManager`
`9`	`9`	`static readonly string WHITE_LIST = PARAMETERS + "\\Whitelist";`
`10`	`10`	`static readonly string AFFECTED_DEVICES = "AffectedDevices";`
`11`	`11`
`12`		`- private RegistryModifier registryModifier;`
`13`		`-`
`14`		`- public HidGuardianManager(RegistryModifier registryModifier)`
`15`		`- {`
`16`		`- this.registryModifier = registryModifier;`
`17`		`- }`
`18`		`-`
`19`	`12`	`public void ResetPid(int pid)`
`20`	`13`	`{`
`21`		`- if (registryModifier.KeyExists(Registry.LocalMachine, WHITE_LIST))`
	`14`	`+ if (RegistryModifier.KeyExists(Registry.LocalMachine, WHITE_LIST))`
`22`	`15`	`{`
`23`		`- registryModifier.DeleteTree(Registry.LocalMachine, WHITE_LIST);`
	`16`	`+ RegistryModifier.DeleteTree(Registry.LocalMachine, WHITE_LIST);`
`24`	`17`	`}`
`25`		`- registryModifier.CreateKey(Registry.LocalMachine, WHITE_LIST + "\\" + pid);`
	`18`	`+ RegistryModifier.CreateKey(Registry.LocalMachine, WHITE_LIST + "\\" + pid);`
`26`	`19`	`}`
`27`	`20`
`28`	`21`	`public List<string> GetDevices()`
`29`	`22`	`{`
`30`		`- object value = registryModifier.GetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES);`
	`23`	`+ object value = RegistryModifier.GetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES);`
`31`	`24`	`if (value is string[])`
`32`	`25`	`{`
`33`	`26`	`return new List<string>(value as string[]);`
`@@ -43,7 +36,7 @@ public void AddAffectedDevice(string device)`
`43`	`36`	`}`
`44`	`37`	`var devices = GetDevices();`
`45`	`38`	`devices.Add(device);`
`46`		`- registryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());`
	`39`	`+ RegistryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());`
`47`	`40`	`}`
`48`	`41`
`49`	`42`	`public bool RemoveAffectedDevice(string device)`
`@@ -56,7 +49,7 @@ public bool RemoveAffectedDevice(string device)`
`56`	`49`	`bool removed = devices.Remove(device);`
`57`	`50`	`if (removed)`
`58`	`51`	`{`
`59`		`- registryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());`
	`52`	`+ RegistryModifier.SetValue(Registry.LocalMachine, PARAMETERS, AFFECTED_DEVICES, devices.ToArray());`
`60`	`53`	`}`
`61`	`54`	`return removed;`
`62`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,42 +74,47 @@ public void ClearAutostart()`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- private RegistryKey GetRegistryKey(bool writeable = true)`
	`77`	`+ private static RegistryKey GetRegistryKey(bool writeable = true)`
`78`	`78`	`{`
`79`	`79`	`return Registry.CurrentUser.OpenSubKey(AutostartRegistry, writeable);`
`80`	`80`	`}`
`81`	`81`
`82`		`- public bool KeyExists(RegistryKey registryKey, string subkey)`
	`82`	`+ public static bool KeyExists(RegistryKey registryKey, string subkey)`
`83`	`83`	`{`
`84`	`84`	`using (var registry = registryKey.OpenSubKey(subkey))`
`85`	`85`	`{`
`86`	`86`	`return registry != null;`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- public void DeleteTree(RegistryKey registryKey, string subkey)`
	`90`	`+ public static void DeleteTree(RegistryKey registryKey, string subkey)`
`91`	`91`	`{`
`92`	`92`	`registryKey.DeleteSubKeyTree(subkey, false);`
`93`	`93`	`registryKey.Close();`
`94`	`94`	`}`
`95`	`95`
`96`		`- public void CreateKey(RegistryKey registryKey, string subkey)`
	`96`	`+ public static void CreateKey(RegistryKey registryKey, string subkey)`
`97`	`97`	`{`
`98`	`98`	`var registry = registryKey.CreateSubKey(subkey);`
`99`	`99`	`registry.Close();`
`100`	`100`	`}`
`101`	`101`
`102`		`- public object GetValue(RegistryKey registryKey, string subkey, string key)`
	`102`	`+ public static object GetValue(RegistryKey registryKey, string subkey, string key)`
`103`	`103`	`{`
`104`	`104`	`return registryKey.OpenSubKey(subkey).GetValue(key);`
`105`	`105`	`}`
`106`	`106`
`107`		`- public void SetValue(RegistryKey registryKey, string subkey, string key, object value)`
	`107`	`+ public static void SetValue(RegistryKey registryKey, string subkey, string key, object value)`
`108`	`108`	`{`
`109`	`109`	`using (var registry = registryKey.OpenSubKey(subkey, true))`
`110`	`110`	`{`
`111`	`111`	`registry.SetValue(key, value);`
`112`	`112`	`}`
`113`	`113`	`}`
	`114`	`+`
	`115`	`+ public static string[] GetSubKeyNames(RegistryKey registryKey, string subkey)`
	`116`	`+ {`
	`117`	`+ return registryKey.OpenSubKey(subkey).GetSubKeyNames();`
	`118`	`+ }`
`114`	`119`	`}`
`115`	`120`	`}`