Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
add administrator privileges check on startup (#103)
Greedeks679cd23398d4
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.csindex 366980b9..9295cb92 100644--- a/.Source/GTweak/App.xaml.cs+++ b/.Source/GTweak/App.xaml.cs@@ -44,6 +44,7 @@ namespace GTweakRunGuard.CheckingApplicationCopies();await RunGuard.CheckingSystemRequirements();+ RunGuard.CheckingAdministratorPrivileges();await _systemDataCollector.StartDeviceMonitoring();diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xamlindex 17d48983..fcb6615e 100644--- a/.Source/GTweak/Languages/en/Localize.xaml+++ b/.Source/GTweak/Languages/en/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">The utility does not support your Windows. No further launch is</v:String><v:String x:Key="part2_nosupport_message">possible,</v:String><v:String x:Key="part3_nosupport_message">GTweak will be closed to prevent critical errors.</v:String>+ <v:String x:Key="title_admin_message">Insufficient privileges</v:String>+ <v:String x:Key="part1_admin_message">Launching the program</v:String>+ <v:String x:Key="part2_admin_message">is not possible,</v:String>+ <v:String x:Key="part3_admin_message">for correct operation, please run it as an administrator.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xamlindex 16a9f696..8a651c40 100644--- a/.Source/GTweak/Languages/fr/Localize.xaml+++ b/.Source/GTweak/Languages/fr/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">L’utilitaire ne prend pas en charge votre version de Windows. Aucun lancement supplémentaire n’est</v:String><v:String x:Key="part2_nosupport_message">possible,</v:String><v:String x:Key="part3_nosupport_message">GTweak va se fermer pour éviter des erreurs critiques.</v:String>+ <v:String x:Key="title_admin_message">Privilèges insuffisants</v:String>+ <v:String x:Key="part1_admin_message">Lancement de l'utilitaire</v:String>+ <v:String x:Key="part2_admin_message">impossible,</v:String>+ <v:String x:Key="part3_admin_message">pour un fonctionnement correct, exécutez-le en tant qu'administrateur.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xamlindex 5e142eb9..b541a3b7 100644--- a/.Source/GTweak/Languages/hu/Localize.xaml+++ b/.Source/GTweak/Languages/hu/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">A segédprogram nem támogatja a Windows rendszert. Nincs további indítás</v:String><v:String x:Key="part2_nosupport_message">lehetséges,</v:String><v:String x:Key="part3_nosupport_message">A GTweak bezárul a kritikus hibák elkerülése érdekében.</v:String>+ <v:String x:Key="title_admin_message">Nincs elegendő jogosultság</v:String>+ <v:String x:Key="part1_admin_message">A segédprogram indítása</v:String>+ <v:String x:Key="part2_admin_message">nem lehetséges,</v:String>+ <v:String x:Key="part3_admin_message">a helyes működés érdekében indítsa rendszergazdai jogosultságokkal.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xamlindex 43989441..8b931bdd 100644--- a/.Source/GTweak/Languages/it/Localize.xaml+++ b/.Source/GTweak/Languages/it/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">L'utilità non supporta il tuo Windows. Nessun ulteriore avvio è</v:String><v:String x:Key="part2_nosupport_message">possibile,</v:String><v:String x:Key="part3_nosupport_message">GTweak verrà chiuso per prevenire errori critici.</v:String>+ <v:String x:Key="title_admin_message">Privilegi insufficienti</v:String>+ <v:String x:Key="part1_admin_message">Avvio dell'utility</v:String>+ <v:String x:Key="part2_admin_message">impossibile,</v:String>+ <v:String x:Key="part3_admin_message">per il corretto funzionamento, avviare l'applicazione come amministratore.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xamlindex f6c3cd49..54746612 100644--- a/.Source/GTweak/Languages/ko/Localize.xaml+++ b/.Source/GTweak/Languages/ko/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">이 유틸리티는 귀하의 Windows를 지원하지 않습니다. 더 이상</v:String><v:String x:Key="part2_nosupport_message">실행할 수 없으며</v:String><v:String x:Key="part3_nosupport_message">심각한 오류를 방지하기 위해 GTweak이 종료됩니다.</v:String>+ <v:String x:Key="title_admin_message">권한 부족</v:String>+ <v:String x:Key="part1_admin_message">유틸리티 실행</v:String>+ <v:String x:Key="part2_admin_message">불가능합니다,</v:String>+ <v:String x:Key="part3_admin_message">정상 동작을 위해 관리자 권한으로 실행해 주세요.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xamlindex 80a3e62d..6c158ca8 100644--- a/.Source/GTweak/Languages/pl/Localize.xaml+++ b/.Source/GTweak/Languages/pl/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">Narzędzie nie obsługuje Twojej wersji systemu Windows.</v:String><v:String x:Key="part2_nosupport_message">Dalsze uruchomienie</v:String><v:String x:Key="part3_nosupport_message">jest niemożliwe, GTweak zostanie zamknięty, aby zapobiec krytycznym błędom.</v:String>+ <v:String x:Key="title_admin_message">Niewystarczające uprawnienia</v:String>+ <v:String x:Key="part1_admin_message">Uruchomienie narzędzia</v:String>+ <v:String x:Key="part2_admin_message">niemożliwe,</v:String>+ <v:String x:Key="part3_admin_message">aby działało poprawnie, uruchom je jako administrator.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xamlindex 87ba4b7e..cc22a11b 100644--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml@@ -28,7 +28,11 @@<v:String x:Key="part1_nosupport_message">O utilitário não suporta o seu Windows. A execução não é</v:String><v:String x:Key="part2_nosupport_message">possível,</v:String><v:String x:Key="part3_nosupport_message">o GTweak será fechado para evitar erros críticos.</v:String>- <!--#endregion-->+ <v:String x:Key="title_admin_message">Permissões insuficientes</v:String>+ <v:String x:Key="part1_admin_message">Execução do utilitário</v:String>+ <v:String x:Key="part2_admin_message">não é possível,</v:String>+ <v:String x:Key="part3_admin_message">para o funcionamento correto, execute-o como administrador.</v:String>+ <!--#endregion--><!--#region Notification Window --><v:String x:Key="title_win_noty">Notificação - GTweak</v:String>diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xamlindex f5a462a6..caea7e94 100644--- a/.Source/GTweak/Languages/ru/Localize.xaml+++ b/.Source/GTweak/Languages/ru/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">Утилита не поддерживает вашу Windows. Дальнейший запуск</v:String><v:String x:Key="part2_nosupport_message">невозможен,</v:String><v:String x:Key="part3_nosupport_message">для предотвращения критических ошибок.</v:String>+ <v:String x:Key="title_admin_message">Недостаточно прав</v:String>+ <v:String x:Key="part1_admin_message">Запуск утилиты</v:String>+ <v:String x:Key="part2_admin_message">невозможен,</v:String>+ <v:String x:Key="part3_admin_message">для корректной работы запустите её от имени администратора.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xamlindex 71ff53d9..84762f13 100644--- a/.Source/GTweak/Languages/uk/Localize.xaml+++ b/.Source/GTweak/Languages/uk/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">Утиліта не підтримує вашу Windows. Подальший запуск</v:String><v:String x:Key="part2_nosupport_message">неможливий,</v:String><v:String x:Key="part3_nosupport_message">GTweak буде закрито для запобігання критичним помилкам.</v:String>+ <v:String x:Key="title_admin_message">Недостатньо прав</v:String>+ <v:String x:Key="part1_admin_message">Запуск утиліти</v:String>+ <v:String x:Key="part2_admin_message">неможливий,</v:String>+ <v:String x:Key="part3_admin_message">для коректної роботи запустіть її від імені адміністратора.</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xamlindex 3d9f4a59..eee2bfed 100644--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">该实用程序不支持您的 Windows 系统。</v:String><v:String x:Key="part2_nosupport_message">无法继续启动,</v:String><v:String x:Key="part3_nosupport_message">GTweak 将会关闭以防止严重错误。</v:String>+ <v:String x:Key="title_admin_message">权限不足</v:String>+ <v:String x:Key="part1_admin_message">启动该工具</v:String>+ <v:String x:Key="part2_admin_message">无法进行,</v:String>+ <v:String x:Key="part3_admin_message">为保证正常运行,请以管理员身份运行该程序。</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xamlindex 5083ae83..c8978884 100644--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml@@ -28,6 +28,10 @@<v:String x:Key="part1_nosupport_message">該實用程式不支援您的 Windows 系統。</v:String><v:String x:Key="part2_nosupport_message">無法繼續啟動,</v:String><v:String x:Key="part3_nosupport_message">GTweak 將會關閉以防止嚴重錯誤。</v:String>+ <v:String x:Key="title_admin_message">權限不足</v:String>+ <v:String x:Key="part1_admin_message">啟動此工具</v:String>+ <v:String x:Key="part2_admin_message">無法進行,</v:String>+ <v:String x:Key="part3_admin_message">為確保正常運作,請以系統管理員身分執行。</v:String><!--#endregion--><!--#region Notification Window -->diff --git a/.Source/GTweak/Utilities/Controls/RunGuard.cs b/.Source/GTweak/Utilities/Controls/RunGuard.csindex 873c7dba..15bdc2f9 100644--- a/.Source/GTweak/Utilities/Controls/RunGuard.cs+++ b/.Source/GTweak/Utilities/Controls/RunGuard.cs@@ -2,6 +2,7 @@ using System;using System.Diagnostics;using System.Linq;using System.Runtime.InteropServices;+using System.Security.Principal;using System.Threading;using System.Threading.Tasks;using System.Windows;@@ -56,9 +57,20 @@ namespace GTweak.Utilities.Controlsreturn;}- new MessageWindow(true).ShowDialog();+ new MessageWindow(MessageWindow.MessageWindowType.NotSupported).ShowDialog();}+ internal static void CheckingAdministratorPrivileges()+ {+ using WindowsIdentity identity = WindowsIdentity.GetCurrent();++ if (new WindowsPrincipal(identity).IsInRole(WindowsBuiltInRole.Administrator))+ {+ return;+ }++ new MessageWindow(MessageWindow.MessageWindowType.NotAdmin).ShowDialog();+ }internal static void CheckingDefenderExclusions() => CommandExecutor.RunCommandAsTrustedInstaller($@"$ErrorActionPreference = 'Stop'; $target = '{SettingsEngine.currentLocation}'; try {{ $mp = Get-MpPreference; if ($mp.ExclusionProcess -notcontains $target) {{ Add-MpPreference -ExclusionProcess $target }}; if ($mp.ExclusionPath -notcontains $target) {{ Add-MpPreference -ExclusionPath $target }} }} catch {{}}", true);}}diff --git a/.Source/GTweak/Windows/MessageWindow.xaml b/.Source/GTweak/Windows/MessageWindow.xamlindex e41e3620..a0110353 100644--- a/.Source/GTweak/Windows/MessageWindow.xaml+++ b/.Source/GTweak/Windows/MessageWindow.xaml@@ -1,4 +1,4 @@-<ui:FluentWindow x:Class="GTweak.Windows.MessageWindow"+<ui:FluentWindow x:Class="GTweak.Windows.MessageWindow"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"@@ -15,7 +15,7 @@<RowDefinition Height="Auto"/></Grid.RowDefinitions>- <Grid Grid.Row="0" x:Name="WarningContent" Visibility="Visible">+ <Grid Grid.Row="0"><Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/>@@ -23,40 +23,18 @@<Grid x:Name="TitleBar" Grid.Row="0" MouseDown="TitleBar_MouseDown" Background="Transparent"><DockPanel VerticalAlignment="Center" HorizontalAlignment="Left" LastChildFill="True" Height="48">- <ui:SymbolIcon Symbol="Warning24" FontSize="20px" Foreground="{StaticResource Brush_Accent}" Margin="15,5,0,0" HorizontalAlignment="Center"/>+ <ui:SymbolIcon x:Name="MsgIcon" Symbol="Warning24" FontSize="20px" Foreground="{StaticResource Brush_Accent}" Margin="15,5,0,0"/><Viewbox Stretch="None">- <TextBlock Text="{DynamicResource title_message}" Style="{StaticResource TextDefault}" FontSize="18px" Margin="5,0,0,0"/>+ <TextBlock x:Name="TxtTitle" Text="Title" Style="{StaticResource TextDefault}" FontSize="18px" Margin="5,0,0,0"/></Viewbox></DockPanel></Grid>- <Grid Grid.Row="1">- <TextBlock Foreground="{StaticResource Brush_TextBlock_Inactivity}" Height="auto" MaxWidth="390" FontFamily="{StaticResource Jura}" FontSize="14px" TextWrapping="Wrap" HorizontalAlignment="Left" TextAlignment="Left" FontStretch="Medium" Margin="15,0,15,0">- <Run Text="{DynamicResource part1_message}"/>- <Run Text="{DynamicResource part2_message}" Foreground="{StaticResource Brush_Accent}"/>- <Run Text="{DynamicResource part3_message}"/>- </TextBlock>- </Grid>- </Grid>-- <Grid Grid.Row="0" x:Name="NotSupportContent" Visibility="Collapsed">- <Grid.RowDefinitions>- <RowDefinition Height="Auto"/>- <RowDefinition Height="*"/>- </Grid.RowDefinitions>- <Grid Grid.Row="0" MouseDown="TitleBar_MouseDown" Background="Transparent">- <DockPanel VerticalAlignment="Center" HorizontalAlignment="Left" LastChildFill="True" Height="48">- <ui:SymbolIcon Symbol="ErrorCircle24" FontSize="20px" Foreground="{StaticResource Brush_Accent}" Margin="10,5,0,0" HorizontalAlignment="Center"/>- <Viewbox Stretch="None">- <TextBlock Text="{DynamicResource title_nosupport_message}" Style="{StaticResource TextDefault}" FontSize="18px" Margin="5,0,100,0"/>- </Viewbox>- </DockPanel>- </Grid><Grid Grid.Row="1">- <TextBlock Foreground="{StaticResource Brush_TextBlock_Inactivity}" Height="auto" MaxWidth="390" FontFamily="{StaticResource Jura}" FontSize="14px" TextWrapping="Wrap" HorizontalAlignment="Left" TextAlignment="Left" FontStretch="Medium" Margin="10,0,10,0">- <Run Text="{DynamicResource part1_nosupport_message}"/>- <Run Text="{DynamicResource part2_nosupport_message}" Foreground="{StaticResource Brush_Accent}"/>- <Run Text="{DynamicResource part3_nosupport_message}"/>+ <TextBlock x:Name="TxtMainMessage" Foreground="{StaticResource Brush_TextBlock_Inactivity}" Height="auto" MaxWidth="390" FontFamily="{StaticResource Jura}" FontSize="14px" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="15,0,15,0">+ <Run x:Name="Part1"/>+ <Run x:Name="Part2" Foreground="{StaticResource Brush_Accent}"/>+ <Run x:Name="Part3"/></TextBlock></Grid></Grid>diff --git a/.Source/GTweak/Windows/MessageWindow.xaml.cs b/.Source/GTweak/Windows/MessageWindow.xaml.csindex f5d33e1b..2972115a 100644--- a/.Source/GTweak/Windows/MessageWindow.xaml.cs+++ b/.Source/GTweak/Windows/MessageWindow.xaml.cs@@ -9,16 +9,18 @@ namespace GTweak.Windows{public partial class MessageWindow : FluentWindow{+ public enum MessageWindowType+ {+ Warning,+ NotSupported,+ NotAdmin+ }+private TimerControlManager _timer = default;- public MessageWindow(bool isViolationSystem = false)+ public MessageWindow(MessageWindowType type = MessageWindowType.Warning){InitializeComponent();-- if (isViolationSystem)- {- NotSupportContent.Visibility = Visibility.Visible;- WarningContent.Visibility = Visibility.Collapsed;- }+ InitializeMessageContent(type);Unloaded += delegate { _timer.Stop(); };Loaded += delegate@@ -31,6 +33,31 @@ namespace GTweak.Windows};}+ private void InitializeMessageContent(MessageWindowType type)+ {+ switch (type)+ {+ case MessageWindowType.NotAdmin:+ UpdateMessageElements(SymbolRegular.ShieldLock24, "title_admin_message", "part1_admin_message", "part2_admin_message", "part3_admin_message");+ break;+ case MessageWindowType.NotSupported:+ UpdateMessageElements(SymbolRegular.ErrorCircle24, "title_nosupport_message", "part1_nosupport_message", "part2_nosupport_message", "part3_nosupport_message");+ break;+ default:+ UpdateMessageElements(SymbolRegular.Warning24, "title_message", "part1_message", "part2_message", "part3_message");+ break;+ }+ }++ private void UpdateMessageElements(SymbolRegular symbol, string titleKey, string p1Key, string p2Key, string p3Key)+ {+ MsgIcon.Symbol = symbol;+ TxtTitle.Text = (string)FindResource(titleKey) ?? string.Empty;+ Part1.Text = (string)FindResource(p1Key) ?? string.Empty;+ Part2.Text = (string)FindResource(p2Key) ?? string.Empty;+ Part3.Text = (string)FindResource(p3Key) ?? string.Empty;+ }+private void TitleBar_MouseDown(object sender, MouseButtonEventArgs e){if (e?.LeftButton == MouseButtonState.Pressed)