NVAPI R570 + .NET FW 4.8.1 + small improvements

Orbmu2k · Feb 7, 2025 · 7eca55a · 7eca55a
1 parent 332153b
commit 7eca55a
Show file tree

Hide file tree

Showing 8 changed files with 543 additions and 197 deletions.
diff --git a/nspector/Common/DrsServiceLocator.cs b/nspector/Common/DrsServiceLocator.cs
@@ -14,6 +14,8 @@ internal class DrsServiceLocator
         public static readonly DrsScannerService ScannerService;
         public static readonly DrsDecrypterService DecrypterService;
 
+        public static bool IsExternalCustomSettings { get; private set; } = false;
+
         static DrsServiceLocator()
         {
             CustomSettings = LoadCustomSettings();
@@ -31,7 +33,18 @@ private static CustomSettingNames LoadCustomSettings()
             string csnDefaultPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\CustomSettingNames.xml";
 
             if (File.Exists(csnDefaultPath))
-                return CustomSettingNames.FactoryLoadFromFile(csnDefaultPath);
+            {
+                try
+                {
+                    var externalSettings = CustomSettingNames.FactoryLoadFromFile(csnDefaultPath);
+                    IsExternalCustomSettings = true;
+                    return externalSettings;
+                }
+                catch
+                {
+                    return CustomSettingNames.FactoryLoadFromString(Properties.Resources.CustomSettingNames);
+                }
+            }
             else
                 return CustomSettingNames.FactoryLoadFromString(Properties.Resources.CustomSettingNames);
         }
@@ -40,8 +53,12 @@ private static CustomSettingNames LoadReferenceSettings()
         {
             string csnDefaultPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\Reference.xml";
 
-            if (File.Exists(csnDefaultPath))
-                return CustomSettingNames.FactoryLoadFromFile(csnDefaultPath);
+            try
+            {
+                if (File.Exists(csnDefaultPath))
+                    return CustomSettingNames.FactoryLoadFromFile(csnDefaultPath);
+            }
+            catch { }
 
             return null;
         }

diff --git a/nspector/Native/NVAPI/NvApiDriverSettings.cs b/nspector/Native/NVAPI/NvApiDriverSettings.cs
diff --git a/nspector/Native/NVAPI/NvApiDriverSettings.h b/nspector/Native/NVAPI/NvApiDriverSettings.h
diff --git a/nspector/Properties/AssemblyInfo.cs b/nspector/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NVIDIA Profile Inspector")]
-[assembly: AssemblyCopyright("©2022 by Orbmu2k")]
+[assembly: AssemblyCopyright("©2025 by Orbmu2k")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/nspector/Properties/Resources.Designer.cs b/nspector/Properties/Resources.Designer.cs
diff --git a/nspector/app.config b/nspector/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
diff --git a/nspector/frmDrvSettings.cs b/nspector/frmDrvSettings.cs
@@ -497,7 +497,8 @@ private void SetTitleVersion()
             var numberFormat = new NumberFormatInfo() { NumberDecimalSeparator = "." };
             var version = Assembly.GetExecutingAssembly().GetName().Version;
             var fileVersionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
-            Text = $"{Application.ProductName} {version} - Geforce {_drs.DriverVersion.ToString("#.00", numberFormat)} - Profile Settings - {fileVersionInfo.LegalCopyright}";
+            var externalCsn = DrsServiceLocator.IsExternalCustomSettings ? " - CSN OVERRIDE!" : "";
+            Text = $"{Application.ProductName} {version} - Geforce {_drs.DriverVersion.ToString("#.00", numberFormat)} - Profile Settings - {fileVersionInfo.LegalCopyright}{externalCsn}";
         }
 
         private static void InitMessageFilter(IntPtr handle)

diff --git a/nspector/nvidiaProfileInspector.csproj b/nspector/nvidiaProfileInspector.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nspector</RootNamespace>
     <AssemblyName>nvidiaProfileInspector</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>x86</PlatformTarget>
     <TargetFrameworkProfile />