Create application manifest.

Require highest available rights. Return dialog message when registry is failed to be set.
gwdevhub · Apr 12, 2021 · 071007c · 071007c
1 parent 57192d5
commit 071007c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 7 deletions.
diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj
@@ -9,7 +9,8 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Daybreak/Services/ApplicationDetection/ApplicationDetector.cs b/Daybreak/Services/ApplicationDetection/ApplicationDetector.cs
@@ -1,7 +1,9 @@
 using Daybreak.Models;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.Credentials;
+using Daybreak.Services.Logging;
 using Daybreak.Services.Mutex;
+using Daybreak.Utils;
 using Microsoft.Win32;
 using Pepa.Wpf.Utilities;
 using System;
@@ -11,6 +13,8 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Security;
+using System.Security.Permissions;
 
 namespace Daybreak.Services.ApplicationDetection
 {
@@ -23,15 +27,18 @@ public class ApplicationDetector : IApplicationDetector
         private readonly IConfigurationManager configurationManager;
         private readonly ICredentialManager credentialManager;
         private readonly IMutexHandler mutexHandler;
+        private readonly ILogger logger;
 
         public bool IsGuildwarsRunning => this.GuildwarsProcessDetected();
         public bool IsToolboxRunning => GuildwarsToolboxProcessDetected();
 
         public ApplicationDetector(
             IConfigurationManager configurationManager,
             ICredentialManager credentialManager,
-            IMutexHandler mutexHandler)
+            IMutexHandler mutexHandler,
+            ILogger logger)
         {
+            this.logger = logger.ThrowIfNull(nameof(logger));
             this.mutexHandler = mutexHandler.ThrowIfNull(nameof(mutexHandler));
             this.credentialManager = credentialManager.ThrowIfNull(nameof(credentialManager));
             this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
@@ -77,7 +84,7 @@ public void LaunchGuildwarsToolbox()
             }
         }
 
-        private void LaunchGuildwarsProcess(string email, SecureString password, string character)
+        private void LaunchGuildwarsProcess(string email, Models.SecureString password, string character)
         {
             var executable = this.configurationManager.GetConfiguration().GamePath;
             if (File.Exists(executable) is false)
@@ -121,10 +128,17 @@ private void ClearGwLocks()
         private void SetRegistryGuildwarsPath()
         {
             var gamePath = this.configurationManager.GetConfiguration().GamePath;
-            var registryKey = GetGuildwarsRegistryKey(true);
-            registryKey.SetValue("Path", gamePath);
-            registryKey.SetValue("Src", gamePath);
-            registryKey.Close();
+            try
+            {
+                var registryKey = GetGuildwarsRegistryKey(true);
+                registryKey.SetValue("Path", gamePath);
+                registryKey.SetValue("Src", gamePath);
+                registryKey.Close();
+            }
+            catch (SecurityException ex)
+            {
+                this.logger.LogCritical($"Multi-launch requires administrator rights. Details: {ex}");
+            }
         }
 
         private RegistryKey GetGuildwarsRegistryKey(bool write)

diff --git a/Daybreak/app.manifest b/Daybreak/app.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>