Move to .NET 4.8.1 and cleanup code

Migrated to 4.8.1 and cleaned up various functions for the .NET version, could be simplified, were more secure, or were unused.

Author: AnubyteCode

nspector/Common/Cache/CachedSettingValue.cs

@@ -31,7 +31,7 @@ internal CachedSettingValue(byte[] ValueBin, string ProfileNames)
 
         internal string ValueStr = "";
         internal uint Value = 0;
-        internal byte[] ValueBin = new byte[0];
+        internal byte[] ValueBin = [];
         internal StringBuilder ProfileNames;
         internal uint ValueProfileCount;
     }

nspector/Common/Cache/CachedSettings.cs

@@ -16,7 +16,7 @@ internal CachedSettings(uint settingId, NVDRS_SETTING_TYPE settingType)
 
         internal uint SettingId;
 
-        internal List<CachedSettingValue> SettingValues = new List<CachedSettingValue>();
+        internal List<CachedSettingValue> SettingValues = [];
 
         internal uint ProfileCount = 0;
 

nspector/Common/CustomSettings/CustomSettingNames.cs

@@ -8,7 +8,7 @@ namespace nspector.Common.CustomSettings
     [Serializable]
     public class CustomSettingNames
     {
-        public List<CustomSetting> Settings = new List<CustomSetting>();
+        public List<CustomSetting> Settings = [];
 
         public void StoreToFile(string filename)
         {

nspector/Common/DrsDecrypterService.cs

@@ -11,7 +11,7 @@ namespace nspector.Common
     internal class DrsDecrypterService : DrsSettingsServiceBase
     {
 
-        private static readonly byte[] _InternalSettingsKey = new byte[] {
+        private static readonly byte[] _InternalSettingsKey = [
             0x2f, 0x7c, 0x4f, 0x8b, 0x20, 0x24, 0x52, 0x8d, 0x26, 0x3c, 0x94, 0x77, 0xf3, 0x7c, 0x98, 0xa5,
             0xfa, 0x71, 0xb6, 0x80, 0xdd, 0x35, 0x84, 0xba, 0xfd, 0xb6, 0xa6, 0x1b, 0x39, 0xc4, 0xcc, 0xb0,
             0x7e, 0x95, 0xd9, 0xee, 0x18, 0x4b, 0x9c, 0xf5, 0x2d, 0x4e, 0xd0, 0xc1, 0x55, 0x17, 0xdf, 0x18,
@@ -27,7 +27,7 @@ internal class DrsDecrypterService : DrsSettingsServiceBase
             0x1c, 0x4b, 0xf8, 0x26, 0x03, 0x6e, 0xb2, 0x3f, 0x1e, 0xe6, 0xca, 0x3d, 0x61, 0x44, 0xb0, 0x92,
             0xaf, 0xf0, 0x88, 0xca, 0xe0, 0x5f, 0x5d, 0xf4, 0xdf, 0xc6, 0x4c, 0xa4, 0xe0, 0xca, 0xb0, 0x20,
             0x5d, 0xc0, 0xfa, 0xdd, 0x9a, 0x34, 0x8f, 0x50, 0x79, 0x5a, 0x5f, 0x7c, 0x19, 0x9e, 0x40, 0x70,
-            0x71, 0xb5, 0x45, 0x19, 0xb8, 0x53, 0xfc, 0xdf, 0x24, 0xbe, 0x22, 0x1c, 0x79, 0xbf, 0x42, 0x89 };
+            0x71, 0xb5, 0x45, 0x19, 0xb8, 0x53, 0xfc, 0xdf, 0x24, 0xbe, 0x22, 0x1c, 0x79, 0xbf, 0x42, 0x89 ];
 
         public DrsDecrypterService(DrsSettingsMetaService metaService) : base(metaService)
         {
@@ -97,7 +97,7 @@ public bool IsInternalSetting(string profileName, uint settingId)
             return _InternalSettings.Contains(FormatInternalSettingKey(profileName, settingId));
         }
 
-        private HashSet<string> _InternalSettings = new HashSet<string>();
+        private HashSet<string> _InternalSettings = [];
 
         private void CreateInternalSettingMap()
         {
@@ -114,7 +114,7 @@ private void CreateInternalSettingMap()
                 {
                     var lines = File.ReadAllLines(tmpfile);
 
-                    _InternalSettings = new HashSet<string>();
+                    _InternalSettings = [];
 
                     var paProfile = "Profile\\s\\\"(?<profileName>.*?)\\\"";
                     var rxProfile = new Regex(paProfile, RegexOptions.Compiled);

nspector/Common/DrsImportService.cs

@@ -9,24 +9,16 @@
 
 namespace nspector.Common
 {
-    internal class DrsImportService : DrsSettingsServiceBase
+    internal class DrsImportService(
+        DrsSettingsMetaService metaService,
+        DrsSettingsService settingService,
+        DrsScannerService scannerService,
+        DrsDecrypterService decrypterService) : DrsSettingsServiceBase(metaService)
     {
 
-        private readonly DrsSettingsService _SettingService;
-        private readonly DrsScannerService _ScannerService;
-        private readonly DrsDecrypterService _DecrypterService;
-
-        public DrsImportService(
-            DrsSettingsMetaService metaService,
-            DrsSettingsService settingService,
-            DrsScannerService scannerService,
-            DrsDecrypterService decrypterService)
-            : base(metaService)
-        {
-            _SettingService = settingService;
-            _ScannerService = scannerService;
-            _DecrypterService = decrypterService;
-        }
+        private readonly DrsSettingsService _SettingService = settingService;
+        private readonly DrsScannerService _ScannerService = scannerService;
+        private readonly DrsDecrypterService _DecrypterService = decrypterService;
 
         internal void ExportAllProfilesToNvidiaTextFile(string filename)
         {
@@ -122,8 +114,7 @@ internal string ImportProfiles(string filename)
 
                     if (hProfile != IntPtr.Zero)
                     {
-                        var modified = false;
-                        _SettingService.ResetProfile(profile.ProfileName, out modified);
+                        _SettingService.ResetProfile(profile.ProfileName, out bool modified);
                         try
                         {
                             UpdateApplications(hSession, hProfile, profile);
@@ -137,8 +128,7 @@ internal string ImportProfiles(string filename)
                             }
 
                             sbFailedProfilesMessage.AppendLine(string.Format("Failed to import profile '{0}'", profile.ProfileName));
-                            var appEx = nex as NvapiAddApplicationException;
-                            if (appEx != null)
+                            if (nex is NvapiAddApplicationException appEx)
                             {
                                 var profilesWithThisApp = _ScannerService.FindProfilesUsingApplication(appEx.ApplicationName);
                                 sbFailedProfilesMessage.AppendLine(string.Format("- application '{0}' is already in use by profile '{1}'", appEx.ApplicationName, profilesWithThisApp));
@@ -197,6 +187,7 @@ private void UpdateApplications(IntPtr hSession, IntPtr hProfile, Profile import
             }
         }
 
+     /*
         private uint GetImportValue(uint settingId, Profile importProfile)
         {
             var setting = importProfile.Settings
@@ -207,6 +198,7 @@ private uint GetImportValue(uint settingId, Profile importProfile)
 
             return 0;
         }
+     */
 
         private ProfileSetting GetImportProfileSetting(uint settingId, Profile importProfile)
         {

nspector/Common/DrsScannerService.cs

@@ -13,23 +13,17 @@ namespace nspector.Common
 {
 
 
-    internal class DrsScannerService : DrsSettingsServiceBase
+    internal class DrsScannerService(DrsSettingsMetaService metaService, DrsDecrypterService decrpterService) : DrsSettingsServiceBase(metaService, decrpterService)
     {
-
-        public DrsScannerService(DrsSettingsMetaService metaService, DrsDecrypterService decrpterService)
-            : base(metaService, decrpterService)
-        { }
-
-
-        internal List<CachedSettings> CachedSettings = new List<CachedSettings>();
-        internal List<string> ModifiedProfiles = new List<string>();
-        internal HashSet<string> UserProfiles = new HashSet<string>();
+        internal List<CachedSettings> CachedSettings = [];
+        internal List<string> ModifiedProfiles = [];
+        internal HashSet<string> UserProfiles = [];
 
         // most common setting ids as start pattern for the heuristic scan
-        private readonly uint[] _commonSettingIds = new uint[] { 0x1095DEF8, 0x1033DCD2, 0x1033CEC1,
+        private readonly uint[] _commonSettingIds = [ 0x1095DEF8, 0x1033DCD2, 0x1033CEC1,
                             0x10930F46, 0x00A06946, 0x10ECDB82, 0x20EBD7B8, 0x0095DEF9, 0x00D55F7D,
                             0x1033DCD3, 0x1033CEC2, 0x2072F036, 0x00664339, 0x002C7F45, 0x209746C1,
-                            0x0076E164, 0x20FF7493, 0x204CFF7B };
+                            0x0076E164, 0x20FF7493, 0x204CFF7B ];
 
 
         private bool CheckCommonSetting(IntPtr hSession, IntPtr hProfile, NVDRS_PROFILE profile,
@@ -40,8 +34,10 @@ private bool CheckCommonSetting(IntPtr hSession, IntPtr hProfile, NVDRS_PROFILE
             if (checkedSettingsCount >= profile.numOfSettings)
                 return false;
 
-            var setting = new NVDRS_SETTING();
-            setting.version = nvw.NVDRS_SETTING_VER;
+            var setting = new NVDRS_SETTING
+            {
+                version = nvw.NVDRS_SETTING_VER
+            };
 
             if (nvw.DRS_GetSetting(hSession, hProfile, checkSettingId, ref setting) != NvAPI_Status.NVAPI_OK)
                 return false;
@@ -55,10 +51,7 @@ private bool CheckCommonSetting(IntPtr hSession, IntPtr hProfile, NVDRS_PROFILE
             }
             else if (addToScanResult)
             {
-                if (decrypter != null)
-                {
-                    decrypter.DecryptSettingIfNeeded(profile.profileName, ref setting);
-                }
+                decrypter?.DecryptSettingIfNeeded(profile.profileName, ref setting);
 
                 checkedSettingsCount++;
                 AddScannedSettingToCache(profile, setting);
@@ -79,12 +72,12 @@ private int CalcPercent(int current, int max)
             return (current > 0) ? (int)Math.Round((current * 100f) / max) : 0; ;
         }
 
-        public async Task ScanProfileSettingsAsync(bool justModified, IProgress<int> progress, CancellationToken token = default(CancellationToken))
+        public async Task ScanProfileSettingsAsync(bool justModified, IProgress<int> progress, CancellationToken token = default)
         {
             await Task.Run(() =>
             {
-                ModifiedProfiles = new List<string>();
-                UserProfiles = new HashSet<string>();
+                ModifiedProfiles = [];
+                UserProfiles = [];
                 var knownPredefines = new List<uint>(_commonSettingIds);
 
                 DrsSession((hSession) =>
@@ -162,7 +155,7 @@ await Task.Run(() =>
         private void AddScannedSettingToCache(NVDRS_PROFILE profile, NVDRS_SETTING setting)
         {
             // 3D Vision is dead so dont bother scanning those values for improved scan performance
-            bool allowAddValue = !((setting.settingId & 0x70000000) == 0x70000000); 
+            bool allowAddValue = !((setting.settingId & 0x70000000) == 0x70000000);
             //bool allowAddValue = true;
 
             var cachedSetting = CachedSettings
@@ -185,7 +178,7 @@ private void AddScannedSettingToCache(NVDRS_PROFILE profile, NVDRS_SETTING setti
                         cachedSetting.AddDwordValue(setting.predefinedValue.dwordValue, profile.profileName);
                     else if (setting.settingType == NVDRS_SETTING_TYPE.NVDRS_BINARY_TYPE)
                         cachedSetting.AddBinaryValue(setting.predefinedValue.binaryValue, profile.profileName);
-                    
+
                 }
                 else
                     cachedSetting.ProfileCount++;

nspector/Common/DrsSessionScope.cs

@@ -11,7 +11,7 @@ public class DrsSessionScope
 
         public static volatile bool HoldSession = true;
 
-        private static object _Sync = new object();
+        private static readonly object _Sync = new();
 
 
         public static T DrsSession<T>(Func<IntPtr, T> action, bool forceNonGlobalSession = false, bool preventLoadSettings = false)
@@ -55,7 +55,7 @@ public static void DestroyGlobalSession()
             {
                 if (GlobalSession != IntPtr.Zero)
                 {
-                    var csRes = nvw.DRS_DestroySession(GlobalSession);
+                    _ = nvw.DRS_DestroySession(GlobalSession);
                     GlobalSession = IntPtr.Zero;
                 }
             }

nspector/Common/DrsSettingsMetaService.cs

@@ -19,9 +19,9 @@ internal class DrsSettingsMetaService
         private readonly CustomSettingNames _customSettings;
         private readonly CustomSettingNames _referenceSettings;
 
-        private List<MetaServiceItem> MetaServices = new List<MetaServiceItem>();
+        private List<MetaServiceItem> MetaServices = [];
 
-        private Dictionary<uint, SettingMeta> settingMetaCache = new Dictionary<uint, SettingMeta>();
+        private Dictionary<uint, SettingMeta> settingMetaCache = [];
 
         public DrsSettingsMetaService(CustomSettingNames customSettings, CustomSettingNames referenceSettings = null)
         {
@@ -33,8 +33,8 @@ public DrsSettingsMetaService(CustomSettingNames customSettings, CustomSettingNa
 
         public void ResetMetaCache(bool initOnly = false)
         {
-            settingMetaCache = new Dictionary<uint, SettingMeta>();
-            MetaServices = new List<MetaServiceItem>();
+            settingMetaCache = [];
+            MetaServices = [];
 
             CustomMeta = new CustomSettingMetaService(_customSettings);
             MetaServices.Add(new MetaServiceItem() { ValueNamePrio = 1, Service = CustomMeta });
@@ -174,9 +174,9 @@ private List<SettingValue<T>> MergeSettingValues<T>(List<SettingValue<T>> a, Lis
 
             var atmp = a.FirstOrDefault();
             if (atmp != null && atmp is IComparable)
-                return a.OrderBy(x => x.Value).ToList();
+                return [.. a.OrderBy(x => x.Value)];
             else
-                return a.ToList();
+                return [.. a];
         }
 
         private List<SettingValue<byte[]>> GetBinaryValues(uint settingId)
@@ -214,7 +214,7 @@ private List<SettingValue<uint>> GetDwordValues(uint settingId)
 
             if (result != null)
             {
-                result = (from v in result.Where(x => 1 == 1
+                result = [.. (from v in result.Where(x => 1 == 1
                               && !x.ValueName.EndsWith("_NUM")
                               && !x.ValueName.EndsWith("_MASK")
                               && (!x.ValueName.EndsWith("_MIN") || x.ValueName.Equals("PREFERRED_PSTATE_PREFER_MIN"))
@@ -225,7 +225,7 @@ group v by v.ValueName into g
                           select g.First(t => t.ValueName == g.Key))
                             .OrderBy(v => v.ValueSource)
                             .ThenBy(v => v.ValuePos)
-                            .ThenBy(v => v.ValueName).ToList();
+                            .ThenBy(v => v.ValueName)];
 
             }
 
@@ -249,47 +249,42 @@ public List<uint> GetSettingIds(SettingViewMode viewMode)
 
         private SettingMetaSource[] GetAllowedSettingIdMetaSourcesForViewMode(SettingViewMode viewMode)
         {
-            switch (viewMode)
+            return viewMode switch
             {
-                case SettingViewMode.CustomSettingsOnly:
-                    return new[] {
-                        SettingMetaSource.CustomSettings
-                    };
-                case SettingViewMode.IncludeScannedSetttings:
-                    return new[] {
-                        SettingMetaSource.ConstantSettings,
+                SettingViewMode.CustomSettingsOnly => [
+                                        SettingMetaSource.CustomSettings
+                                    ],
+                SettingViewMode.IncludeScannedSetttings => [
+                                        SettingMetaSource.ConstantSettings,
                         SettingMetaSource.ScannedSettings,
                         SettingMetaSource.CustomSettings,
                         SettingMetaSource.DriverSettings,
                         SettingMetaSource.ReferenceSettings,
-                    };
-                default:
-                    return new[] {
+                    ],
+                _ => [
                         SettingMetaSource.CustomSettings,
                         SettingMetaSource.DriverSettings,
-                    };
-            }
+                    ],
+            };
         }
 
         private SettingMetaSource[] GetAllowedSettingValueMetaSourcesForViewMode(SettingViewMode viewMode)
         {
-            switch (viewMode)
+            return viewMode switch
             {
-                case SettingViewMode.CustomSettingsOnly:
-                    return new[] {
-                        SettingMetaSource.CustomSettings,
+                SettingViewMode.CustomSettingsOnly => [
+                                        SettingMetaSource.CustomSettings,
                         SettingMetaSource.ScannedSettings,
-                    };
-                default:
-                    return new[] {
+                    ],
+                _ => [
                         SettingMetaSource.ConstantSettings,
                         SettingMetaSource.ScannedSettings,
                         SettingMetaSource.CustomSettings,
                         SettingMetaSource.DriverSettings,
                         SettingMetaSource.ReferenceSettings,
 
-                    };
-            }
+                    ],
+            };
         }
 
         private SettingMeta CreateSettingMeta(uint settingId)
@@ -298,8 +293,7 @@ private SettingMeta CreateSettingMeta(uint settingId)
             var settingName = GetSettingName(settingId);
             var groupName = GetGroupName(settingId);
 
-            if (groupName == null)
-                groupName = GetLegacyGroupName(settingId, settingName);
+            groupName ??= GetLegacyGroupName(settingId, settingName);
 
 
 
@@ -397,7 +391,9 @@ public SettingMeta GetSettingMeta(uint settingId, SettingViewMode viewMode = Set
             }
         }
 
+#pragma warning disable IDE0060 // Remove unused parameter
         private string GetLegacyGroupName(uint settingId, string settingName)
+#pragma warning restore IDE0060 // Remove unused parameter
         {
             if (settingName == null)
                 return null;
@@ -428,7 +424,7 @@ private string GetDescription(uint settingId)
         {
             var csn = MetaServices.FirstOrDefault(m => m.Service.Source == SettingMetaSource.CustomSettings);
             var csnDescription = csn != null ? ((CustomSettingMetaService)csn.Service).GetDescription(settingId) ?? "" : "";
-            
+
             var refs = MetaServices.FirstOrDefault(m => m.Service.Source == SettingMetaSource.ReferenceSettings);
             var refsDescription = refs != null ? ((CustomSettingMetaService)refs.Service).GetDescription(settingId) ?? "" : "";