Astronomy/MeadeGeneric
1
0
Fork 0
Code Pull Requests Wiki Activity

Code inspections

Browse Source
This commit is contained in:
Colin Dawson
2019-10-01 19:12:34 +01:00
parent 5efde9f6e0
commit 28889bdb49
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net/LocalServer.cs
+12 -12
View File
@@ -173,7 +173,7 @@ namespace ASCOM.Meade.net
_sComObjectTypes = new ArrayList(); _sComObjectTypes = new ArrayList();
// put everything into one folder, the same as the server. // put everything into one folder, the same as the server.
string assyPath = Assembly.GetEntryAssembly().Location; string assyPath = Assembly.GetEntryAssembly()?.Location;
assyPath = Path.GetDirectoryName(assyPath); assyPath = Path.GetDirectoryName(assyPath);
if (assyPath == null) if (assyPath == null)
throw new System.InvalidOperationException(); throw new System.InvalidOperationException();
@@ -297,9 +297,9 @@ namespace ASCOM.Meade.net
// //
using (RegistryKey key = Registry.ClassesRoot.CreateSubKey("APPID\\" + _sAppId)) using (RegistryKey key = Registry.ClassesRoot.CreateSubKey("APPID\\" + _sAppId))
{ {
key.SetValue(null, assyDescription); key?.SetValue(null, assyDescription);
key.SetValue("AppID", _sAppId); key?.SetValue("AppID", _sAppId);
key.SetValue("AuthenticationLevel", 1, RegistryValueKind.DWord); key?.SetValue("AuthenticationLevel", 1, RegistryValueKind.DWord);
} }
// //
// HKCR\APPID\exename.ext // HKCR\APPID\exename.ext
@@ -307,7 +307,7 @@ namespace ASCOM.Meade.net
using (RegistryKey key = Registry.ClassesRoot.CreateSubKey( using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(
$"APPID\\{Application.ExecutablePath.Substring(Application.ExecutablePath.LastIndexOf('\\') + 1)}")) $"APPID\\{Application.ExecutablePath.Substring(Application.ExecutablePath.LastIndexOf('\\') + 1)}"))
{ {
key.SetValue("AppID", _sAppId); key?.SetValue("AppID", _sAppId);
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -335,20 +335,20 @@ namespace ASCOM.Meade.net
using (RegistryKey key = Registry.ClassesRoot.CreateSubKey($"CLSID\\{clsid}")) using (RegistryKey key = Registry.ClassesRoot.CreateSubKey($"CLSID\\{clsid}"))
{ {
key.SetValue(null, progid); // Could be assyTitle/Desc??, but .NET components show ProgId here key?.SetValue(null, progid); // Could be assyTitle/Desc??, but .NET components show ProgId here
key.SetValue("AppId", _sAppId); key?.SetValue("AppId", _sAppId);
using (RegistryKey key2 = key.CreateSubKey("Implemented Categories")) using (RegistryKey key2 = key.CreateSubKey("Implemented Categories"))
{ {
key2.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}"); key2?.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}");
} }
using (RegistryKey key2 = key.CreateSubKey("ProgId")) using (RegistryKey key2 = key.CreateSubKey("ProgId"))
{ {
key2.SetValue(null, progid); key2?.SetValue(null, progid);
} }
key.CreateSubKey("Programmable"); key.CreateSubKey("Programmable");
using (RegistryKey key2 = key.CreateSubKey("LocalServer32")) using (RegistryKey key2 = key.CreateSubKey("LocalServer32"))
{ {
key2.SetValue(null, Application.ExecutablePath); key2?.SetValue(null, Application.ExecutablePath);
} }
} }
// //
@@ -356,10 +356,10 @@ namespace ASCOM.Meade.net
// //
using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(progid)) using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(progid))
{ {
key.SetValue(null, assyTitle); key?.SetValue(null, assyTitle);
using (RegistryKey key2 = key.CreateSubKey("CLSID")) using (RegistryKey key2 = key.CreateSubKey("CLSID"))
{ {
key2.SetValue(null, clsid); key2?.SetValue(null, clsid);
} }
} }
// //