Merge pull request #146 from Timboy67678/master

Implemented run as admin and randomize window title option

Author: KN4CK3R

ReClass.NET/Forms/MainForm.cs

@@ -56,28 +56,37 @@ public ClassNode CurrentClassNode
 			}
 		}
 
+		private void UpdateWindowTitle(string extra = null)
+		{
+			var title = $"{(Program.Settings.RandomizeWindowTitle ? Utils.RandomString(Program.GlobalRandom.Next(15, 20)) : Constants.ApplicationName)} ({Constants.Platform})";
+			if (!string.IsNullOrEmpty(extra))
+			{
+				title += $" - {extra}";
+			}
+			Text = title;
+		}
+
 		public MainForm()
 		{
 			Contract.Ensures(pluginManager != null);
 			Contract.Ensures(currentProject != null);
 
 			InitializeComponent();
-
-			Text = $"{Constants.ApplicationName} ({Constants.Platform})";
+			UpdateWindowTitle();
 
 			mainMenuStrip.Renderer = new CustomToolStripProfessionalRenderer(true, true);
 			toolStrip.Renderer = new CustomToolStripProfessionalRenderer(true, false);
 
 			Program.RemoteProcess.ProcessAttached += sender =>
 			{
 				var text = $"{sender.UnderlayingProcess.Name} (ID: {sender.UnderlayingProcess.Id.ToString()})";
-
-				Text = $"{Constants.ApplicationName} ({Constants.Platform}) - {text}";
 				processInfoToolStripStatusLabel.Text = text;
+				UpdateWindowTitle(text);
+
 			};
 			Program.RemoteProcess.ProcessClosed += sender =>
 			{
-				Text = $"{Constants.ApplicationName} ({Constants.Platform})";
+				UpdateWindowTitle();
 				processInfoToolStripStatusLabel.Text = "No process selected";
 			};
 

ReClass.NET/Forms/SettingsForm.Designer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Windows.Forms;
 using ReClassNET.Extensions;
@@ -43,6 +44,7 @@ public SettingsForm(Settings settings, CppTypeMapping typeMapping)
 			if (NativeMethods.IsUnix())
 			{
 				fileAssociationGroupBox.Enabled = false;
+				runAsAdminCheckBox.Enabled = false;
 			}
 			else
 			{
@@ -105,6 +107,8 @@ private void SetGeneralBindings()
 			SetBinding(showSymbolsCheckBox, nameof(CheckBox.Checked), settings, nameof(Settings.ShowCommentSymbol));
 			SetBinding(showStringCheckBox, nameof(CheckBox.Checked), settings, nameof(Settings.ShowCommentString));
 			SetBinding(showPluginInfoCheckBox, nameof(CheckBox.Checked), settings, nameof(Settings.ShowCommentPluginInfo));
+			SetBinding(runAsAdminCheckBox, nameof(CheckBox.Checked), settings, nameof(Settings.RunAsAdmin));
+			SetBinding(randomizeWindowTitleCheckBox, nameof(CheckBox.Checked), settings, nameof(Settings.RandomizeWindowTitle));
 		}
 
 		private void SetColorBindings()

ReClass.NET/Forms/SettingsForm.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Drawing;
 using System.Globalization;
 using System.Windows.Forms;
@@ -66,6 +67,12 @@ static void Main(string[] args)
 			Settings = SettingsSerializer.Load();
 			Logger = new GuiLogger();
 
+			if(!NativeMethods.IsUnix() && Settings.RunAsAdmin && !WinUtil.IsAdministrator)
+			{
+				WinUtil.RunElevated(Process.GetCurrentProcess().MainModule.FileName, args.Length > 0 ? string.Join(" ", args) : null); 
+				return;
+			}
+
 #if !DEBUG
 			try
 			{

ReClass.NET/Program.cs

@@ -12,6 +12,10 @@ public class Settings
 
 		public bool StayOnTop { get; set; } = false;
 
+		public bool RunAsAdmin { get; set; } = false;
+
+		public bool RandomizeWindowTitle { get; set; } = false;
+
 		// Node Drawing Settings
 
 		public bool ShowNodeAddress { get; set; } = true;

ReClass.NET/Settings.cs

@@ -35,6 +35,8 @@ public static Settings Load()
 					{
 						XElementSerializer.TryRead(general, nameof(settings.LastProcess), e => settings.LastProcess = XElementSerializer.ToString(e));
 						XElementSerializer.TryRead(general, nameof(settings.StayOnTop), e => settings.StayOnTop = XElementSerializer.ToBool(e));
+						XElementSerializer.TryRead(general, nameof(settings.RunAsAdmin), e => settings.RunAsAdmin = XElementSerializer.ToBool(e));
+						XElementSerializer.TryRead(general, nameof(settings.RandomizeWindowTitle), e => settings.RandomizeWindowTitle = XElementSerializer.ToBool(e));
 					}
 					var display = root?.Element(XmlDisplayElement);
 					if (display != null)
@@ -105,7 +107,9 @@ public static void Save(Settings settings)
 						new XElement(
 							XmlGeneralElement,
 							XElementSerializer.ToXml(nameof(settings.LastProcess), settings.LastProcess),
-							XElementSerializer.ToXml(nameof(settings.StayOnTop), settings.StayOnTop)
+							XElementSerializer.ToXml(nameof(settings.StayOnTop), settings.StayOnTop),
+							XElementSerializer.ToXml(nameof(settings.RunAsAdmin), settings.RunAsAdmin),
+							XElementSerializer.ToXml(nameof(settings.RandomizeWindowTitle), settings.RandomizeWindowTitle)
 						),
 						new XElement(
 							XmlDisplayElement,

ReClass.NET/Util/SettingsSerializer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 
 namespace ReClassNET.Util
 {
@@ -50,5 +51,13 @@ public static void Swap<T>(ref T lhs, ref T rhs)
 			lhs = rhs;
 			rhs = temp;
 		}
+
+		//thx again stack overflow https://stackoverflow.com/a/1344242
+		public static string RandomString(int length)
+		{
+			const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+			return new string(Enumerable.Repeat(chars, length)
+			  .Select(s => s[Program.GlobalRandom.Next(s.Length)]).ToArray());
+		}
 	}
 }

ReClass.NET/Util/Util.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
+using System.Security.Principal;
 using Microsoft.Win32;
 
 namespace ReClassNET.Util
@@ -23,6 +24,9 @@ public static class WinUtil
 
 		public static bool IsAtLeastWindows10 { get; }
 
+		//from https://stackoverflow.com/a/11660205
+		public static bool IsAdministrator => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
+
 		static WinUtil()
 		{
 			var os = Environment.OSVersion;