Added .NET Framework 4 target for "ComPortHelper" library
Update ComPortHelper.cs, ComPortInfo.cs, and 2 more files...
This commit is contained in:
@@ -1,73 +1,81 @@
|
||||
using Microsoft.Win32;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Microsoft.Win32;
|
||||
using static NibblePoker.Library.RegistryHelpers.RegistryHelpers;
|
||||
|
||||
namespace NibblePoker.Library.ComPortWatcher;
|
||||
namespace NibblePoker.Library.ComPortWatcher {
|
||||
public static class ComPortHelper {
|
||||
private const string RegistryKeySerial = "HARDWARE\\DEVICEMAP\\SERIALCOMM";
|
||||
private const string RegistryKeyDeviceEnum = "SYSTEM\\ControlSet001\\Enum";
|
||||
|
||||
public static class ComPortHelper {
|
||||
private const string RegistryKeySerial = "HARDWARE\\DEVICEMAP\\SERIALCOMM";
|
||||
private const string RegistryKeyDeviceEnum = "SYSTEM\\ControlSet001\\Enum";
|
||||
|
||||
private static readonly string[] IgnoredRegistryDeviceEnums = {
|
||||
"ACPI", "ACPI_HAL", "HDAUDIO", "SCSI", "STORAGE", "SW", "SWD", "UEFI"
|
||||
};
|
||||
|
||||
private const string RegistryNameFriendlyName = "FriendlyName";
|
||||
|
||||
private static void AddFriendlyNamesToPortsInfo(List<ComPortInfo> comPortsInfo) {
|
||||
List<string> subKeys = GetSubKeys(Registry.LocalMachine, RegistryKeyDeviceEnum);
|
||||
List<string> intermediateSubKeys = new List<string>();
|
||||
List<string> finalSubKeys = new List<string>();
|
||||
List<string> friendlyNames = new List<string>();
|
||||
|
||||
foreach(var subKey in subKeys.Where(subKey => !IgnoredRegistryDeviceEnums.Contains(subKey))) {
|
||||
intermediateSubKeys.AddRange(GetSubKeys(
|
||||
Registry.LocalMachine,
|
||||
RegistryKeyDeviceEnum + "\\" + subKey,
|
||||
true));
|
||||
}
|
||||
subKeys.Clear();
|
||||
|
||||
foreach(string subSubKey in intermediateSubKeys) {
|
||||
finalSubKeys.AddRange(GetSubKeys(
|
||||
Registry.LocalMachine,
|
||||
subSubKey,
|
||||
true));
|
||||
}
|
||||
intermediateSubKeys.Clear();
|
||||
|
||||
foreach(string finalSubKey in finalSubKeys) {
|
||||
Dictionary<string, string> mappedKeyValues = GetMappedKeyNameStringValue(Registry.LocalMachine, finalSubKey);
|
||||
|
||||
if(mappedKeyValues.ContainsKey(RegistryNameFriendlyName)) {
|
||||
friendlyNames.Add(mappedKeyValues[RegistryNameFriendlyName]);
|
||||
private static readonly string[] IgnoredRegistryDeviceEnums = {
|
||||
"ACPI", "ACPI_HAL", "HDAUDIO", "SCSI", "STORAGE", "SW", "SWD", "UEFI"
|
||||
};
|
||||
|
||||
private const string RegistryNameFriendlyName = "FriendlyName";
|
||||
|
||||
private static void AddFriendlyNamesToPortsInfo(List<ComPortInfo> comPortsInfo) {
|
||||
List<string> subKeys = GetSubKeys(Registry.LocalMachine, RegistryKeyDeviceEnum);
|
||||
List<string> intermediateSubKeys = new List<string>();
|
||||
List<string> finalSubKeys = new List<string>();
|
||||
List<string> friendlyNames = new List<string>();
|
||||
|
||||
foreach(var subKey in subKeys.Where(subKey => !IgnoredRegistryDeviceEnums.Contains(subKey))) {
|
||||
intermediateSubKeys.AddRange(GetSubKeys(
|
||||
Registry.LocalMachine,
|
||||
RegistryKeyDeviceEnum + "\\" + subKey,
|
||||
true));
|
||||
}
|
||||
}
|
||||
finalSubKeys.Clear();
|
||||
|
||||
foreach(ComPortInfo comPortInfo in comPortsInfo) {
|
||||
foreach(string friendlyName in friendlyNames) {
|
||||
if(!friendlyName.Contains("(" + comPortInfo.RawName + ")")) {
|
||||
continue;
|
||||
|
||||
subKeys.Clear();
|
||||
|
||||
foreach(string subSubKey in intermediateSubKeys) {
|
||||
finalSubKeys.AddRange(GetSubKeys(
|
||||
Registry.LocalMachine,
|
||||
subSubKey,
|
||||
true));
|
||||
}
|
||||
|
||||
intermediateSubKeys.Clear();
|
||||
|
||||
foreach(string finalSubKey in finalSubKeys) {
|
||||
Dictionary<string, string> mappedKeyValues =
|
||||
GetMappedKeyNameStringValue(Registry.LocalMachine, finalSubKey);
|
||||
|
||||
if(mappedKeyValues.ContainsKey(RegistryNameFriendlyName)) {
|
||||
friendlyNames.Add(mappedKeyValues[RegistryNameFriendlyName]);
|
||||
}
|
||||
|
||||
comPortInfo.FriendlyName = friendlyName;
|
||||
break;
|
||||
}
|
||||
}
|
||||
friendlyNames.Clear();
|
||||
}
|
||||
|
||||
public static List<ComPortInfo> GetComList(bool addFriendlyNames = false) {
|
||||
List<ComPortInfo> portsInfo = new List<ComPortInfo>();
|
||||
|
||||
foreach(KeyValuePair<string, string> rawPortInfo in GetMappedKeyNameStringValue(Registry.LocalMachine, RegistryKeySerial)) {
|
||||
portsInfo.Add(new ComPortInfo(rawPortInfo.Value, rawPortInfo.Key));
|
||||
finalSubKeys.Clear();
|
||||
|
||||
foreach(ComPortInfo comPortInfo in comPortsInfo) {
|
||||
foreach(string friendlyName in friendlyNames) {
|
||||
if(!friendlyName.Contains("(" + comPortInfo.RawName + ")")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
comPortInfo.FriendlyName = friendlyName;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
friendlyNames.Clear();
|
||||
}
|
||||
|
||||
if(addFriendlyNames && portsInfo.Count > 0) {
|
||||
AddFriendlyNamesToPortsInfo(portsInfo);
|
||||
|
||||
public static List<ComPortInfo> GetComList(bool addFriendlyNames = false) {
|
||||
List<ComPortInfo> portsInfo = new List<ComPortInfo>();
|
||||
|
||||
foreach(KeyValuePair<string, string> rawPortInfo in GetMappedKeyNameStringValue(Registry.LocalMachine,
|
||||
RegistryKeySerial)) {
|
||||
portsInfo.Add(new ComPortInfo(rawPortInfo.Value, rawPortInfo.Key));
|
||||
}
|
||||
|
||||
if(addFriendlyNames && portsInfo.Count > 0) {
|
||||
AddFriendlyNamesToPortsInfo(portsInfo);
|
||||
}
|
||||
|
||||
return portsInfo;
|
||||
}
|
||||
|
||||
return portsInfo;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
namespace NibblePoker.Library.ComPortWatcher;
|
||||
namespace NibblePoker.Library.ComPortWatcher {
|
||||
public class ComPortInfo {
|
||||
public string RawName;
|
||||
public string DeviceName;
|
||||
public string FriendlyName;
|
||||
|
||||
public class ComPortInfo {
|
||||
public string RawName;
|
||||
public string DeviceName;
|
||||
public string FriendlyName;
|
||||
|
||||
public ComPortInfo(string rawName, string deviceName, string friendlyName = "") {
|
||||
RawName = rawName;
|
||||
DeviceName = deviceName;
|
||||
|
||||
if(string.IsNullOrEmpty(friendlyName)) {
|
||||
FriendlyName = "No friendly name found (" + rawName + ")";
|
||||
} else {
|
||||
FriendlyName = friendlyName;
|
||||
public ComPortInfo(string rawName, string deviceName, string friendlyName = "") {
|
||||
RawName = rawName;
|
||||
DeviceName = deviceName;
|
||||
|
||||
if(string.IsNullOrEmpty(friendlyName)) {
|
||||
FriendlyName = "No friendly name found (" + rawName + ")";
|
||||
} else {
|
||||
FriendlyName = friendlyName;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<TargetFrameworks>net40;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
|
||||
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>disable</Nullable>
|
||||
|
||||
<RootNamespace>NibblePoker.Library.ComPortWatcher</RootNamespace>
|
||||
<AssemblyName>NibblePoker.Library.ComPortHelpers</AssemblyName>
|
||||
<Configurations>Release</Configurations>
|
||||
@@ -11,7 +13,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NibblePoker.Library.RegistryHelpers" Version="0.0.1" />
|
||||
<PackageReference Include="NibblePoker.Library.RegistryHelpers" Version="1.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
namespace NibblePoker.Library.ComPortWatcher;
|
||||
|
||||
public enum SortingOrder {
|
||||
Descending = -1,
|
||||
None = 0,
|
||||
Ascending = 1,
|
||||
namespace NibblePoker.Library.ComPortWatcher {
|
||||
public enum SortingOrder {
|
||||
Descending = -1,
|
||||
None = 0,
|
||||
Ascending = 1,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user