From 7549bba2930607bbaea90fab795ce2bd8a8f48f5 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 18:43:41 +0800
Subject: [PATCH 001/124] Add administrator mode check
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 783ade14ebe..346a86ab624 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -5,6 +5,7 @@
using System.Globalization;
using System.Linq;
using System.Runtime.InteropServices;
+using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@@ -753,5 +754,16 @@ private static bool TryGetNotoFont(string langKey, out string notoFont)
}
#endregion
+
+ #region Administrator Mode
+
+ public static bool IsAdministrator()
+ {
+ using var identity = WindowsIdentity.GetCurrent();
+ var principal = new WindowsPrincipal(identity);
+ return principal.IsInRole(WindowsBuiltInRole.Administrator);
+ }
+
+ #endregion
}
}
From 369ed86d1d8e68746b28634d75f12a2d4bead828 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 18:44:01 +0800
Subject: [PATCH 002/124] Add administrator text in tray icon
---
Flow.Launcher/Languages/en.xaml | 1 +
Flow.Launcher/MainWindow.xaml.cs | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index f233a30d56f..2abeb28f505 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -46,6 +46,7 @@
Position Reset
Reset search window position
Type here to search
+ (Admin)
Settings
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index bb29d78e5e8..470b25f93e4 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -595,9 +595,13 @@ private void SoundPlay()
private void InitializeNotifyIcon()
{
+ var text = Win32Helper.IsAdministrator() ?
+ Constant.FlowLauncherFullName + " " + App.API.GetTranslation("admin") :
+ Constant.FlowLauncherFullName;
+
_notifyIcon = new NotifyIcon
{
- Text = Constant.FlowLauncherFullName,
+ Text = text,
Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
Visible = !_settings.HideNotifyIcon
};
From 10d379f350a6f94a37b177368301cdc1e2415395 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 19:54:42 +0800
Subject: [PATCH 003/124] Support running application under non-admin mode &
Show UAC dialogs when running admin mode when application is under admin mode
---
.../Languages/en.xaml | 2 +
Plugins/Flow.Launcher.Plugin.Program/Main.cs | 10 +++
.../Programs/UWPPackage.cs | 30 +++++---
.../Programs/Win32.cs | 73 ++++++++++++-------
4 files changed, 79 insertions(+), 36 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index e551a7dcb4e..cd1cc051c4f 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -97,5 +97,7 @@
Successfully disabled this program from displaying in your query
This app is not intended to be run as administrator
Unable to run {0}
+ User Account Control
+ Do you want to allow this app to make changes to your device?
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index d2884599467..f220190e253 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -3,6 +3,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
+using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Controls;
@@ -32,6 +33,8 @@ public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, I
internal static PluginInitContext Context { get; private set; }
+ internal static bool IsAdmin = IsAdministrator();
+
private static readonly List emptyResults = new();
private static readonly MemoryCacheOptions cacheOptions = new() { SizeLimit = 1560 };
@@ -459,5 +462,12 @@ public void Dispose()
{
Win32.Dispose();
}
+
+ private static bool IsAdministrator()
+ {
+ using var identity = WindowsIdentity.GetCurrent();
+ var principal = new WindowsPrincipal(identity);
+ return principal.IsInRole(WindowsBuiltInRole.Administrator);
+ }
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
index cb33250e15e..182f3fed537 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
@@ -4,17 +4,17 @@
using System.IO;
using System.Linq;
using System.Security.Principal;
+using System.Threading.Channels;
using System.Threading.Tasks;
+using System.Windows.Input;
using System.Windows.Media.Imaging;
-using Windows.ApplicationModel;
-using Windows.Management.Deployment;
+using System.Xml;
using Flow.Launcher.Plugin.Program.Logger;
using Flow.Launcher.Plugin.SharedModels;
-using System.Threading.Channels;
-using System.Xml;
-using Windows.ApplicationModel.Core;
-using System.Windows.Input;
using MemoryPack;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Management.Deployment;
namespace Flow.Launcher.Plugin.Program.Programs
{
@@ -454,7 +454,9 @@ public Result Result(string query, IPublicAPI api)
bool elevated = e.SpecialKeyState.ToModifierKeys() == (ModifierKeys.Control | ModifierKeys.Shift);
bool shouldRunElevated = elevated && CanRunElevated;
- _ = Task.Run(() => Launch(shouldRunElevated)).ConfigureAwait(false);
+
+ Launch(shouldRunElevated);
+
if (elevated && !shouldRunElevated)
{
var title = api.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_error");
@@ -497,7 +499,8 @@ public List ContextMenus(IPublicAPI api)
Title = api.GetTranslation("flowlauncher_plugin_program_run_as_administrator"),
Action = c =>
{
- _ = Task.Run(() => Launch(true)).ConfigureAwait(false);
+ Launch(true);
+
return true;
},
IcoPath = "Images/cmd.png",
@@ -510,12 +513,17 @@ public List ContextMenus(IPublicAPI api)
private void Launch(bool elevated = false)
{
- string command = "shell:AppsFolder\\" + UserModelId;
+ var command = "shell:AppsFolder\\" + UserModelId;
command = Environment.ExpandEnvironmentVariables(command.Trim());
- var info = new ProcessStartInfo(command) { UseShellExecute = true, Verb = elevated ? "runas" : "" };
+ var info = new ProcessStartInfo()
+ {
+ FileName = command,
+ UseShellExecute = true,
+ Verb = elevated ? "runas" : ""
+ };
- Main.StartProcess(Process.Start, info);
+ _ = Task.Run(() => Main.StartProcess(Process.Start, info)).ConfigureAwait(false);
}
internal static bool IfAppCanRunElevated(XmlNode appNode)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index a87b002d414..3dd7ec0128c 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -1,21 +1,22 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Security;
using System.Text;
+using System.Threading.Channels;
using System.Threading.Tasks;
-using Microsoft.Win32;
+using System.Windows;
+using System.Windows.Input;
using Flow.Launcher.Plugin.Program.Logger;
+using Flow.Launcher.Plugin.Program.Views.Models;
using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Plugin.SharedModels;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Channels;
-using Flow.Launcher.Plugin.Program.Views.Models;
using IniParser;
-using System.Windows.Input;
using MemoryPack;
+using Microsoft.Win32;
namespace Flow.Launcher.Plugin.Program.Programs
{
@@ -196,15 +197,7 @@ public Result Result(string query, IPublicAPI api)
// Ctrl + Shift + Enter to run as admin
bool runAsAdmin = c.SpecialKeyState.ToModifierKeys() == (ModifierKeys.Control | ModifierKeys.Shift);
- var info = new ProcessStartInfo
- {
- FileName = FullPath,
- WorkingDirectory = ParentDirectory,
- UseShellExecute = true,
- Verb = runAsAdmin ? "runas" : "",
- };
-
- _ = Task.Run(() => Main.StartProcess(Process.Start, info));
+ Launch(runAsAdmin);
return true;
}
@@ -213,6 +206,44 @@ public Result Result(string query, IPublicAPI api)
return result;
}
+ private void Launch(bool elevated = false)
+ {
+ var info = new ProcessStartInfo
+ {
+ FileName = FullPath,
+ WorkingDirectory = ParentDirectory,
+ UseShellExecute = true,
+ Verb = elevated ? "runas" : "",
+ };
+
+ if (Main.IsAdmin)
+ {
+ if (elevated)
+ {
+ // Since we are already elevated, we need to create UAC dialog manually
+ if (Main.Context.API.ShowMsgBox(
+ Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_subtitle"),
+ Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_title"),
+ MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+ {
+ return;
+ }
+ }
+ else
+ {
+ // Use explorer.exe as workaround to start process as standard user
+ info = new ProcessStartInfo
+ {
+ FileName = "explorer.exe",
+ Arguments = $"\"{FullPath}\"",
+ WorkingDirectory = ParentDirectory,
+ UseShellExecute = true,
+ };
+ }
+ }
+
+ _ = Task.Run(() => Main.StartProcess(Process.Start, info)).ConfigureAwait(false); ;
+ }
public List ContextMenus(IPublicAPI api)
{
@@ -228,7 +259,7 @@ public List ContextMenus(IPublicAPI api)
FileName = FullPath, WorkingDirectory = ParentDirectory, UseShellExecute = true
};
- _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info));
+ _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info)).ConfigureAwait(false);;
return true;
},
@@ -240,15 +271,7 @@ public List ContextMenus(IPublicAPI api)
Title = api.GetTranslation("flowlauncher_plugin_program_run_as_administrator"),
Action = c =>
{
- var info = new ProcessStartInfo
- {
- FileName = FullPath,
- WorkingDirectory = ParentDirectory,
- Verb = "runas",
- UseShellExecute = true
- };
-
- _ = Task.Run(() => Main.StartProcess(Process.Start, info));
+ Launch(true);
return true;
},
From 484f91c52d2de6100661c6dcf40cefc0729a5dd2 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 20:26:41 +0800
Subject: [PATCH 004/124] Improve UAC dialog
---
.../Languages/en.xaml | 1 +
.../Programs/Win32.cs | 5 +-
.../UACDialog.xaml | 154 ++++++++++++++++++
.../UACDialog.xaml.cs | 87 ++++++++++
4 files changed, 243 insertions(+), 4 deletions(-)
create mode 100644 Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml
create mode 100644 Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index cd1cc051c4f..e3eeb4e91a5 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -99,5 +99,6 @@
Unable to run {0}
User Account Control
Do you want to allow this app to make changes to your device?
+ Program location: {0}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 3dd7ec0128c..8cf1f77dad5 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -221,10 +221,7 @@ private void Launch(bool elevated = false)
if (elevated)
{
// Since we are already elevated, we need to create UAC dialog manually
- if (Main.Context.API.ShowMsgBox(
- Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_subtitle"),
- Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_title"),
- MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+ if (UACDialog.Show(IcoPath, Name, FullPath) != MessageBoxResult.Yes)
{
return;
}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml b/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml
new file mode 100644
index 00000000000..d619f47654d
--- /dev/null
+++ b/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs
new file mode 100644
index 00000000000..3ab087b489f
--- /dev/null
+++ b/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Flow.Launcher.Plugin.Program
+{
+ public partial class UACDialog : Window
+ {
+ private static readonly string ClassName = nameof(UACDialog);
+
+ private static UACDialog msgBox;
+ private static MessageBoxResult _result = MessageBoxResult.None;
+
+ private UACDialog()
+ {
+ InitializeComponent();
+ }
+
+ public static MessageBoxResult Show(string iconPath, string appName, string fullPath)
+ {
+ if (!Application.Current.Dispatcher.CheckAccess())
+ {
+ return Application.Current.Dispatcher.Invoke(() => Show(iconPath, appName, fullPath));
+ }
+
+ try
+ {
+ msgBox = new UACDialog
+ {
+ Title = Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_title")
+ };
+
+ // Set icon & app name & program location
+ _ = msgBox.SetImageAsync(iconPath);
+ msgBox.AppName.Text = appName;
+ msgBox.ProgramLocation.Text = string.Format(
+ Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_program_location"),
+ fullPath);
+
+ // Focus No by default
+ msgBox.btnNo.Focus();
+ _result = MessageBoxResult.No;
+
+ msgBox.ShowDialog();
+ return _result;
+ }
+ catch (Exception e)
+ {
+ Main.Context.API.LogError(ClassName, $"An error occurred: {e.Message}");
+ msgBox = null;
+ return MessageBoxResult.None;
+ }
+ }
+
+ private async Task SetImageAsync(string imagePath)
+ {
+ var imageSource = await Main.Context.API.LoadImageAsync(imagePath);
+ Img.Source = imageSource;
+ }
+
+ private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
+ {
+ DialogResult = false;
+ Close();
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ if (sender == btnYes)
+ _result = MessageBoxResult.Yes;
+ else if (sender == btnNo)
+ _result = MessageBoxResult.No;
+ else
+ _result = MessageBoxResult.None;
+ msgBox.Close();
+ msgBox = null;
+ }
+
+ private void Button_Cancel(object sender, RoutedEventArgs e)
+ {
+ _result = MessageBoxResult.Cancel;
+ msgBox.Close();
+ msgBox = null;
+ }
+ }
+}
From 7611b002873d33e2054f3f4122ddfb8c875d471b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 21:46:27 +0800
Subject: [PATCH 005/124] Add new restart api
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 6 ++++++
Flow.Launcher/PublicAPIInstance.cs | 7 ++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index cb60251ed95..b304542773a 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -33,6 +33,12 @@ public interface IPublicAPI
///
void RestartApp();
+ ///
+ /// Restart Flow Launcher with arguments
+ ///
+ /// Application start arguments
+ void RestartApp(string arguments);
+
///
/// Run a shell command
///
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 66e11f88130..751e38c4297 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -11,7 +11,6 @@
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-using System.Windows.Input;
using System.Windows.Media;
using CommunityToolkit.Mvvm.DependencyInjection;
using Flow.Launcher.Core;
@@ -73,8 +72,10 @@ public void ChangeQuery(string query, bool requery = false)
_mainVM.ChangeQueryText(query, requery);
}
+ public void RestartApp() => RestartApp(null);
+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")]
- public async void RestartApp()
+ public async void RestartApp(string arguments)
{
_mainVM.Hide();
@@ -89,7 +90,7 @@ public async void RestartApp()
// Restart requires Squirrel's Update.exe to be present in the parent folder,
// it is only published from the project's release pipeline. When debugging without it,
// the project may not restart or just terminates. This is expected.
- UpdateManager.RestartApp(Constant.ApplicationFileName);
+ UpdateManager.RestartApp(Constant.ApplicationFileName, arguments);
}
public void ShowMainWindow() => _mainVM.Show();
From d29a5d4b1fc423bf02c0fbb44feb6b727f84a41d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:03:25 +0800
Subject: [PATCH 006/124] Add setting model
---
Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index f00f42ac095..383efdaf119 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -372,6 +372,8 @@ public bool HideNotifyIcon
public bool LeaveCmdOpen { get; set; }
public bool HideWhenDeactivated { get; set; } = true;
+ public bool AlwaysRunAsAdministrator { get; set; } = false;
+
public bool SearchQueryResultsWithDelay { get; set; }
public int SearchDelayTime { get; set; } = 150;
From 40cf41389845f9d6a223b8fae679b9e2e26d6c5c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:04:32 +0800
Subject: [PATCH 007/124] Add admin support for auto startup
---
Flow.Launcher/App.xaml.cs | 2 +-
Flow.Launcher/Helper/AutoStartup.cs | 35 ++++++++-----------
.../Resources/Pages/WelcomePage5.xaml.cs | 2 +-
.../SettingsPaneGeneralViewModel.cs | 4 +--
4 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 969bb75bbf9..8c5915cd45e 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -236,7 +236,7 @@ private void AutoStartup()
{
try
{
- Helper.AutoStartup.CheckIsEnabled(_settings.UseLogonTaskForStartup);
+ Helper.AutoStartup.CheckIsEnabled(_settings.UseLogonTaskForStartup, _settings.AlwaysRunAsAdministrator);
}
catch (Exception e)
{
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 34700c61015..e6fd1ba1e78 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -17,18 +17,18 @@ public class AutoStartup
private const string LogonTaskName = $"{Constant.FlowLauncher} Startup";
private const string LogonTaskDesc = $"{Constant.FlowLauncher} Auto Startup";
- public static void CheckIsEnabled(bool useLogonTaskForStartup)
+ public static void CheckIsEnabled(bool useLogonTaskForStartup, bool alwaysRunAsAdministrator)
{
// We need to check both because if both of them are enabled,
// Hide Flow Launcher on startup will not work since the later one will trigger main window show event
- var logonTaskEnabled = CheckLogonTask();
+ var logonTaskEnabled = CheckLogonTask(alwaysRunAsAdministrator);
var registryEnabled = CheckRegistry();
if (useLogonTaskForStartup)
{
// Enable logon task
if (!logonTaskEnabled)
{
- Enable(true);
+ Enable(true, alwaysRunAsAdministrator);
}
// Disable registry
if (registryEnabled)
@@ -41,7 +41,7 @@ public static void CheckIsEnabled(bool useLogonTaskForStartup)
// Enable registry
if (!registryEnabled)
{
- Enable(false);
+ Enable(false, alwaysRunAsAdministrator);
}
// Disable logon task
if (logonTaskEnabled)
@@ -51,7 +51,7 @@ public static void CheckIsEnabled(bool useLogonTaskForStartup)
}
}
- private static bool CheckLogonTask()
+ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
{
using var taskService = new TaskService();
var task = taskService.RootFolder.AllTasks.FirstOrDefault(t => t.Name == LogonTaskName);
@@ -67,7 +67,7 @@ private static bool CheckLogonTask()
if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
{
UnscheduleLogonTask();
- ScheduleLogonTask();
+ ScheduleLogonTask(alwaysRunAsAdministrator);
}
}
@@ -117,16 +117,17 @@ public static void DisableViaLogonTaskAndRegistry()
Disable(false);
}
- public static void ChangeToViaLogonTask()
+ public static void ChangeToViaLogonTask(bool alwaysRunAsAdministrator)
{
Disable(false);
- Enable(true);
+ Enable(true, alwaysRunAsAdministrator);
}
public static void ChangeToViaRegistry()
{
Disable(true);
- Enable(false);
+ // We do not need to use alwaysRunAsAdministrator for registry, so we just set false here
+ Enable(false, false);
}
private static void Disable(bool logonTask)
@@ -149,13 +150,13 @@ private static void Disable(bool logonTask)
}
}
- private static void Enable(bool logonTask)
+ private static void Enable(bool logonTask, bool alwaysRunAsAdministrator)
{
try
{
if (logonTask)
{
- ScheduleLogonTask();
+ ScheduleLogonTask(alwaysRunAsAdministrator);
}
else
{
@@ -169,14 +170,15 @@ private static void Enable(bool logonTask)
}
}
- private static bool ScheduleLogonTask()
+ private static bool ScheduleLogonTask(bool alwaysRunAsAdministrator)
{
using var td = TaskService.Instance.NewTask();
td.RegistrationInfo.Description = LogonTaskDesc;
td.Triggers.Add(new LogonTrigger { UserId = WindowsIdentity.GetCurrent().Name, Delay = TimeSpan.FromSeconds(2) });
td.Actions.Add(Constant.ExecutablePath);
- if (IsCurrentUserIsAdmin())
+ // Only if the app is running as administrator, we can set the run level to highest
+ if (Win32Helper.IsAdministrator() && alwaysRunAsAdministrator)
{
td.Principal.RunLevel = TaskRunLevel.Highest;
}
@@ -212,13 +214,6 @@ private static bool UnscheduleLogonTask()
}
}
- private static bool IsCurrentUserIsAdmin()
- {
- var identity = WindowsIdentity.GetCurrent();
- var principal = new WindowsPrincipal(identity);
- return principal.IsInRole(WindowsBuiltInRole.Administrator);
- }
-
private static bool UnscheduleRegistry()
{
using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
index 8db0a9f7e08..dc88f74fd58 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -45,7 +45,7 @@ private void ChangeAutoStartup(bool value)
{
if (Settings.UseLogonTaskForStartup)
{
- AutoStartup.ChangeToViaLogonTask();
+ AutoStartup.ChangeToViaLogonTask(Settings.AlwaysRunAsAdministrator);
}
else
{
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index eac40099bfb..eed81fe17f7 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -49,7 +49,7 @@ public bool StartFlowLauncherOnSystemStartup
{
if (UseLogonTaskForStartup)
{
- AutoStartup.ChangeToViaLogonTask();
+ AutoStartup.ChangeToViaLogonTask(AlwaysRunAsAdministrator);
}
else
{
@@ -81,7 +81,7 @@ public bool UseLogonTaskForStartup
{
if (value)
{
- AutoStartup.ChangeToViaLogonTask();
+ AutoStartup.ChangeToViaLogonTask(AlwaysRunAsAdministrator);
}
else
{
From fe70a72a626a74d0ef88c0d359a2f448642329e1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:04:47 +0800
Subject: [PATCH 008/124] Add admin mode configuration in general page
---
Flow.Launcher/Languages/en.xaml | 4 ++
.../SettingsPaneGeneralViewModel.cs | 59 ++++++++++++++++++-
.../Views/SettingsPaneGeneral.xaml | 31 ++++++----
3 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 2abeb28f505..de9ba2f2771 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -132,6 +132,10 @@
Show History Results in Home Page
Maximum History Results Shown in Home Page
This can only be edited if plugin supports Home feature and Home Page is enabled.
+ Always run as administrator
+ Run Flow Launcher as administrator on system startup
+ Administrator Mode Change
+ Do you want to restart to apply administrator mode change?
Search Plugin
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index eed81fe17f7..edb2aacf761 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Windows;
using System.Windows.Forms;
using CommunityToolkit.Mvvm.Input;
using Flow.Launcher.Core;
@@ -22,6 +23,8 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
private readonly Portable _portable;
private readonly Internationalization _translater;
+ private static readonly bool _isAdministrator = Win32Helper.IsAdministrator();
+
public SettingsPaneGeneralViewModel(Settings settings, Updater updater, Portable portable, Internationalization translater)
{
Settings = settings;
@@ -65,6 +68,13 @@ public bool StartFlowLauncherOnSystemStartup
{
App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
}
+
+ // If we have enabled logon task startup, we need to check if we need to restart the app
+ // even if we encounter an error while setting the startup method
+ if (value && UseLogonTaskForStartup)
+ {
+ CheckAdminChangeAndAskForRestart();
+ }
}
}
@@ -92,10 +102,57 @@ public bool UseLogonTaskForStartup
{
App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
}
- }
+ }
+
+ // If we have enabled logon task startup, we need to check if we need to restart the app
+ // even if we encounter an error while setting the startup method
+ if (StartFlowLauncherOnSystemStartup && value)
+ {
+ CheckAdminChangeAndAskForRestart();
+ }
}
}
+ public bool AlwaysRunAsAdministrator
+ {
+ get => Settings.AlwaysRunAsAdministrator;
+ set
+ {
+ Settings.AlwaysRunAsAdministrator = value;
+
+ if (StartFlowLauncherOnSystemStartup && UseLogonTaskForStartup)
+ {
+ try
+ {
+ AutoStartup.ChangeToViaLogonTask(value);
+ }
+ catch (Exception e)
+ {
+ App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
+ }
+
+ // If we have enabled logon task startup, we need to check if we need to restart the app
+ // even if we encounter an error while setting the startup method
+ CheckAdminChangeAndAskForRestart();
+ }
+ }
+ }
+
+ private void CheckAdminChangeAndAskForRestart()
+ {
+ if ((AlwaysRunAsAdministrator && !_isAdministrator) || // Change from non-admin to admin
+ (!AlwaysRunAsAdministrator && _isAdministrator)) // Change from admin to non-admin
+ {
+ if (App.API.ShowMsgBox(
+ App.API.GetTranslation("runAsAdministratorChangeAndRestart"),
+ App.API.GetTranslation("runAsAdministratorChange"),
+ MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+ {
+ App.API.RestartApp(AlwaysRunAsAdministrator ? "runas" : string.Empty);
+ }
+ }
+ }
+
public List SearchWindowScreens { get; } =
DropdownDataGeneric.GetValues("SearchWindowScreen");
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index c0c5613de04..1871a92ffc5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -43,15 +43,27 @@
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
-
-
-
+
+
+
+
+
+
+
+
+
-
Date: Thu, 22 May 2025 22:13:46 +0800
Subject: [PATCH 009/124] Remove useless semicolon
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 8cf1f77dad5..c8bde614a34 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -239,7 +239,7 @@ private void Launch(bool elevated = false)
}
}
- _ = Task.Run(() => Main.StartProcess(Process.Start, info)).ConfigureAwait(false); ;
+ _ = Task.Run(() => Main.StartProcess(Process.Start, info)).ConfigureAwait(false);
}
public List ContextMenus(IPublicAPI api)
From 91f7a4fd55bbc5b56c16edd2e117beb4d91b7c14 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:17:10 +0800
Subject: [PATCH 010/124] Remove useless semicolon
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index c8bde614a34..4e1d99454be 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -256,7 +256,7 @@ public List ContextMenus(IPublicAPI api)
FileName = FullPath, WorkingDirectory = ParentDirectory, UseShellExecute = true
};
- _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info)).ConfigureAwait(false);;
+ _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info)).ConfigureAwait(false);
return true;
},
From 902c8f44123588e7e9fc7eccbe1b4f5b87da6e96 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:18:25 +0800
Subject: [PATCH 011/124] Check value changed
---
.../SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index edb2aacf761..d7d92d64352 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -44,6 +44,8 @@ public bool StartFlowLauncherOnSystemStartup
get => Settings.StartFlowLauncherOnSystemStartup;
set
{
+ if (Settings.StartFlowLauncherOnSystemStartup == value) return;
+
Settings.StartFlowLauncherOnSystemStartup = value;
try
@@ -83,6 +85,8 @@ public bool UseLogonTaskForStartup
get => Settings.UseLogonTaskForStartup;
set
{
+ if (UseLogonTaskForStartup == value) return;
+
Settings.UseLogonTaskForStartup = value;
if (StartFlowLauncherOnSystemStartup)
@@ -118,6 +122,8 @@ public bool AlwaysRunAsAdministrator
get => Settings.AlwaysRunAsAdministrator;
set
{
+ if (AlwaysRunAsAdministrator == value) return;
+
Settings.AlwaysRunAsAdministrator = value;
if (StartFlowLauncherOnSystemStartup && UseLogonTaskForStartup)
From c5c24acb17eca7de8eae6d3c2fad24dc1148f758 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:55:17 +0800
Subject: [PATCH 012/124] Check run level
---
Flow.Launcher/Helper/AutoStartup.cs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index e6fd1ba1e78..6e1702ccfb7 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -64,7 +64,8 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
if (task.Definition.Actions.FirstOrDefault() is Microsoft.Win32.TaskScheduler.Action taskAction)
{
var action = taskAction.ToString().Trim();
- if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
+ if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase) || // Path issue
+ !CheckRunLevel(task.Definition.Principal, alwaysRunAsAdministrator)) // Run level issue
{
UnscheduleLogonTask();
ScheduleLogonTask(alwaysRunAsAdministrator);
@@ -83,6 +84,11 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
return false;
}
+ private static bool CheckRunLevel(TaskPrincipal tp, bool alwaysRunAsAdministrator)
+ {
+ return alwaysRunAsAdministrator ? tp.RunLevel == TaskRunLevel.Highest : tp.RunLevel != TaskRunLevel.Highest;
+ }
+
private static bool CheckRegistry()
{
try
From 1073061bda93cbe9682cc8a63e0910dcf8992498 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 22 May 2025 22:55:29 +0800
Subject: [PATCH 013/124] Remove old before creating new one
---
Flow.Launcher/Helper/AutoStartup.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 6e1702ccfb7..7a1a180b458 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -126,12 +126,14 @@ public static void DisableViaLogonTaskAndRegistry()
public static void ChangeToViaLogonTask(bool alwaysRunAsAdministrator)
{
Disable(false);
+ Disable(true); // Remove old logon task so that we can create a new one
Enable(true, alwaysRunAsAdministrator);
}
public static void ChangeToViaRegistry()
{
Disable(true);
+ Disable(false); // Remove old registry so that we can create a new one
// We do not need to use alwaysRunAsAdministrator for registry, so we just set false here
Enable(false, false);
}
From e9c40e45868111b32ad8dbaebc3c90813d9e0c67 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 11:01:32 +0800
Subject: [PATCH 014/124] Revert "Add new restart api"
This reverts commit 7611b002873d33e2054f3f4122ddfb8c875d471b.
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 6 ------
Flow.Launcher/PublicAPIInstance.cs | 7 +++----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index b304542773a..cb60251ed95 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -33,12 +33,6 @@ public interface IPublicAPI
///
void RestartApp();
- ///
- /// Restart Flow Launcher with arguments
- ///
- /// Application start arguments
- void RestartApp(string arguments);
-
///
/// Run a shell command
///
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 751e38c4297..66e11f88130 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -11,6 +11,7 @@
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
+using System.Windows.Input;
using System.Windows.Media;
using CommunityToolkit.Mvvm.DependencyInjection;
using Flow.Launcher.Core;
@@ -72,10 +73,8 @@ public void ChangeQuery(string query, bool requery = false)
_mainVM.ChangeQueryText(query, requery);
}
- public void RestartApp() => RestartApp(null);
-
[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")]
- public async void RestartApp(string arguments)
+ public async void RestartApp()
{
_mainVM.Hide();
@@ -90,7 +89,7 @@ public async void RestartApp(string arguments)
// Restart requires Squirrel's Update.exe to be present in the parent folder,
// it is only published from the project's release pipeline. When debugging without it,
// the project may not restart or just terminates. This is expected.
- UpdateManager.RestartApp(Constant.ApplicationFileName, arguments);
+ UpdateManager.RestartApp(Constant.ApplicationFileName);
}
public void ShowMainWindow() => _mainVM.Show();
From 365ba6afa5eb823244ba1b388cee0d50e47a32e0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 11:04:27 +0800
Subject: [PATCH 015/124] Code quality
---
Flow.Launcher/PublicAPIInstance.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 66e11f88130..595674b3eb8 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -11,7 +11,6 @@
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-using System.Windows.Input;
using System.Windows.Media;
using CommunityToolkit.Mvvm.DependencyInjection;
using Flow.Launcher.Core;
From eae4a9584b9e021ff8ab6981a0560c36f647a727 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 11:05:19 +0800
Subject: [PATCH 016/124] Use readonly bool variable
---
Flow.Launcher/Helper/AutoStartup.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 7a1a180b458..919eb52d201 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -17,6 +17,8 @@ public class AutoStartup
private const string LogonTaskName = $"{Constant.FlowLauncher} Startup";
private const string LogonTaskDesc = $"{Constant.FlowLauncher} Auto Startup";
+ private static readonly bool _isAdministrator = Win32Helper.IsAdministrator();
+
public static void CheckIsEnabled(bool useLogonTaskForStartup, bool alwaysRunAsAdministrator)
{
// We need to check both because if both of them are enabled,
@@ -186,7 +188,7 @@ private static bool ScheduleLogonTask(bool alwaysRunAsAdministrator)
td.Actions.Add(Constant.ExecutablePath);
// Only if the app is running as administrator, we can set the run level to highest
- if (Win32Helper.IsAdministrator() && alwaysRunAsAdministrator)
+ if (_isAdministrator && alwaysRunAsAdministrator)
{
td.Principal.RunLevel = TaskRunLevel.Highest;
}
From 52c36ff8d42c9cbbe3edeea85a16a7517b2a1362 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 11:14:15 +0800
Subject: [PATCH 017/124] Only restart from non-admin to admin & Fix restart as
administrator issue
---
Flow.Launcher/Languages/en.xaml | 2 +-
.../SettingsPaneGeneralViewModel.cs | 36 +++++++++++++++----
2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index de9ba2f2771..82e0091a0c8 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -135,7 +135,7 @@
Always run as administrator
Run Flow Launcher as administrator on system startup
Administrator Mode Change
- Do you want to restart to apply administrator mode change?
+ Do you want to restart as administrator to apply this change? Or you need to run as administrator during next start manually.
Search Plugin
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index d7d92d64352..8a3f1661f8e 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
+using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
using CommunityToolkit.Mvvm.Input;
@@ -9,6 +11,7 @@
using Flow.Launcher.Core.Resource;
using Flow.Launcher.Helper;
using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.Image;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
using Flow.Launcher.Plugin.SharedModels;
@@ -75,7 +78,7 @@ public bool StartFlowLauncherOnSystemStartup
// even if we encounter an error while setting the startup method
if (value && UseLogonTaskForStartup)
{
- CheckAdminChangeAndAskForRestart();
+ _ = CheckAdminChangeAndAskForRestartAsync();
}
}
}
@@ -112,7 +115,7 @@ public bool UseLogonTaskForStartup
// even if we encounter an error while setting the startup method
if (StartFlowLauncherOnSystemStartup && value)
{
- CheckAdminChangeAndAskForRestart();
+ _ = CheckAdminChangeAndAskForRestartAsync();
}
}
}
@@ -139,22 +142,41 @@ public bool AlwaysRunAsAdministrator
// If we have enabled logon task startup, we need to check if we need to restart the app
// even if we encounter an error while setting the startup method
- CheckAdminChangeAndAskForRestart();
+ _ = CheckAdminChangeAndAskForRestartAsync();
}
}
}
- private void CheckAdminChangeAndAskForRestart()
+ private async Task CheckAdminChangeAndAskForRestartAsync()
{
- if ((AlwaysRunAsAdministrator && !_isAdministrator) || // Change from non-admin to admin
- (!AlwaysRunAsAdministrator && _isAdministrator)) // Change from admin to non-admin
+ // When we change from non-admin to admin, we need to restart the app as administrator to apply the changes
+ // Under non-administrator, we cannot delete or set the logon task which is run as administrator
+ if (AlwaysRunAsAdministrator && !_isAdministrator)
{
if (App.API.ShowMsgBox(
App.API.GetTranslation("runAsAdministratorChangeAndRestart"),
App.API.GetTranslation("runAsAdministratorChange"),
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
- App.API.RestartApp(AlwaysRunAsAdministrator ? "runas" : string.Empty);
+ App.API.HideMainWindow();
+
+ // We must manually save because of Environment.Exit(0)
+ // which will cause ungraceful exit
+ App.API.SaveAppAllSettings();
+
+ // Wait for all image caches to be saved before restarting
+ await ImageLoader.WaitSaveAsync();
+
+ // Restart the app as administrator
+ var startInfo = new ProcessStartInfo
+ {
+ UseShellExecute = true,
+ WorkingDirectory = Environment.CurrentDirectory,
+ FileName = Constant.ExecutablePath,
+ Verb = "runas"
+ };
+ Process.Start(startInfo);
+ Environment.Exit(0);
}
}
}
From 35f4fd5b187f7c7e7a2b289d674f51d103071ffd Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 12:36:03 +0800
Subject: [PATCH 018/124] Fix restart as administrator issue
---
.../SettingsPaneGeneralViewModel.cs | 45 +++++++++++++++----
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 8a3f1661f8e..6fab0cb2e7c 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.IO;
using System.Linq;
+using System.Reflection;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
@@ -168,19 +171,43 @@ private async Task CheckAdminChangeAndAskForRestartAsync()
await ImageLoader.WaitSaveAsync();
// Restart the app as administrator
- var startInfo = new ProcessStartInfo
- {
- UseShellExecute = true,
- WorkingDirectory = Environment.CurrentDirectory,
- FileName = Constant.ExecutablePath,
- Verb = "runas"
- };
- Process.Start(startInfo);
- Environment.Exit(0);
+ RestartAppAsAdministrator(Constant.ExecutablePath);
}
}
}
+ private static void RestartAppAsAdministrator(string exeToStart)
+ {
+ var startInfo = new ProcessStartInfo
+ {
+ FileName = getUpdateExe(),
+ Arguments = $"--processStartAndWait {exeToStart}",
+ UseShellExecute = true,
+ Verb = "runas",
+ };
+ Process.Start(startInfo);
+ Thread.Sleep(500);
+ Environment.Exit(0);
+ }
+
+ private static string getUpdateExe()
+ {
+ Assembly entryAssembly = Assembly.GetEntryAssembly();
+ if (entryAssembly != null && Path.GetFileName(entryAssembly.Location).Equals("update.exe", StringComparison.OrdinalIgnoreCase) && entryAssembly.Location.IndexOf("app-", StringComparison.OrdinalIgnoreCase) == -1 && entryAssembly.Location.IndexOf("SquirrelTemp", StringComparison.OrdinalIgnoreCase) == -1)
+ {
+ return Path.GetFullPath(entryAssembly.Location);
+ }
+
+ entryAssembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
+ FileInfo fileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(entryAssembly.Location), "..\\Update.exe"));
+ if (!fileInfo.Exists)
+ {
+ throw new Exception("Update.exe not found, not a Squirrel-installed app?");
+ }
+
+ return fileInfo.FullName;
+ }
+
public List SearchWindowScreens { get; } =
DropdownDataGeneric.GetValues("SearchWindowScreen");
From eacccf9823210ead6abab8f12ebcd4f298068060 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 12:56:23 +0800
Subject: [PATCH 019/124] Add code comments & Use local function
---
.../SettingsPaneGeneralViewModel.cs | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 6fab0cb2e7c..89a89b090a8 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -176,6 +176,8 @@ private async Task CheckAdminChangeAndAskForRestartAsync()
}
}
+ // Since Squirrel does not provide a way to restart the app as administrator,
+ // we need to do it manually by starting the update.exe with the runas verb
private static void RestartAppAsAdministrator(string exeToStart)
{
var startInfo = new ProcessStartInfo
@@ -188,24 +190,25 @@ private static void RestartAppAsAdministrator(string exeToStart)
Process.Start(startInfo);
Thread.Sleep(500);
Environment.Exit(0);
- }
- private static string getUpdateExe()
- {
- Assembly entryAssembly = Assembly.GetEntryAssembly();
- if (entryAssembly != null && Path.GetFileName(entryAssembly.Location).Equals("update.exe", StringComparison.OrdinalIgnoreCase) && entryAssembly.Location.IndexOf("app-", StringComparison.OrdinalIgnoreCase) == -1 && entryAssembly.Location.IndexOf("SquirrelTemp", StringComparison.OrdinalIgnoreCase) == -1)
+ // Local function
+ static string getUpdateExe()
{
- return Path.GetFullPath(entryAssembly.Location);
- }
+ Assembly entryAssembly = Assembly.GetEntryAssembly();
+ if (entryAssembly != null && Path.GetFileName(entryAssembly.Location).Equals("update.exe", StringComparison.OrdinalIgnoreCase) && entryAssembly.Location.IndexOf("app-", StringComparison.OrdinalIgnoreCase) == -1 && entryAssembly.Location.IndexOf("SquirrelTemp", StringComparison.OrdinalIgnoreCase) == -1)
+ {
+ return Path.GetFullPath(entryAssembly.Location);
+ }
- entryAssembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
- FileInfo fileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(entryAssembly.Location), "..\\Update.exe"));
- if (!fileInfo.Exists)
- {
- throw new Exception("Update.exe not found, not a Squirrel-installed app?");
- }
+ entryAssembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
+ FileInfo fileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(entryAssembly.Location), "..\\Update.exe"));
+ if (!fileInfo.Exists)
+ {
+ throw new Exception("Update.exe not found, not a Squirrel-installed app?");
+ }
- return fileInfo.FullName;
+ return fileInfo.FullName;
+ }
}
public List SearchWindowScreens { get; } =
From d6462f4fdc2c28f8b14c8bbd879a3d8c15176dc4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 13:18:19 +0800
Subject: [PATCH 020/124] Move restart function to app class
---
Flow.Launcher/App.xaml.cs | 41 +++++++++++++++++++
.../SettingsPaneGeneralViewModel.cs | 41 +------------------
2 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 8c5915cd45e..7a33c995f25 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -1,5 +1,7 @@
using System;
using System.Diagnostics;
+using System.IO;
+using System.Reflection;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -319,6 +321,45 @@ private static void RegisterTaskSchedulerUnhandledException()
#endregion
+ #region Restart
+
+ // Since Squirrel does not provide a way to restart the app as administrator,
+ // we need to do it manually by starting the update.exe with the runas verb
+ public static void RestartAppAsAdministrator()
+ {
+ var startInfo = new ProcessStartInfo
+ {
+ FileName = getUpdateExe(),
+ Arguments = $"--processStartAndWait {Constant.ExecutablePath}",
+ UseShellExecute = true,
+ Verb = "runas",
+ };
+ Process.Start(startInfo);
+ Thread.Sleep(500);
+ Environment.Exit(0);
+
+ // Local function
+ static string getUpdateExe()
+ {
+ Assembly entryAssembly = Assembly.GetEntryAssembly();
+ if (entryAssembly != null && Path.GetFileName(entryAssembly.Location).Equals("update.exe", StringComparison.OrdinalIgnoreCase) && entryAssembly.Location.IndexOf("app-", StringComparison.OrdinalIgnoreCase) == -1 && entryAssembly.Location.IndexOf("SquirrelTemp", StringComparison.OrdinalIgnoreCase) == -1)
+ {
+ return Path.GetFullPath(entryAssembly.Location);
+ }
+
+ entryAssembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
+ FileInfo fileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(entryAssembly.Location), "..\\Update.exe"));
+ if (!fileInfo.Exists)
+ {
+ throw new Exception("Update.exe not found, not a Squirrel-installed app?");
+ }
+
+ return fileInfo.FullName;
+ }
+ }
+
+ #endregion
+
#region IDisposable
protected virtual void Dispose(bool disposing)
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 89a89b090a8..e7c7333c27e 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
using System.Linq;
-using System.Reflection;
-using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
@@ -171,46 +167,11 @@ private async Task CheckAdminChangeAndAskForRestartAsync()
await ImageLoader.WaitSaveAsync();
// Restart the app as administrator
- RestartAppAsAdministrator(Constant.ExecutablePath);
+ App.RestartAppAsAdministrator();
}
}
}
- // Since Squirrel does not provide a way to restart the app as administrator,
- // we need to do it manually by starting the update.exe with the runas verb
- private static void RestartAppAsAdministrator(string exeToStart)
- {
- var startInfo = new ProcessStartInfo
- {
- FileName = getUpdateExe(),
- Arguments = $"--processStartAndWait {exeToStart}",
- UseShellExecute = true,
- Verb = "runas",
- };
- Process.Start(startInfo);
- Thread.Sleep(500);
- Environment.Exit(0);
-
- // Local function
- static string getUpdateExe()
- {
- Assembly entryAssembly = Assembly.GetEntryAssembly();
- if (entryAssembly != null && Path.GetFileName(entryAssembly.Location).Equals("update.exe", StringComparison.OrdinalIgnoreCase) && entryAssembly.Location.IndexOf("app-", StringComparison.OrdinalIgnoreCase) == -1 && entryAssembly.Location.IndexOf("SquirrelTemp", StringComparison.OrdinalIgnoreCase) == -1)
- {
- return Path.GetFullPath(entryAssembly.Location);
- }
-
- entryAssembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
- FileInfo fileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(entryAssembly.Location), "..\\Update.exe"));
- if (!fileInfo.Exists)
- {
- throw new Exception("Update.exe not found, not a Squirrel-installed app?");
- }
-
- return fileInfo.FullName;
- }
- }
-
public List SearchWindowScreens { get; } =
DropdownDataGeneric.GetValues("SearchWindowScreen");
From 479b49db94b8f4adf69c6d8d76813e95ffd55b63 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 13:20:36 +0800
Subject: [PATCH 021/124] Throw UnauthorizedAccessException when encountering
admin issue
---
Flow.Launcher/Helper/AutoStartup.cs | 40 +++++++++++++++++++++++------
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 919eb52d201..371ab46effb 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -61,21 +61,45 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
{
try
{
- // Check if the action is the same as the current executable path
- // If not, we need to unschedule and reschedule the task
if (task.Definition.Actions.FirstOrDefault() is Microsoft.Win32.TaskScheduler.Action taskAction)
{
var action = taskAction.ToString().Trim();
- if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase) || // Path issue
- !CheckRunLevel(task.Definition.Principal, alwaysRunAsAdministrator)) // Run level issue
+ var pathCorrect = action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase);
+ var runLevelCorrect = CheckRunLevel(task.Definition.Principal.RunLevel, alwaysRunAsAdministrator);
+
+ if (_isAdministrator)
+ {
+ // If path or run level is not correct, we need to unschedule and reschedule the task
+ if (!pathCorrect || !runLevelCorrect)
+ {
+ UnscheduleLogonTask();
+ ScheduleLogonTask(alwaysRunAsAdministrator);
+ }
+ }
+ else
{
- UnscheduleLogonTask();
- ScheduleLogonTask(alwaysRunAsAdministrator);
+ // If run level is not correct, we cannot edit it because we are not administrator
+ if (!runLevelCorrect)
+ {
+ throw new UnauthorizedAccessException("Cannot edit task run level because the app is not running as administrator.");
+ }
+
+ // If run level is correct and path is not correct, we need to unschedule and reschedule the task
+ if (!pathCorrect)
+ {
+ UnscheduleLogonTask();
+ ScheduleLogonTask(alwaysRunAsAdministrator);
+ }
}
}
return true;
}
+ catch (UnauthorizedAccessException e)
+ {
+ App.API.LogError(ClassName, $"Failed to check logon task: {e}");
+ throw; // Throw exception so that App.AutoStartup can show error message
+ }
catch (Exception e)
{
App.API.LogError(ClassName, $"Failed to check logon task: {e}");
@@ -86,9 +110,9 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
return false;
}
- private static bool CheckRunLevel(TaskPrincipal tp, bool alwaysRunAsAdministrator)
+ private static bool CheckRunLevel(TaskRunLevel rl, bool alwaysRunAsAdministrator)
{
- return alwaysRunAsAdministrator ? tp.RunLevel == TaskRunLevel.Highest : tp.RunLevel != TaskRunLevel.Highest;
+ return alwaysRunAsAdministrator ? rl == TaskRunLevel.Highest : rl != TaskRunLevel.Highest;
}
private static bool CheckRegistry()
From c3ec002b72f7ced8eba5248f256b2149c3dbac85 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 13:21:34 +0800
Subject: [PATCH 022/124] Show message box to ask users to restart as
administrator when encountering issue checking startup
---
Flow.Launcher/App.xaml.cs | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 7a33c995f25..cc573e00585 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -240,10 +240,21 @@ private void AutoStartup()
{
Helper.AutoStartup.CheckIsEnabled(_settings.UseLogonTaskForStartup, _settings.AlwaysRunAsAdministrator);
}
+ catch (UnauthorizedAccessException)
+ {
+ // If it fails for permission, we need to ask the user to restart as administrator
+ if (API.ShowMsgBox(
+ API.GetTranslation("runAsAdministratorChangeAndRestart"),
+ API.GetTranslation("runAsAdministratorChange"),
+ MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+ {
+ RestartAppAsAdministrator();
+ }
+ }
catch (Exception e)
{
- // but if it fails (permissions, etc) then don't keep retrying
- // this also gives the user a visual indication in the Settings widget
+ // But if it fails for other reasons then do not keep retrying,
+ // set startup to false to give users a visual indication in the general page
_settings.StartFlowLauncherOnSystemStartup = false;
API.ShowMsg(API.GetTranslation("setAutoStartFailed"), e.Message);
}
From 80c0288235fbeb5fd5c71d88d3d10229f713199a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 13:24:32 +0800
Subject: [PATCH 023/124] Throw exception when editing highest run level task
---
Flow.Launcher/Helper/AutoStartup.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 371ab46effb..96578b2fa4e 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -78,8 +78,11 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
}
else
{
- // If run level is not correct, we cannot edit it because we are not administrator
- if (!runLevelCorrect)
+ // If run level is not correct or we need to change a highest run level task,
+ // we cannot edit it because we are not administrator
+ // So we just throw an exception to let the user know
+ if (!runLevelCorrect || // run level is not correct
+ alwaysRunAsAdministrator) // we need to change a highest run level task
{
throw new UnauthorizedAccessException("Cannot edit task run level because the app is not running as administrator.");
}
From 1b80290995c5446851298ec2c6f236c8d828d190 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 23 May 2025 16:11:29 +0800
Subject: [PATCH 024/124] Do not show noticification when run level is correct
---
Flow.Launcher/Helper/AutoStartup.cs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 96578b2fa4e..2601645dbba 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -78,11 +78,9 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
}
else
{
- // If run level is not correct or we need to change a highest run level task,
- // we cannot edit it because we are not administrator
+ // If run level is not correct, we cannot edit it because we are not administrator
// So we just throw an exception to let the user know
- if (!runLevelCorrect || // run level is not correct
- alwaysRunAsAdministrator) // we need to change a highest run level task
+ if (!runLevelCorrect)
{
throw new UnauthorizedAccessException("Cannot edit task run level because the app is not running as administrator.");
}
From ba1ada7bf1045d3b4cbc5015bf53ae72659b93e3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 3 Jun 2025 14:45:12 +0800
Subject: [PATCH 025/124] Continue to restart app as administrator if app is
run as administrator already
---
Flow.Launcher/PublicAPIInstance.cs | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index c06c5603991..5f427f90243 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -85,10 +85,18 @@ public async void RestartApp()
// Wait for all image caches to be saved before restarting
await ImageLoader.WaitSaveAsync();
- // Restart requires Squirrel's Update.exe to be present in the parent folder,
- // it is only published from the project's release pipeline. When debugging without it,
- // the project may not restart or just terminates. This is expected.
- UpdateManager.RestartApp(Constant.ApplicationFileName);
+ // If app is run as administrator already, we continue to restart app as administrator
+ if (Win32Helper.IsAdministrator())
+ {
+ App.RestartAppAsAdministrator();
+ }
+ else
+ {
+ // Restart requires Squirrel's Update.exe to be present in the parent folder,
+ // it is only published from the project's release pipeline. When debugging without it,
+ // the project may not restart or just terminates. This is expected.
+ UpdateManager.RestartApp(Constant.ApplicationFileName);
+ }
}
public void ShowMainWindow() => _mainVM.Show();
From b2edea42019b50cb02f085b8bec4010e52cce605 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 3 Jun 2025 17:21:48 +0800
Subject: [PATCH 026/124] Improve code quality
---
Flow.Launcher/App.xaml.cs | 21 ++++++++++++++++++++-
Flow.Launcher/PublicAPIInstance.cs | 17 ++++-------------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index c3dc03ed7f9..69e57f4435a 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -26,6 +26,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.VisualStudio.Threading;
+using Squirrel;
namespace Flow.Launcher
{
@@ -334,9 +335,27 @@ private static void RegisterTaskSchedulerUnhandledException()
#region Restart
+ ///
+ /// Restart the application without changing the user privileges.
+ ///
+ public static void RestartApp(bool forceAdmin = false)
+ {
+ if (Win32Helper.IsAdministrator() || forceAdmin)
+ {
+ RestartAppAsAdministrator();
+ }
+ else
+ {
+ // Restart requires Squirrel's Update.exe to be present in the parent folder,
+ // it is only published from the project's release pipeline. When debugging without it,
+ // the project may not restart or just terminates. This is expected.
+ UpdateManager.RestartApp(Constant.ApplicationFileName);
+ }
+ }
+
// Since Squirrel does not provide a way to restart the app as administrator,
// we need to do it manually by starting the update.exe with the runas verb
- public static void RestartAppAsAdministrator()
+ private static void RestartAppAsAdministrator()
{
var startInfo = new ProcessStartInfo
{
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 5f427f90243..a470b47397a 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -31,7 +31,6 @@
using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.ViewModel;
using JetBrains.Annotations;
-using Squirrel;
using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
namespace Flow.Launcher
@@ -85,18 +84,10 @@ public async void RestartApp()
// Wait for all image caches to be saved before restarting
await ImageLoader.WaitSaveAsync();
- // If app is run as administrator already, we continue to restart app as administrator
- if (Win32Helper.IsAdministrator())
- {
- App.RestartAppAsAdministrator();
- }
- else
- {
- // Restart requires Squirrel's Update.exe to be present in the parent folder,
- // it is only published from the project's release pipeline. When debugging without it,
- // the project may not restart or just terminates. This is expected.
- UpdateManager.RestartApp(Constant.ApplicationFileName);
- }
+ // Restart requires Squirrel's Update.exe to be present in the parent folder,
+ // it is only published from the project's release pipeline. When debugging without it,
+ // the project may not restart or just terminates. This is expected.
+ App.RestartApp();
}
public void ShowMainWindow() => _mainVM.Show();
From de26abe7b8be99ec920fc3d8b18ba76f71586adf Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 3 Jun 2025 17:22:05 +0800
Subject: [PATCH 027/124] Use api functions instead
---
Flow.Launcher.Core/Configuration/Portable.cs | 4 ++--
Flow.Launcher.Core/Updater.cs | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Flow.Launcher.Core/Configuration/Portable.cs b/Flow.Launcher.Core/Configuration/Portable.cs
index 7f02cef0990..00662d1e5da 100644
--- a/Flow.Launcher.Core/Configuration/Portable.cs
+++ b/Flow.Launcher.Core/Configuration/Portable.cs
@@ -48,7 +48,7 @@ public void DisablePortableMode()
API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +
"after the restart your portable data profile will be deleted and roaming data profile kept");
- UpdateManager.RestartApp(Constant.ApplicationFileName);
+ API.RestartApp();
}
catch (Exception e)
{
@@ -72,7 +72,7 @@ public void EnablePortableMode()
API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +
"after the restart your roaming data profile will be deleted and portable data profile kept");
- UpdateManager.RestartApp(Constant.ApplicationFileName);
+ API.RestartApp();
}
catch (Exception e)
{
diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index bc3655f69e7..f0a573f9550 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -1,19 +1,19 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Sockets;
-using System.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Infrastructure;
using Flow.Launcher.Infrastructure.Http;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
+using Flow.Launcher.Plugin.SharedCommands;
using JetBrains.Annotations;
using Squirrel;
@@ -89,7 +89,7 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
if (_api.ShowMsgBox(newVersionTips, _api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
- UpdateManager.RestartApp(Constant.ApplicationFileName);
+ _api.RestartApp();
}
}
catch (Exception e)
From 23f24896801eeae5072f592db59136a1c57183be Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 3 Jun 2025 17:22:26 +0800
Subject: [PATCH 028/124] Force admin restart and fix build issue
---
.../SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index e7c7333c27e..05cb20b304b 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -167,7 +167,7 @@ private async Task CheckAdminChangeAndAskForRestartAsync()
await ImageLoader.WaitSaveAsync();
// Restart the app as administrator
- App.RestartAppAsAdministrator();
+ App.RestartApp(true);
}
}
}
From 1a8334f1d3426775079c281b4319f8eeb2720142 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 15:18:14 +0800
Subject: [PATCH 029/124] Add RunAsDesktopUser helper method
---
.../NativeMethods.txt | 15 ++
Flow.Launcher.Infrastructure/Win32Helper.cs | 136 ++++++++++++++++++
2 files changed, 151 insertions(+)
diff --git a/Flow.Launcher.Infrastructure/NativeMethods.txt b/Flow.Launcher.Infrastructure/NativeMethods.txt
index edc71feef24..403e1550483 100644
--- a/Flow.Launcher.Infrastructure/NativeMethods.txt
+++ b/Flow.Launcher.Infrastructure/NativeMethods.txt
@@ -66,3 +66,18 @@ LOCALE_TRANSIENT_KEYBOARD4
SHParseDisplayName
SHOpenFolderAndSelectItems
CoTaskMemFree
+
+OpenProcessToken
+GetCurrentProcess
+LookupPrivilegeValue
+SE_INCREASE_QUOTA_NAME
+CloseHandle
+TOKEN_PRIVILEGES
+AdjustTokenPrivileges
+GetShellWindow
+GetWindowThreadProcessId
+OpenProcess
+GetProcessId
+DuplicateTokenEx
+CreateProcessWithTokenW
+STARTUPINFO
\ No newline at end of file
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index e6b59dc6199..8c8809e4375 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -18,6 +18,8 @@
using Windows.Win32;
using Windows.Win32.Foundation;
using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.Security;
+using Windows.Win32.System.Threading;
using Windows.Win32.UI.Input.KeyboardAndMouse;
using Windows.Win32.UI.Shell.Common;
using Windows.Win32.UI.WindowsAndMessaging;
@@ -802,6 +804,140 @@ public static bool IsAdministrator()
return principal.IsInRole(WindowsBuiltInRole.Administrator);
}
+ ///
+ /// Inspired by
+ /// Document:
+ ///
+ public static unsafe bool RunAsDesktopUser(string app, string cmdLine, string currentDir, out string errorInfo)
+ {
+ STARTUPINFOW si = new();
+ PROCESS_INFORMATION pi = new();
+ errorInfo = string.Empty;
+ HANDLE hShellProcess = HANDLE.Null, hShellProcessToken = HANDLE.Null, hPrimaryToken = HANDLE.Null;
+ HWND hwnd;
+ uint dwPID;
+
+ // 1. Enable the SeIncreaseQuotaPrivilege in your current token
+ if (!PInvoke.OpenProcessToken(PInvoke.GetCurrentProcess_SafeHandle(), TOKEN_ACCESS_MASK.TOKEN_ADJUST_PRIVILEGES, out var hProcessToken))
+ {
+ errorInfo = $"OpenProcessToken failed: {Marshal.GetLastWin32Error()}";
+ return false;
+ }
+
+ if (!PInvoke.LookupPrivilegeValue(null, PInvoke.SE_INCREASE_QUOTA_NAME, out var luid))
+ {
+ errorInfo = $"LookupPrivilegeValue failed: {Marshal.GetLastWin32Error()}";
+ hProcessToken.Dispose();//PInvoke.CloseHandle(hProcessToken);
+ return false;
+ }
+
+ var tp = new TOKEN_PRIVILEGES
+ {
+ PrivilegeCount = 1,
+ Privileges = new()
+ {
+ e0 = new LUID_AND_ATTRIBUTES
+ {
+ Luid = luid,
+ Attributes = TOKEN_PRIVILEGES_ATTRIBUTES.SE_PRIVILEGE_ENABLED
+ }
+ }
+ };
+
+ PInvoke.AdjustTokenPrivileges(hProcessToken, false, &tp, 0, null, null);
+ var lastError = Marshal.GetLastWin32Error();
+ hProcessToken.Dispose();//PInvoke.CloseHandle(hProcessToken);
+
+ if (lastError != 0)
+ {
+ errorInfo = $"AdjustTokenPrivileges failed: {lastError}";
+ return false;
+ }
+
+retry:
+ // 2. Get an HWND representing the desktop shell
+ hwnd = PInvoke.GetShellWindow();
+ if (hwnd == HWND.Null)
+ {
+ errorInfo = "No desktop shell is present.";
+ return false;
+ }
+
+ // 3. Get the Process ID (PID) of the process associated with that window
+ _ = PInvoke.GetWindowThreadProcessId(hwnd, &dwPID);
+ if (dwPID == 0)
+ {
+ errorInfo = "Unable to get PID of desktop shell.";
+ return false;
+ }
+
+ // 4. Open that process
+ hShellProcess = PInvoke.OpenProcess(PROCESS_ACCESS_RIGHTS.PROCESS_QUERY_INFORMATION, false, dwPID);
+ if (hShellProcess == IntPtr.Zero)
+ {
+ errorInfo = $"Can't open desktop shell process: {Marshal.GetLastWin32Error()}";
+ return false;
+ }
+
+ if (hwnd != PInvoke.GetShellWindow())
+ {
+ PInvoke.CloseHandle(hShellProcess);
+ goto retry;
+ }
+
+ _ = PInvoke.GetWindowThreadProcessId(hwnd, &dwPID);
+ if (dwPID != PInvoke.GetProcessId(hShellProcess))
+ {
+ PInvoke.CloseHandle(hShellProcess);
+ goto retry;
+ }
+
+ // 5. Get the access token from that process
+ if (!PInvoke.OpenProcessToken(hShellProcess, TOKEN_ACCESS_MASK.TOKEN_DUPLICATE, &hShellProcessToken))
+ {
+ errorInfo = $"Can't get process token of desktop shell: {Marshal.GetLastWin32Error()}";
+ goto cleanup;
+ }
+
+ // 6. Make a primary token with that token
+ var tokenRights = TOKEN_ACCESS_MASK.TOKEN_QUERY | TOKEN_ACCESS_MASK.TOKEN_ASSIGN_PRIMARY |
+ TOKEN_ACCESS_MASK.TOKEN_DUPLICATE | TOKEN_ACCESS_MASK.TOKEN_ADJUST_DEFAULT |
+ TOKEN_ACCESS_MASK.TOKEN_ADJUST_SESSIONID;
+ if (!PInvoke.DuplicateTokenEx(hShellProcessToken, tokenRights, null, SECURITY_IMPERSONATION_LEVEL.SecurityImpersonation, TOKEN_TYPE.TokenPrimary, &hPrimaryToken))
+ {
+ errorInfo = $"Can't get primary token: {Marshal.GetLastWin32Error()}";
+ goto cleanup;
+ }
+
+ // 7. Start the new process with that primary token
+ fixed (char* appPtr = app)
+ fixed (char* cmdLinePtr = cmdLine)
+ fixed (char* currentDirPtr = currentDir)
+ {
+ if (!PInvoke.CreateProcessWithToken(hPrimaryToken,
+ 0 /*CREATE_PROCESS_LOGON_FLAGS.LOGON_WITH_PROFILE*/,
+ appPtr,
+ cmdLinePtr,
+ 0/*PROCESS_CREATION_FLAGS.CREATE_NEW_CONSOLE*/,
+ null,
+ currentDirPtr,
+ &si,
+ &pi))
+ {
+ errorInfo = $"CreateProcessWithTokenW failed: {Marshal.GetLastWin32Error()}";
+ goto cleanup;
+ }
+ }
+
+ return true;
+
+cleanup:
+ if (hShellProcessToken != HANDLE.Null) PInvoke.CloseHandle(hShellProcessToken);
+ if (hPrimaryToken != HANDLE.Null) PInvoke.CloseHandle(hPrimaryToken);
+ if (hShellProcess != HANDLE.Null) PInvoke.CloseHandle(hShellProcess);
+ return false;
+ }
+
#endregion
}
}
From e391c984748ac073e14c67a77395bb89e4ec0385 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 15:35:17 +0800
Subject: [PATCH 030/124] Code quality
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 8c8809e4375..45b26b58e69 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -827,7 +827,7 @@ public static unsafe bool RunAsDesktopUser(string app, string cmdLine, string cu
if (!PInvoke.LookupPrivilegeValue(null, PInvoke.SE_INCREASE_QUOTA_NAME, out var luid))
{
errorInfo = $"LookupPrivilegeValue failed: {Marshal.GetLastWin32Error()}";
- hProcessToken.Dispose();//PInvoke.CloseHandle(hProcessToken);
+ hProcessToken.Dispose();
return false;
}
@@ -846,7 +846,7 @@ public static unsafe bool RunAsDesktopUser(string app, string cmdLine, string cu
PInvoke.AdjustTokenPrivileges(hProcessToken, false, &tp, 0, null, null);
var lastError = Marshal.GetLastWin32Error();
- hProcessToken.Dispose();//PInvoke.CloseHandle(hProcessToken);
+ hProcessToken.Dispose();
if (lastError != 0)
{
@@ -915,10 +915,10 @@ public static unsafe bool RunAsDesktopUser(string app, string cmdLine, string cu
fixed (char* currentDirPtr = currentDir)
{
if (!PInvoke.CreateProcessWithToken(hPrimaryToken,
- 0 /*CREATE_PROCESS_LOGON_FLAGS.LOGON_WITH_PROFILE*/,
+ 0,
appPtr,
cmdLinePtr,
- 0/*PROCESS_CREATION_FLAGS.CREATE_NEW_CONSOLE*/,
+ 0,
null,
currentDirPtr,
&si,
From 100c21a83e33c7bab87745b184863f7c7ba639b6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 16:02:24 +0800
Subject: [PATCH 031/124] Add new api to run process as desktop user
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 12 ++++++++
Flow.Launcher/PublicAPIInstance.cs | 29 +++++++++++++++++--
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 76c7a4911bf..13564626b27 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -580,5 +580,17 @@ public interface IPublicAPI
///
/// The time taken to execute the method in milliseconds
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "");
+
+ ///
+ /// Start a process with the given file path and arguments
+ ///
+ ///
+ /// It can help to start a deelevated process when Flow is running as administrator.
+ ///
+ /// File path of the process to start. It can be an executable file or a script file
+ /// Working directory of the process. If not specified, the current directory will be used
+ /// Optional arguments to pass to the process. If not specified, no arguments will be passed
+ /// Whether to run the process as administrator
+ public void StartProcess(string filePath, string workingDirectory, string arguments = "", bool runAsAdmin = false);
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 694b13cdd76..3f003e6606f 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -14,21 +14,21 @@
using System.Windows.Media;
using CommunityToolkit.Mvvm.DependencyInjection;
using Flow.Launcher.Core;
+using Flow.Launcher.Core.ExternalPlugins;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Core.ExternalPlugins;
using Flow.Launcher.Core.Storage;
using Flow.Launcher.Helper;
using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Http;
using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.Http;
using Flow.Launcher.Infrastructure.Image;
using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
-using Flow.Launcher.Plugin.SharedModels;
using Flow.Launcher.Plugin.SharedCommands;
+using Flow.Launcher.Plugin.SharedModels;
using Flow.Launcher.ViewModel;
using JetBrains.Annotations;
using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
@@ -577,6 +577,29 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
+ public void StartProcess(string filePath, string workingDirectory, string arguments = "", bool runAsAdmin = false)
+ {
+ // Deelevate process if it is running as administrator
+ if (Win32Helper.IsAdministrator() && !runAsAdmin)
+ {
+ Win32Helper.RunAsDesktopUser(filePath, workingDirectory, arguments, out var errorInfo);
+ if (!string.IsNullOrEmpty(errorInfo))
+ {
+ LogError(ClassName, $"Failed to start process {filePath} with error: {errorInfo}");
+ }
+ }
+
+ var info = new ProcessStartInfo
+ {
+ FileName = filePath,
+ WorkingDirectory = workingDirectory,
+ Arguments = arguments,
+ UseShellExecute = true,
+ Verb = runAsAdmin ? "runas" : "",
+ };
+ Process.Start(info)?.Dispose();
+ }
+
#endregion
#region Private Methods
From fc53efd6a6254778320b8bd8db54dd306008315d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 16:04:17 +0800
Subject: [PATCH 032/124] Use new api function to open application
---
.../Programs/Win32.cs | 32 +++----------------
1 file changed, 5 insertions(+), 27 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 4e1d99454be..e3dec1c6065 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -208,38 +208,16 @@ public Result Result(string query, IPublicAPI api)
private void Launch(bool elevated = false)
{
- var info = new ProcessStartInfo
+ if (Main.IsAdmin && elevated)
{
- FileName = FullPath,
- WorkingDirectory = ParentDirectory,
- UseShellExecute = true,
- Verb = elevated ? "runas" : "",
- };
-
- if (Main.IsAdmin)
- {
- if (elevated)
+ // Since we are already elevated, we need to create UAC dialog manually
+ if (UACDialog.Show(IcoPath, Name, FullPath) != MessageBoxResult.Yes)
{
- // Since we are already elevated, we need to create UAC dialog manually
- if (UACDialog.Show(IcoPath, Name, FullPath) != MessageBoxResult.Yes)
- {
- return;
- }
- }
- else
- {
- // Use explorer.exe as workaround to start process as standard user
- info = new ProcessStartInfo
- {
- FileName = "explorer.exe",
- Arguments = $"\"{FullPath}\"",
- WorkingDirectory = ParentDirectory,
- UseShellExecute = true,
- };
+ return;
}
}
- _ = Task.Run(() => Main.StartProcess(Process.Start, info)).ConfigureAwait(false);
+ _ = Task.Run(() => Main.Context.API.StartProcess(FullPath, ParentDirectory, "", elevated)).ConfigureAwait(false);
}
public List ContextMenus(IPublicAPI api)
From d77993e215ba878aa754f8e94c46dc91f2c99afe Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 16:22:24 +0800
Subject: [PATCH 033/124] Use new api function to start shell process
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index d0add9f3155..b03f9c0a01c 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -17,7 +17,7 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
{
private static readonly string ClassName = nameof(Main);
- internal PluginInitContext Context { get; private set; }
+ internal static PluginInitContext Context { get; private set; }
private const string Image = "Images/shell.png";
private bool _winRStroked;
@@ -80,7 +80,7 @@ public List Query(Query query)
!c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed;
- Execute(Process.Start, PrepareProcessStartInfo(m, runAsAdministrator));
+ Execute(StartProcess, PrepareProcessStartInfo(m, runAsAdministrator));
return true;
},
CopyText = m
@@ -120,7 +120,7 @@ private List GetHistoryCmds(string cmd, Result result)
!c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed;
- Execute(Process.Start, PrepareProcessStartInfo(m.Key, runAsAdministrator));
+ Execute(StartProcess, PrepareProcessStartInfo(m.Key, runAsAdministrator));
return true;
},
CopyText = m.Key
@@ -150,7 +150,7 @@ private Result GetCurrentCmd(string cmd)
!c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed;
- Execute(Process.Start, PrepareProcessStartInfo(cmd, runAsAdministrator));
+ Execute(StartProcess, PrepareProcessStartInfo(cmd, runAsAdministrator));
return true;
},
CopyText = cmd
@@ -175,7 +175,7 @@ private List ResultsFromHistory()
!c.SpecialKeyState.AltPressed &&
!c.SpecialKeyState.WinPressed;
- Execute(Process.Start, PrepareProcessStartInfo(m.Key, runAsAdministrator));
+ Execute(StartProcess, PrepareProcessStartInfo(m.Key, runAsAdministrator));
return true;
},
CopyText = m.Key
@@ -307,7 +307,13 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
return info;
}
- private void Execute(Func startProcess, ProcessStartInfo info)
+ private static Process StartProcess(ProcessStartInfo info)
+ {
+ Context.API.StartProcess(info.FileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
+ return null;
+ }
+
+ private static void Execute(Func startProcess, ProcessStartInfo info)
{
try
{
@@ -434,7 +440,7 @@ public List LoadContextMenus(Result selectedResult)
Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_administrator"),
Action = c =>
{
- Execute(Process.Start, PrepareProcessStartInfo(selectedResult.Title, true));
+ Execute(StartProcess, PrepareProcessStartInfo(selectedResult.Title, true));
return true;
},
IcoPath = "Images/admin.png",
From 4cf66362afd56a40f4f7093be46e3deefca9cb90 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 16:52:19 +0800
Subject: [PATCH 034/124] Fix handle close issue
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 45b26b58e69..cfc73ad90c0 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -929,6 +929,11 @@ public static unsafe bool RunAsDesktopUser(string app, string cmdLine, string cu
}
}
+ if (pi.hProcess != HANDLE.Null) PInvoke.CloseHandle(pi.hProcess);
+ if (pi.hThread != HANDLE.Null) PInvoke.CloseHandle(pi.hThread);
+ if (hShellProcessToken != HANDLE.Null) PInvoke.CloseHandle(hShellProcessToken);
+ if (hPrimaryToken != HANDLE.Null) PInvoke.CloseHandle(hPrimaryToken);
+ if (hShellProcess != HANDLE.Null) PInvoke.CloseHandle(hShellProcess);
return true;
cleanup:
From f1f7309762dfe564f8b0a8d6ec3fa39124e747cf Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 16:55:38 +0800
Subject: [PATCH 035/124] Add working directory check & Add try-catch
---
Flow.Launcher/PublicAPIInstance.cs | 35 ++++++++++++++++++------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 3f003e6606f..9b8b4f07e3b 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -579,25 +579,32 @@ public Task StopwatchLogInfoAsync(string className, string message, Func
Date: Wed, 11 Jun 2025 20:00:02 +0800
Subject: [PATCH 036/124] Update documents
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 13564626b27..7b0e1dc8c56 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -587,8 +587,8 @@ public interface IPublicAPI
///
/// It can help to start a deelevated process when Flow is running as administrator.
///
- /// File path of the process to start. It can be an executable file or a script file
- /// Working directory of the process. If not specified, the current directory will be used
+ /// Absolute file path. It can be an executable file or a script file
+ /// Working directory. If not specified, the current directory will be used
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
/// Whether to run the process as administrator
public void StartProcess(string filePath, string workingDirectory, string arguments = "", bool runAsAdmin = false);
From ea9ede2e0e31e0c63bcad67508a33b1b6ca97f3d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 20:00:25 +0800
Subject: [PATCH 037/124] Fix deelevate process running issue
---
Flow.Launcher/PublicAPIInstance.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 9b8b4f07e3b..f82ebdc37f1 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -589,6 +589,7 @@ public void StartProcess(string filePath, string workingDirectory, string argume
{
LogError(ClassName, $"Failed to start process {filePath} with error: {errorInfo}");
}
+ return;
}
var info = new ProcessStartInfo
From d13901bb9deebb52c6fa7357a8987c9c0d838c8e Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 20:00:40 +0800
Subject: [PATCH 038/124] Update work directory correctly
---
Flow.Launcher/PublicAPIInstance.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index f82ebdc37f1..2f29e098eb8 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -581,6 +581,8 @@ public void StartProcess(string filePath, string workingDirectory, string argume
{
try
{
+ workingDirectory = string.IsNullOrEmpty(workingDirectory) ? Environment.CurrentDirectory : workingDirectory;
+
// Deelevate process if it is running as administrator
if (Win32Helper.IsAdministrator() && !runAsAdmin)
{
@@ -595,7 +597,7 @@ public void StartProcess(string filePath, string workingDirectory, string argume
var info = new ProcessStartInfo
{
FileName = filePath,
- WorkingDirectory = string.IsNullOrEmpty(workingDirectory) ? Environment.CurrentDirectory : workingDirectory,
+ WorkingDirectory = workingDirectory,
Arguments = arguments,
UseShellExecute = true,
Verb = runAsAdmin ? "runas" : "",
From f9b2be1fc7119055a02fcc5444fe7115567c485b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 20:01:37 +0800
Subject: [PATCH 039/124] Let work directory can be empty
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 2 +-
Flow.Launcher/PublicAPIInstance.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 7b0e1dc8c56..a413fe98ef2 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -591,6 +591,6 @@ public interface IPublicAPI
/// Working directory. If not specified, the current directory will be used
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
/// Whether to run the process as administrator
- public void StartProcess(string filePath, string workingDirectory, string arguments = "", bool runAsAdmin = false);
+ public void StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false);
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 2f29e098eb8..e76ea1a5a6a 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -577,7 +577,7 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
- public void StartProcess(string filePath, string workingDirectory, string arguments = "", bool runAsAdmin = false)
+ public void StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false)
{
try
{
From 30deb6da99e3c7f5e96dd7e4dd7ec2d67821cbd2 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 20:02:32 +0800
Subject: [PATCH 040/124] Fix argument sequence issue
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index cfc73ad90c0..9336ce44c61 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -808,7 +808,7 @@ public static bool IsAdministrator()
/// Inspired by
/// Document:
///
- public static unsafe bool RunAsDesktopUser(string app, string cmdLine, string currentDir, out string errorInfo)
+ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string cmdLine, out string errorInfo)
{
STARTUPINFOW si = new();
PROCESS_INFORMATION pi = new();
From fb4735fbc081b0e0b19bc335a680cbe75fcb0e7f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 20:02:54 +0800
Subject: [PATCH 041/124] Fix program deelevate open issue
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index e3dec1c6065..4c141238faa 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -217,7 +217,7 @@ private void Launch(bool elevated = false)
}
}
- _ = Task.Run(() => Main.Context.API.StartProcess(FullPath, ParentDirectory, "", elevated)).ConfigureAwait(false);
+ _ = Task.Run(() => Main.Context.API.StartProcess(LnkResolvedPath, runAsAdmin:elevated)).ConfigureAwait(false);
}
public List ContextMenus(IPublicAPI api)
From b15cece4b8edd6ec9ad8a3ffd633d6bad842a2da Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 21:13:09 +0800
Subject: [PATCH 042/124] Fix absolute exe file path issue
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index b03f9c0a01c..2728628d537 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -23,6 +23,13 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
private bool _winRStroked;
private readonly KeyboardSimulator _keyboardSimulator = new(new InputSimulator());
+ private static readonly string[] possiblePwshPaths = new[]
+ {
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"PowerShell\7\pwsh.exe"),
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\pwsh.exe"),
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop
+ };
+
private Settings _settings;
public List Query(Query query)
@@ -309,7 +316,15 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
private static Process StartProcess(ProcessStartInfo info)
{
- Context.API.StartProcess(info.FileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
+ var absoluteFileName = info.FileName switch
+ {
+ "cmd.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe"),
+ "powershell.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"WindowsPowerShell\v1.0\powershell.exe"),
+ "pwsh.exe" => possiblePwshPaths.FirstOrDefault(File.Exists),
+ "wt.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
+ _ => info.FileName,
+ };
+ Context.API.StartProcess(absoluteFileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
return null;
}
From 255ca5ac01a7ed3db68cf97350ed8a2d1ecbe5c1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 11 Jun 2025 21:34:33 +0800
Subject: [PATCH 043/124] Improve code quality
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 30 +++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 2728628d537..bcc5c470e7a 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -23,6 +23,18 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
private bool _winRStroked;
private readonly KeyboardSimulator _keyboardSimulator = new(new InputSimulator());
+ private static readonly string[] possibleCmdPaths = new[]
+ {
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe"),
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\cmd.exe")
+ };
+
+ private static readonly string[] possiblePowershellPaths = new[]
+ {
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"WindowsPowerShell\v1.0\powershell.exe"),
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\WindowsPowerShell\v1.0\powershell.exe")
+ };
+
private static readonly string[] possiblePwshPaths = new[]
{
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"PowerShell\7\pwsh.exe"),
@@ -30,6 +42,13 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop
};
+ private static readonly string[] possibleWTPowerShellPaths = new[]
+ {
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
+ // if using Windows Terminal from Microsoft Store
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"WindowsApps\Microsoft.WindowsTerminal_*\wt.exe")
+ };
+
private Settings _settings;
public List Query(Query query)
@@ -318,12 +337,17 @@ private static Process StartProcess(ProcessStartInfo info)
{
var absoluteFileName = info.FileName switch
{
- "cmd.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe"),
- "powershell.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"WindowsPowerShell\v1.0\powershell.exe"),
+ "cmd.exe" => possibleCmdPaths.FirstOrDefault(File.Exists),
+ "powershell.exe" => possiblePowershellPaths.FirstOrDefault(File.Exists),
"pwsh.exe" => possiblePwshPaths.FirstOrDefault(File.Exists),
- "wt.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
+ "wt.exe" => possibleWTPowerShellPaths.FirstOrDefault(File.Exists),
_ => info.FileName,
};
+ if (string.IsNullOrEmpty(absoluteFileName))
+ {
+ Context.API.LogError(ClassName, $"The command '{info.FileName}' could not be found in the system PATH or the specified directories.");
+ return null;
+ }
Context.API.StartProcess(absoluteFileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
return null;
}
From 433e0fd0e198aae877c7a04b9be42648c7b04387 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 15:18:14 +0800
Subject: [PATCH 044/124] Improve uac dialog path
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 4c141238faa..7e78a7fb640 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -211,7 +211,7 @@ private void Launch(bool elevated = false)
if (Main.IsAdmin && elevated)
{
// Since we are already elevated, we need to create UAC dialog manually
- if (UACDialog.Show(IcoPath, Name, FullPath) != MessageBoxResult.Yes)
+ if (UACDialog.Show(IcoPath, Name, LnkResolvedPath) != MessageBoxResult.Yes)
{
return;
}
From 21e8d92aa2d4ba5ad3709febf8066672454d54a0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 15:30:25 +0800
Subject: [PATCH 045/124] Add show uac dialog api function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 15 +++++++++++++++
Flow.Launcher/Languages/en.xaml | 5 +++++
Flow.Launcher/PublicAPIInstance.cs | 3 +++
.../UACDialog.xaml | 7 ++++---
.../UACDialog.xaml.cs | 13 +++++--------
.../Languages/en.xaml | 3 ---
.../Programs/Win32.cs | 2 +-
7 files changed, 33 insertions(+), 15 deletions(-)
rename {Plugins/Flow.Launcher.Plugin.Program => Flow.Launcher}/UACDialog.xaml (95%)
rename {Plugins/Flow.Launcher.Plugin.Program => Flow.Launcher}/UACDialog.xaml.cs (80%)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index a413fe98ef2..9e3d279ab2a 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -592,5 +592,20 @@ public interface IPublicAPI
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
/// Whether to run the process as administrator
public void StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false);
+
+ ///
+ /// Displays a User Account Control (UAC) dialog to request elevated permissions for the specified application.
+ ///
+ ///
+ /// If Flow is running under administrator mode, executing elevated actions will not trigger UAC dialog.
+ /// So this method is used to manually show the UAC dialog when needed.
+ ///
+ /// The file path to the icon that will be displayed in the dialog. Must be a valid path to an image file.
+ /// The name of the application requesting elevation. This will be displayed in the dialog.
+ /// The full file path of the executable requesting elevation. This is shown to the user for verification.
+ /// A indicating the user's response to the dialog. Possible values include
+ /// if the user grants permission,
+ /// or if the user denies permission.
+ public MessageBoxResult ShowUACDialog(string iconPath, string appName, string fullPath);
}
}
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 97f294b14cb..aea9d4a6056 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -379,6 +379,11 @@
Flow Launcher has been updated to {0}
Click here to view the release notes
+
+ User Account Control
+ Do you want to allow this app to make changes to your device?
+ Program location: {0}
+
Select File Manager
Learn more
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index e76ea1a5a6a..6a4a4493d0c 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -610,6 +610,9 @@ public void StartProcess(string filePath, string workingDirectory = "", string a
}
}
+ public MessageBoxResult ShowUACDialog(string iconPath, string appName, string fullPath) =>
+ UACDialog.Show(iconPath, appName, fullPath);
+
#endregion
#region Private Methods
diff --git a/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml b/Flow.Launcher/UACDialog.xaml
similarity index 95%
rename from Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml
rename to Flow.Launcher/UACDialog.xaml
index d619f47654d..9d13a2c7b08 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml
+++ b/Flow.Launcher/UACDialog.xaml
@@ -1,10 +1,11 @@
@@ -86,7 +87,7 @@
Margin="0 0 26 0"
HorizontalAlignment="Stretch"
FontSize="14"
- Text="{DynamicResource flowlauncher_plugin_program_user_account_control_subtitle}"
+ Text="{DynamicResource userAccountControlSubtitle}"
TextAlignment="Left"
TextWrapping="Wrap" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs b/Flow.Launcher/UACDialog.xaml.cs
similarity index 80%
rename from Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs
rename to Flow.Launcher/UACDialog.xaml.cs
index 3ab087b489f..0d5e8a46d1b 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/UACDialog.xaml.cs
+++ b/Flow.Launcher/UACDialog.xaml.cs
@@ -3,7 +3,7 @@
using System.Windows;
using System.Windows.Input;
-namespace Flow.Launcher.Plugin.Program
+namespace Flow.Launcher
{
public partial class UACDialog : Window
{
@@ -26,16 +26,13 @@ public static MessageBoxResult Show(string iconPath, string appName, string full
try
{
- msgBox = new UACDialog
- {
- Title = Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_title")
- };
+ msgBox = new UACDialog();
// Set icon & app name & program location
_ = msgBox.SetImageAsync(iconPath);
msgBox.AppName.Text = appName;
msgBox.ProgramLocation.Text = string.Format(
- Main.Context.API.GetTranslation("flowlauncher_plugin_program_user_account_control_program_location"),
+ App.API.GetTranslation("userAccountControlProgramLocation"),
fullPath);
// Focus No by default
@@ -47,7 +44,7 @@ public static MessageBoxResult Show(string iconPath, string appName, string full
}
catch (Exception e)
{
- Main.Context.API.LogError(ClassName, $"An error occurred: {e.Message}");
+ App.API.LogError(ClassName, $"An error occurred: {e.Message}");
msgBox = null;
return MessageBoxResult.None;
}
@@ -55,7 +52,7 @@ public static MessageBoxResult Show(string iconPath, string appName, string full
private async Task SetImageAsync(string imagePath)
{
- var imageSource = await Main.Context.API.LoadImageAsync(imagePath);
+ var imageSource = await App.API.LoadImageAsync(imagePath);
Img.Source = imageSource;
}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index e3eeb4e91a5..e551a7dcb4e 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -97,8 +97,5 @@
Successfully disabled this program from displaying in your query
This app is not intended to be run as administrator
Unable to run {0}
- User Account Control
- Do you want to allow this app to make changes to your device?
- Program location: {0}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 7e78a7fb640..4e256d2cb47 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -211,7 +211,7 @@ private void Launch(bool elevated = false)
if (Main.IsAdmin && elevated)
{
// Since we are already elevated, we need to create UAC dialog manually
- if (UACDialog.Show(IcoPath, Name, LnkResolvedPath) != MessageBoxResult.Yes)
+ if (Main.Context.API.ShowUACDialog(IcoPath, Name, LnkResolvedPath) != MessageBoxResult.Yes)
{
return;
}
From 0d1358fdc314fe8560eb0bc45eedf6e81c0c5716 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 15:32:34 +0800
Subject: [PATCH 046/124] Add return value for start process api function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 3 ++-
Flow.Launcher/PublicAPIInstance.cs | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 9e3d279ab2a..8c02151be82 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -591,7 +591,8 @@ public interface IPublicAPI
/// Working directory. If not specified, the current directory will be used
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
/// Whether to run the process as administrator
- public void StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false);
+ /// Whether process is started successfully
+ public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false);
///
/// Displays a User Account Control (UAC) dialog to request elevated permissions for the specified application.
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 6a4a4493d0c..d02b718d067 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -577,7 +577,7 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
- public void StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false)
+ public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false)
{
try
{
@@ -590,8 +590,10 @@ public void StartProcess(string filePath, string workingDirectory = "", string a
if (!string.IsNullOrEmpty(errorInfo))
{
LogError(ClassName, $"Failed to start process {filePath} with error: {errorInfo}");
+ return false;
}
- return;
+
+ return true;
}
var info = new ProcessStartInfo
@@ -603,10 +605,12 @@ public void StartProcess(string filePath, string workingDirectory = "", string a
Verb = runAsAdmin ? "runas" : "",
};
Process.Start(info)?.Dispose();
+ return true;
}
catch (Exception e)
{
LogException(ClassName, $"Failed to start process {filePath} with arguments {arguments} under {workingDirectory}", e);
+ return false;
}
}
From a7753231081f58ed8b59b66638ac501626937f06 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 16:07:09 +0800
Subject: [PATCH 047/124] Improve uac dialog api function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 4 +--
Flow.Launcher/PublicAPIInstance.cs | 4 +--
Flow.Launcher/UACDialog.xaml.cs | 25 +++++++++++++++----
.../Programs/Win32.cs | 2 +-
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 8c02151be82..6382ecd0fbe 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -601,12 +601,12 @@ public interface IPublicAPI
/// If Flow is running under administrator mode, executing elevated actions will not trigger UAC dialog.
/// So this method is used to manually show the UAC dialog when needed.
///
- /// The file path to the icon that will be displayed in the dialog. Must be a valid path to an image file.
/// The name of the application requesting elevation. This will be displayed in the dialog.
+ /// The file path to the icon that will be displayed in the dialog. Must be a valid path to an image file.
/// The full file path of the executable requesting elevation. This is shown to the user for verification.
/// A indicating the user's response to the dialog. Possible values include
/// if the user grants permission,
/// or if the user denies permission.
- public MessageBoxResult ShowUACDialog(string iconPath, string appName, string fullPath);
+ public MessageBoxResult ShowUACDialog(string appName, string iconPath = "", string fullPath = "");
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index d02b718d067..4ff9659bba7 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -614,8 +614,8 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
}
}
- public MessageBoxResult ShowUACDialog(string iconPath, string appName, string fullPath) =>
- UACDialog.Show(iconPath, appName, fullPath);
+ public MessageBoxResult ShowUACDialog(string appName, string iconPath = "", string fullPath = "") =>
+ UACDialog.Show(appName, iconPath, fullPath);
#endregion
diff --git a/Flow.Launcher/UACDialog.xaml.cs b/Flow.Launcher/UACDialog.xaml.cs
index 0d5e8a46d1b..e49eac685d6 100644
--- a/Flow.Launcher/UACDialog.xaml.cs
+++ b/Flow.Launcher/UACDialog.xaml.cs
@@ -1,4 +1,5 @@
using System;
+using System.IO;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
@@ -17,11 +18,11 @@ private UACDialog()
InitializeComponent();
}
- public static MessageBoxResult Show(string iconPath, string appName, string fullPath)
+ public static MessageBoxResult Show(string appName, string iconPath, string fullPath)
{
if (!Application.Current.Dispatcher.CheckAccess())
{
- return Application.Current.Dispatcher.Invoke(() => Show(iconPath, appName, fullPath));
+ return Application.Current.Dispatcher.Invoke(() => Show(appName, iconPath, fullPath));
}
try
@@ -31,9 +32,18 @@ public static MessageBoxResult Show(string iconPath, string appName, string full
// Set icon & app name & program location
_ = msgBox.SetImageAsync(iconPath);
msgBox.AppName.Text = appName;
- msgBox.ProgramLocation.Text = string.Format(
- App.API.GetTranslation("userAccountControlProgramLocation"),
- fullPath);
+ if (string.IsNullOrEmpty(fullPath))
+ {
+ msgBox.ProgramLocation.Text = string.Format(
+ App.API.GetTranslation("userAccountControlProgramLocation"),
+ appName);
+ }
+ else
+ {
+ msgBox.ProgramLocation.Text = string.Format(
+ App.API.GetTranslation("userAccountControlProgramLocation"),
+ fullPath);
+ }
// Focus No by default
msgBox.btnNo.Focus();
@@ -52,6 +62,11 @@ public static MessageBoxResult Show(string iconPath, string appName, string full
private async Task SetImageAsync(string imagePath)
{
+ if (string.IsNullOrEmpty(imagePath) || !File.Exists(imagePath))
+ {
+ Img.Visibility = Visibility.Collapsed;
+ return;
+ }
var imageSource = await App.API.LoadImageAsync(imagePath);
Img.Source = imageSource;
}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 4e256d2cb47..905fab91370 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -211,7 +211,7 @@ private void Launch(bool elevated = false)
if (Main.IsAdmin && elevated)
{
// Since we are already elevated, we need to create UAC dialog manually
- if (Main.Context.API.ShowUACDialog(IcoPath, Name, LnkResolvedPath) != MessageBoxResult.Yes)
+ if (Main.Context.API.ShowUACDialog(Name, IcoPath, LnkResolvedPath) != MessageBoxResult.Yes)
{
return;
}
From a3212affd72aa9bec222c5cab6a1d9f8dd4b3c96 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 16:16:47 +0800
Subject: [PATCH 048/124] Dynamically find wt.exe
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index bcc5c470e7a..a00319c7991 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -42,11 +42,9 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop
};
- private static readonly string[] possibleWTPowerShellPaths = new[]
+ private static readonly List possibleWindowsTerminalPaths = new()
{
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
- // if using Windows Terminal from Microsoft Store
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"WindowsApps\Microsoft.WindowsTerminal_*\wt.exe")
};
private Settings _settings;
@@ -406,6 +404,21 @@ public void Init(PluginInitContext context)
Context = context;
_settings = context.API.LoadSettingJsonStorage();
context.API.RegisterGlobalKeyboardCallback(API_GlobalKeyboardEvent);
+
+ // Search for all folders with Microsoft.WindowsTerminal_ prefix
+ var windowsAppsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsApps");
+ var windowsTerminalFolders = Directory.EnumerateDirectories(windowsAppsPath, "Microsoft.WindowsTerminal_*",
+ SearchOption.TopDirectoryOnly);
+
+ // Find wt.exe among them
+ foreach (var windowsTerminalFolder in windowsTerminalFolders)
+ {
+ var windowsTerminalPath = Path.Combine(windowsTerminalFolder, "wt.exe");
+ if (File.Exists(windowsTerminalPath))
+ {
+ possibleWindowsTerminalPaths.Insert(0, windowsTerminalPath);
+ }
+ }
}
bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
From 8b8fcd8c7b0871b49be4af85843782a4d5bf5c6a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 16:16:58 +0800
Subject: [PATCH 049/124] Add IsAdmin
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index a00319c7991..30d96f1b232 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -47,6 +47,8 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
};
+ private static readonly bool IsAdmin = IsAdministrator();
+
private Settings _settings;
public List Query(Query query)
@@ -518,5 +520,12 @@ public void Dispose()
{
Context.API.RemoveGlobalKeyboardCallback(API_GlobalKeyboardEvent);
}
+
+ private static bool IsAdministrator()
+ {
+ using var identity = WindowsIdentity.GetCurrent();
+ var principal = new WindowsPrincipal(identity);
+ return principal.IsInRole(WindowsBuiltInRole.Administrator);
+ }
}
}
From 94f0bb961ef9b16b293dfe30befbc8f57f0a4237 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 16:21:00 +0800
Subject: [PATCH 050/124] Handle command running with administrator mode
correctly
---
.../Languages/en.xaml | 11 +-
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 120 ++++++++++++++++--
2 files changed, 114 insertions(+), 17 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
index 645a0e14fd7..026f0b86fa0 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
@@ -1,6 +1,7 @@
-
+
Replace Win+R
Close Command Prompt after pressing any key
@@ -16,4 +17,8 @@
Run As Administrator
Copy the command
Only show number of most used commands:
+ Windows Command Processor
+ Windows PowerShell
+ Microsoft PowerShell 7
+ Terminal
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 30d96f1b232..b2b7ab702de 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -4,10 +4,12 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
+using System.Security.Principal;
using System.Threading.Tasks;
+using System.Windows;
+using Flow.Launcher.Plugin.SharedCommands;
using WindowsInput;
using WindowsInput.Native;
-using Flow.Launcher.Plugin.SharedCommands;
using Control = System.Windows.Controls.Control;
using Keys = System.Windows.Forms.Keys;
@@ -335,21 +337,111 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
private static Process StartProcess(ProcessStartInfo info)
{
- var absoluteFileName = info.FileName switch
- {
- "cmd.exe" => possibleCmdPaths.FirstOrDefault(File.Exists),
- "powershell.exe" => possiblePowershellPaths.FirstOrDefault(File.Exists),
- "pwsh.exe" => possiblePwshPaths.FirstOrDefault(File.Exists),
- "wt.exe" => possibleWTPowerShellPaths.FirstOrDefault(File.Exists),
- _ => info.FileName,
- };
- if (string.IsNullOrEmpty(absoluteFileName))
+ switch (info.FileName)
{
- Context.API.LogError(ClassName, $"The command '{info.FileName}' could not be found in the system PATH or the specified directories.");
- return null;
+ case "cmd.exe":
+ // Check if cmd.exe exists in the system PATH or the specified directories
+ var cmdPath = possibleCmdPaths.FirstOrDefault(File.Exists);
+ if (string.IsNullOrEmpty(cmdPath))
+ {
+ Context.API.LogError(ClassName, $"Cannot find cmd.exe");
+ // Fall back to using the Process.Start method directly
+ // Show user account control dialog if Flow is running as administrator
+ if (IsAdmin)
+ {
+ var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd"), cmdPath, cmdPath);
+ if (uacDialog != MessageBoxResult.Yes)
+ {
+ return null;
+ }
+ }
+
+ return Process.Start(info);
+ }
+
+ // If Flow is running as administrator and the command is run as administrator, we need to use UAC dialog
+ if (IsAdmin && info.Verb == "runas")
+ {
+ var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd"), cmdPath, cmdPath);
+ if (uacDialog != MessageBoxResult.Yes)
+ {
+ return null;
+ }
+ }
+
+ Context.API.StartProcess(cmdPath, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
+ return null;
+
+ case "powershell.exe":
+ var powershellPath = possiblePowershellPaths.FirstOrDefault(File.Exists);
+ if (string.IsNullOrEmpty(powershellPath))
+ {
+ Context.API.LogError(ClassName, $"Cannot find powershell.exe");
+ // Fall back to using the Process.Start method directly
+ // Show user account control dialog if Flow is running as administrator
+ if (IsAdmin)
+ {
+ var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_powershell"), powershellPath, powershellPath);
+ if (uacDialog != MessageBoxResult.Yes)
+ {
+ return null;
+ }
+ }
+
+ return Process.Start(info);
+ }
+
+ // If Flow is running as administrator and the command is run as administrator, we need to use UAC dialog
+ if (IsAdmin && info.Verb == "runas")
+ {
+ var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_powershell"), powershellPath, powershellPath);
+ if (uacDialog != MessageBoxResult.Yes)
+ {
+ return null;
+ }
+ }
+
+ Context.API.StartProcess(powershellPath, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
+ return null;
+
+ // Due to arguments pass issues, powershell 7 fails to work with deelevate model
+ // So we use shell to execuete them which means if Flow is running as administrator,
+ // all commands must be running as administrator
+ case "pwsh.exe":
+ // Fall back to using the Process.Start method directly
+ // Show user account control dialog if Flow is running as administrator
+ if (IsAdmin)
+ {
+ var pwshPath = possiblePwshPaths.FirstOrDefault(File.Exists);
+ var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_pwsh"), pwshPath, pwshPath ?? "pwsh.exe");
+ if (uacDialog != MessageBoxResult.Yes)
+ {
+ return null;
+ }
+ }
+
+ return Process.Start(info);
+
+ // Due to arguments pass issues, windows terminal fails to work with deelevate model
+ // So we use shell to execuete them which means if Flow is running as administrator,
+ // all commands must be running as administrator
+ case "wt.exe":
+ // Fall back to using the Process.Start method directly
+ // Show user account control dialog if Flow is running as administrator
+ if (IsAdmin)
+ {
+ var wtPath = possibleWindowsTerminalPaths.FirstOrDefault(File.Exists);
+ var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_wt"), wtPath, wtPath ?? "wt.exe");
+ if (uacDialog != MessageBoxResult.Yes)
+ {
+ return null;
+ }
+ }
+
+ return Process.Start(info);
}
- Context.API.StartProcess(absoluteFileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
- return null;
+
+ return Process.Start(info);
}
private static void Execute(Func startProcess, ProcessStartInfo info)
From 6842fcaf448fa43c8592946682e5f6be19ce4bae Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 16:30:54 +0800
Subject: [PATCH 051/124] Replace IntPtr.Zero with Handle or HWND
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 9336ce44c61..7c72d085746 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -282,7 +282,7 @@ public static unsafe bool IsForegroundWindowFullscreen()
{
var hWndDesktop = PInvoke.FindWindowEx(hWnd, HWND.Null, "SHELLDLL_DefView", null);
hWndDesktop = PInvoke.FindWindowEx(hWndDesktop, HWND.Null, "SysListView32", "FolderView");
- if (hWndDesktop.Value != IntPtr.Zero)
+ if (hWndDesktop != HWND.Null)
{
return false;
}
@@ -873,7 +873,7 @@ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string
// 4. Open that process
hShellProcess = PInvoke.OpenProcess(PROCESS_ACCESS_RIGHTS.PROCESS_QUERY_INFORMATION, false, dwPID);
- if (hShellProcess == IntPtr.Zero)
+ if (hShellProcess == HANDLE.Null)
{
errorInfo = $"Can't open desktop shell process: {Marshal.GetLastWin32Error()}";
return false;
From 9c6c015b1d262194ccf82fe961e8e1b698713816 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 18:45:22 +0800
Subject: [PATCH 052/124] Reflect user intent
---
Flow.Launcher/UACDialog.xaml.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/Flow.Launcher/UACDialog.xaml.cs b/Flow.Launcher/UACDialog.xaml.cs
index e49eac685d6..aa87125adc4 100644
--- a/Flow.Launcher/UACDialog.xaml.cs
+++ b/Flow.Launcher/UACDialog.xaml.cs
@@ -73,6 +73,7 @@ private async Task SetImageAsync(string imagePath)
private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
{
+ _result = MessageBoxResult.Cancel;
DialogResult = false;
Close();
}
From 8cfaeeae6b4314b35fd605952fca0c53ea3f24a4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 18:46:31 +0800
Subject: [PATCH 053/124] Return value of RunAsDesktopUser
---
Flow.Launcher/PublicAPIInstance.cs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 4ff9659bba7..0746f374753 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -586,14 +586,13 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
// Deelevate process if it is running as administrator
if (Win32Helper.IsAdministrator() && !runAsAdmin)
{
- Win32Helper.RunAsDesktopUser(filePath, workingDirectory, arguments, out var errorInfo);
+ var result = Win32Helper.RunAsDesktopUser(filePath, workingDirectory, arguments, out var errorInfo);
if (!string.IsNullOrEmpty(errorInfo))
{
LogError(ClassName, $"Failed to start process {filePath} with error: {errorInfo}");
- return false;
}
- return true;
+ return result;
}
var info = new ProcessStartInfo
From 61717dcd50020dd23a04276b81ac3f47d687d7aa Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 18:51:03 +0800
Subject: [PATCH 054/124] Ensure SetImageAsync exceptions are handled
---
Flow.Launcher/UACDialog.xaml.cs | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher/UACDialog.xaml.cs b/Flow.Launcher/UACDialog.xaml.cs
index aa87125adc4..040f10328b2 100644
--- a/Flow.Launcher/UACDialog.xaml.cs
+++ b/Flow.Launcher/UACDialog.xaml.cs
@@ -62,13 +62,22 @@ public static MessageBoxResult Show(string appName, string iconPath, string full
private async Task SetImageAsync(string imagePath)
{
- if (string.IsNullOrEmpty(imagePath) || !File.Exists(imagePath))
+ try
+ {
+ if (string.IsNullOrEmpty(imagePath) || !File.Exists(imagePath))
+ {
+ Img.Visibility = Visibility.Collapsed;
+ return;
+ }
+ var imageSource = await App.API.LoadImageAsync(imagePath);
+ Img.Source = imageSource;
+ Img.Visibility = Visibility.Visible;
+ }
+ catch (Exception ex)
{
+ App.API.LogException(ClassName, $"Failed to load UAC dialog image: {imagePath}", ex);
Img.Visibility = Visibility.Collapsed;
- return;
}
- var imageSource = await App.API.LoadImageAsync(imagePath);
- Img.Source = imageSource;
}
private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
From 393d106c151f8d243c5e3e1afa6a08440481c8d0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:07:55 +0800
Subject: [PATCH 055/124] Fix command line pass issue
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 7c72d085746..4fe995e8abf 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -911,7 +911,9 @@ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string
// 7. Start the new process with that primary token
fixed (char* appPtr = app)
- fixed (char* cmdLinePtr = cmdLine)
+ // Because argv[0] is the module name, C programmers generally repeat the module name as the first token in the command line
+ // So we add one more dash before the command line to make command line work correctly
+ fixed (char* cmdLinePtr = $"- {cmdLine}")
fixed (char* currentDirPtr = currentDir)
{
if (!PInvoke.CreateProcessWithToken(hPrimaryToken,
From 2df7a6179b119dded27f6217ec6875f7d5e85063 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:10:42 +0800
Subject: [PATCH 056/124] Add command project
---
.../Flow.Launcher.Command.csproj | 43 ++++++++
Flow.Launcher.Command/Program.cs | 98 ++++++++++++++++++
Flow.Launcher.Command/app.ico | Bin 0 -> 116895 bytes
Flow.Launcher.sln | 42 +++++---
4 files changed, 169 insertions(+), 14 deletions(-)
create mode 100644 Flow.Launcher.Command/Flow.Launcher.Command.csproj
create mode 100644 Flow.Launcher.Command/Program.cs
create mode 100644 Flow.Launcher.Command/app.ico
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
new file mode 100644
index 00000000000..9f6a389af3c
--- /dev/null
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -0,0 +1,43 @@
+
+
+
+ Exe
+ net7.0
+ enable
+ enable
+ Flow.Launcher.Command
+ false
+ false
+ false
+ app.ico
+
+
+
+ AnyCPU
+ true
+ portable
+ false
+ ..\Output\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ true
+ false
+
+
+
+ AnyCPU
+ pdbonly
+ true
+ ..\Output\Release\
+ TRACE;RELEASE
+ prompt
+ 4
+ false
+
+
+
+
+
+
+
diff --git a/Flow.Launcher.Command/Program.cs b/Flow.Launcher.Command/Program.cs
new file mode 100644
index 00000000000..0dabbc5e66a
--- /dev/null
+++ b/Flow.Launcher.Command/Program.cs
@@ -0,0 +1,98 @@
+using System.Diagnostics;
+
+namespace Flow.Launcher.Command;
+
+internal static class Program
+{
+ [STAThread]
+ private static int Main(string[] args)
+ {
+ if (args.Length == 0) return -1;
+
+ // Start process with arguments
+ // Usage: Flow.Launcher.Command -StartProcess -FileName -WorkingDirectory -Arguments -UseShellExecute -Verb
+ if (args[0] == @"-StartProcess")
+ {
+ var fileName = string.Empty;
+ var workingDirectory = Environment.CurrentDirectory;
+ var argumentList = new List();
+ var useShellExecute = true;
+ var verb = string.Empty;
+ var isArguments = false;
+
+ for (int i = 1; i < args.Length; i++)
+ {
+ switch (args[i])
+ {
+ case "-FileName":
+ if (i + 1 < args.Length)
+ fileName = args[++i];
+ isArguments = false;
+ break;
+
+ case "-WorkingDirectory":
+ if (i + 1 < args.Length)
+ workingDirectory = args[++i];
+ isArguments = false;
+ break;
+
+ case "-Arguments":
+ if (i + 1 < args.Length)
+ argumentList.Add(args[++i]);
+ isArguments = true;
+ break;
+
+ case "-UseShellExecute":
+ if (i + 1 < args.Length && bool.TryParse(args[++i], out bool useShell))
+ useShellExecute = useShell;
+ isArguments = false;
+ break;
+
+ case "-Verb":
+ if (i + 1 < args.Length)
+ verb = args[++i];
+ isArguments = false;
+ break;
+
+ default:
+ if (isArguments)
+ argumentList.Add(args[i]);
+ else
+ Console.WriteLine($"Unknown parameter: {args[i]}");
+ break;
+ }
+ }
+
+ if (string.IsNullOrEmpty(fileName))
+ {
+ Console.WriteLine("Error: -FileName is required.");
+ return -2;
+ }
+
+ try
+ {
+ using var process = new Process
+ {
+ StartInfo = new ProcessStartInfo
+ {
+ FileName = fileName,
+ WorkingDirectory = workingDirectory,
+ Arguments = string.Join(" ", argumentList),
+ UseShellExecute = useShellExecute,
+ Verb = verb
+ }
+ };
+ process.Start();
+ Console.WriteLine("Success.");
+ return 0;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"Error: {ex.Message}");
+ return -3;
+ }
+ }
+
+ return -4;
+ }
+}
diff --git a/Flow.Launcher.Command/app.ico b/Flow.Launcher.Command/app.ico
new file mode 100644
index 0000000000000000000000000000000000000000..36b1d22d0b3bcfb91c8ff451953e9eb421da1385
GIT binary patch
literal 116895
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
literal 0
HcmV?d00001
diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index e44b23232fb..a0eb09a89bb 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -53,8 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
LICENSE = LICENSE
Scripts\post_build.ps1 = Scripts\post_build.ps1
README.md = README.md
- SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
Settings.XamlStyler = Settings.XamlStyler
+ SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Shell", "Plugins\Flow.Launcher.Plugin.Shell\Flow.Launcher.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}"
@@ -71,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Plugin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.WindowsSettings", "Plugins\Flow.Launcher.Plugin.WindowsSettings\Flow.Launcher.Plugin.WindowsSettings.csproj", "{5043CECE-E6A7-4867-9CBE-02D27D83747A}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flow.Launcher.Command", "Flow.Launcher.Command\Flow.Launcher.Command.csproj", "{A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -81,8 +83,20 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.Build.0 = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.Build.0 = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.Build.0 = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.Build.0 = Release|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.ActiveCfg = Debug|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.Build.0 = Debug|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -105,18 +119,6 @@ Global
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x64.Build.0 = Release|Any CPU
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.ActiveCfg = Release|Any CPU
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.Build.0 = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.Build.0 = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.Build.0 = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.Build.0 = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.Build.0 = Release|Any CPU
{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -286,6 +288,18 @@ Global
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x64.Build.0 = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.ActiveCfg = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.Build.0 = Release|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Debug|x64.Build.0 = Debug|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Debug|x86.Build.0 = Debug|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Release|x64.ActiveCfg = Release|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Release|x64.Build.0 = Release|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Release|x86.ActiveCfg = Release|Any CPU
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
From 13b5012386a341986a038a472ff8ea3d894aafde Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:11:27 +0800
Subject: [PATCH 057/124] Add command executer path
---
Flow.Launcher.Infrastructure/Constant.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index 13da9f79f3b..dd916845a95 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -16,6 +16,7 @@ public static class Constant
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, FlowLauncher + ".exe");
+ public static readonly string CommandExecutablePath = Path.Combine(ProgramDirectory, "Flow.Launcher.Command.exe");
public static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
From b8a697c2668b00e89704570496a4a2bef7915205 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:12:00 +0800
Subject: [PATCH 058/124] Fix running issue
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index b2b7ab702de..6d469db6f5e 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -500,7 +500,7 @@ public void Init(PluginInitContext context)
context.API.RegisterGlobalKeyboardCallback(API_GlobalKeyboardEvent);
// Search for all folders with Microsoft.WindowsTerminal_ prefix
- var windowsAppsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsApps");
+ /*var windowsAppsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsApps");
var windowsTerminalFolders = Directory.EnumerateDirectories(windowsAppsPath, "Microsoft.WindowsTerminal_*",
SearchOption.TopDirectoryOnly);
@@ -512,7 +512,7 @@ public void Init(PluginInitContext context)
{
possibleWindowsTerminalPaths.Insert(0, windowsTerminalPath);
}
- }
+ }*/
}
bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
From a0ebe2916f72e9f6ee0b5544f72d38b70b3a8045 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:20:37 +0800
Subject: [PATCH 059/124] Improve api function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 5 +++--
Flow.Launcher/PublicAPIInstance.cs | 14 +++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 6382ecd0fbe..9e8e203b3e3 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -590,9 +590,10 @@ public interface IPublicAPI
/// Absolute file path. It can be an executable file or a script file
/// Working directory. If not specified, the current directory will be used
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
- /// Whether to run the process as administrator
+ /// Whether to use shell to execute the process.
+ /// The verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
- public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false);
+ public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "");
///
/// Displays a User Account Control (UAC) dialog to request elevated permissions for the specified application.
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 0746f374753..461f24aa719 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -577,16 +577,20 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
- public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool runAsAdmin = false)
+ public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "")
{
try
{
workingDirectory = string.IsNullOrEmpty(workingDirectory) ? Environment.CurrentDirectory : workingDirectory;
- // Deelevate process if it is running as administrator
- if (Win32Helper.IsAdministrator() && !runAsAdmin)
+ // Use command executer to run the process as desktop user if running as admin
+ if (Win32Helper.IsAdministrator())
{
- var result = Win32Helper.RunAsDesktopUser(filePath, workingDirectory, arguments, out var errorInfo);
+ var result = Win32Helper.RunAsDesktopUser(
+ Constant.CommandExecutablePath,
+ Environment.CurrentDirectory,
+ $"-StartProcess -FileName {filePath} -WorkingDirectory {workingDirectory} -Arguments {arguments} -UseShellExecute {useShellExecute} -Verb {verb}",
+ out var errorInfo);
if (!string.IsNullOrEmpty(errorInfo))
{
LogError(ClassName, $"Failed to start process {filePath} with error: {errorInfo}");
@@ -601,7 +605,7 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
WorkingDirectory = workingDirectory,
Arguments = arguments,
UseShellExecute = true,
- Verb = runAsAdmin ? "runas" : "",
+ Verb = verb,
};
Process.Start(info)?.Dispose();
return true;
From 3ed8af8c6c0e4539d8ae51fa5fb068c81b64dc40 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:22:27 +0800
Subject: [PATCH 060/124] Use new api for program plugin
---
Plugins/Flow.Launcher.Plugin.Program/Main.cs | 10 ----------
.../Programs/Win32.cs | 17 ++++-------------
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index f220190e253..d2884599467 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -3,7 +3,6 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
-using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Controls;
@@ -33,8 +32,6 @@ public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, I
internal static PluginInitContext Context { get; private set; }
- internal static bool IsAdmin = IsAdministrator();
-
private static readonly List emptyResults = new();
private static readonly MemoryCacheOptions cacheOptions = new() { SizeLimit = 1560 };
@@ -462,12 +459,5 @@ public void Dispose()
{
Win32.Dispose();
}
-
- private static bool IsAdministrator()
- {
- using var identity = WindowsIdentity.GetCurrent();
- var principal = new WindowsPrincipal(identity);
- return principal.IsInRole(WindowsBuiltInRole.Administrator);
- }
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 905fab91370..3a443df5022 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -8,7 +8,6 @@
using System.Text;
using System.Threading.Channels;
using System.Threading.Tasks;
-using System.Windows;
using System.Windows.Input;
using Flow.Launcher.Plugin.Program.Logger;
using Flow.Launcher.Plugin.Program.Views.Models;
@@ -206,18 +205,10 @@ public Result Result(string query, IPublicAPI api)
return result;
}
- private void Launch(bool elevated = false)
+ private void Launch(bool runAsAdmin = false)
{
- if (Main.IsAdmin && elevated)
- {
- // Since we are already elevated, we need to create UAC dialog manually
- if (Main.Context.API.ShowUACDialog(Name, IcoPath, LnkResolvedPath) != MessageBoxResult.Yes)
- {
- return;
- }
- }
-
- _ = Task.Run(() => Main.Context.API.StartProcess(LnkResolvedPath, runAsAdmin:elevated)).ConfigureAwait(false);
+ _ = Task.Run(() => Main.Context.API.StartProcess(
+ FullPath, ParentDirectory, string.Empty, true, runAsAdmin ? "runas" : ""));
}
public List ContextMenus(IPublicAPI api)
@@ -234,7 +225,7 @@ public List ContextMenus(IPublicAPI api)
FileName = FullPath, WorkingDirectory = ParentDirectory, UseShellExecute = true
};
- _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info)).ConfigureAwait(false);
+ _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info));
return true;
},
From 5551bdf9d07a754a8c0b773ceb42d746aef71866 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:23:33 +0800
Subject: [PATCH 061/124] Remove uac dialog api function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 15 --
Flow.Launcher/Languages/en.xaml | 5 -
Flow.Launcher/PublicAPIInstance.cs | 3 -
Flow.Launcher/UACDialog.xaml | 155 ------------------
Flow.Launcher/UACDialog.xaml.cs | 109 ------------
5 files changed, 287 deletions(-)
delete mode 100644 Flow.Launcher/UACDialog.xaml
delete mode 100644 Flow.Launcher/UACDialog.xaml.cs
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 9e8e203b3e3..9e28a72bd68 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -594,20 +594,5 @@ public interface IPublicAPI
/// The verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "");
-
- ///
- /// Displays a User Account Control (UAC) dialog to request elevated permissions for the specified application.
- ///
- ///
- /// If Flow is running under administrator mode, executing elevated actions will not trigger UAC dialog.
- /// So this method is used to manually show the UAC dialog when needed.
- ///
- /// The name of the application requesting elevation. This will be displayed in the dialog.
- /// The file path to the icon that will be displayed in the dialog. Must be a valid path to an image file.
- /// The full file path of the executable requesting elevation. This is shown to the user for verification.
- /// A indicating the user's response to the dialog. Possible values include
- /// if the user grants permission,
- /// or if the user denies permission.
- public MessageBoxResult ShowUACDialog(string appName, string iconPath = "", string fullPath = "");
}
}
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index aea9d4a6056..97f294b14cb 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -379,11 +379,6 @@
Flow Launcher has been updated to {0}
Click here to view the release notes
-
- User Account Control
- Do you want to allow this app to make changes to your device?
- Program location: {0}
-
Select File Manager
Learn more
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 461f24aa719..877e3feef06 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -617,9 +617,6 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
}
}
- public MessageBoxResult ShowUACDialog(string appName, string iconPath = "", string fullPath = "") =>
- UACDialog.Show(appName, iconPath, fullPath);
-
#endregion
#region Private Methods
diff --git a/Flow.Launcher/UACDialog.xaml b/Flow.Launcher/UACDialog.xaml
deleted file mode 100644
index 9d13a2c7b08..00000000000
--- a/Flow.Launcher/UACDialog.xaml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Flow.Launcher/UACDialog.xaml.cs b/Flow.Launcher/UACDialog.xaml.cs
deleted file mode 100644
index 040f10328b2..00000000000
--- a/Flow.Launcher/UACDialog.xaml.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Input;
-
-namespace Flow.Launcher
-{
- public partial class UACDialog : Window
- {
- private static readonly string ClassName = nameof(UACDialog);
-
- private static UACDialog msgBox;
- private static MessageBoxResult _result = MessageBoxResult.None;
-
- private UACDialog()
- {
- InitializeComponent();
- }
-
- public static MessageBoxResult Show(string appName, string iconPath, string fullPath)
- {
- if (!Application.Current.Dispatcher.CheckAccess())
- {
- return Application.Current.Dispatcher.Invoke(() => Show(appName, iconPath, fullPath));
- }
-
- try
- {
- msgBox = new UACDialog();
-
- // Set icon & app name & program location
- _ = msgBox.SetImageAsync(iconPath);
- msgBox.AppName.Text = appName;
- if (string.IsNullOrEmpty(fullPath))
- {
- msgBox.ProgramLocation.Text = string.Format(
- App.API.GetTranslation("userAccountControlProgramLocation"),
- appName);
- }
- else
- {
- msgBox.ProgramLocation.Text = string.Format(
- App.API.GetTranslation("userAccountControlProgramLocation"),
- fullPath);
- }
-
- // Focus No by default
- msgBox.btnNo.Focus();
- _result = MessageBoxResult.No;
-
- msgBox.ShowDialog();
- return _result;
- }
- catch (Exception e)
- {
- App.API.LogError(ClassName, $"An error occurred: {e.Message}");
- msgBox = null;
- return MessageBoxResult.None;
- }
- }
-
- private async Task SetImageAsync(string imagePath)
- {
- try
- {
- if (string.IsNullOrEmpty(imagePath) || !File.Exists(imagePath))
- {
- Img.Visibility = Visibility.Collapsed;
- return;
- }
- var imageSource = await App.API.LoadImageAsync(imagePath);
- Img.Source = imageSource;
- Img.Visibility = Visibility.Visible;
- }
- catch (Exception ex)
- {
- App.API.LogException(ClassName, $"Failed to load UAC dialog image: {imagePath}", ex);
- Img.Visibility = Visibility.Collapsed;
- }
- }
-
- private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
- {
- _result = MessageBoxResult.Cancel;
- DialogResult = false;
- Close();
- }
-
- private void Button_Click(object sender, RoutedEventArgs e)
- {
- if (sender == btnYes)
- _result = MessageBoxResult.Yes;
- else if (sender == btnNo)
- _result = MessageBoxResult.No;
- else
- _result = MessageBoxResult.None;
- msgBox.Close();
- msgBox = null;
- }
-
- private void Button_Cancel(object sender, RoutedEventArgs e)
- {
- _result = MessageBoxResult.Cancel;
- msgBox.Close();
- msgBox = null;
- }
- }
-}
From 2c0210c480f92fa67a7d1ff78900802d2d3793a1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:28:03 +0800
Subject: [PATCH 062/124] Revert unnecessary changes in solution file
---
Flow.Launcher.sln | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index a0eb09a89bb..eb607689320 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -53,8 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
LICENSE = LICENSE
Scripts\post_build.ps1 = Scripts\post_build.ps1
README.md = README.md
- Settings.XamlStyler = Settings.XamlStyler
SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
+ Settings.XamlStyler = Settings.XamlStyler
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Shell", "Plugins\Flow.Launcher.Plugin.Shell\Flow.Launcher.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}"
@@ -83,18 +83,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.Build.0 = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.Build.0 = Debug|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.Build.0 = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU
- {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.Build.0 = Release|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -119,6 +107,18 @@ Global
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x64.Build.0 = Release|Any CPU
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.ActiveCfg = Release|Any CPU
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.Build.0 = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.Build.0 = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.Build.0 = Debug|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.Build.0 = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU
+ {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.Build.0 = Release|Any CPU
{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.ActiveCfg = Debug|Any CPU
From 898dbb8402c26b4e653a82b4abc99e336f4339c1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:30:51 +0800
Subject: [PATCH 063/124] Use new api for uwp package opening
---
.../Programs/UWPPackage.cs | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
index 182f3fed537..646079946a8 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Security.Principal;
@@ -516,14 +515,8 @@ private void Launch(bool elevated = false)
var command = "shell:AppsFolder\\" + UserModelId;
command = Environment.ExpandEnvironmentVariables(command.Trim());
- var info = new ProcessStartInfo()
- {
- FileName = command,
- UseShellExecute = true,
- Verb = elevated ? "runas" : ""
- };
-
- _ = Task.Run(() => Main.StartProcess(Process.Start, info)).ConfigureAwait(false);
+ _ = Task.Run(() => Main.Context.API.StartProcess(
+ command, string.Empty, string.Empty, true, elevated ? "runas" : ""));
}
internal static bool IfAppCanRunElevated(XmlNode appNode)
From 4ebfb3c5fdda26f9ff406b030e5ef1d0ee2700b1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:39:13 +0800
Subject: [PATCH 064/124] Add api function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 17 ++++++++++++++++-
Flow.Launcher/PublicAPIInstance.cs | 4 ++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 9e28a72bd68..45424cccb17 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using System.IO;
using System.Runtime.CompilerServices;
@@ -585,7 +586,7 @@ public interface IPublicAPI
/// Start a process with the given file path and arguments
///
///
- /// It can help to start a deelevated process when Flow is running as administrator.
+ /// It can help to start a deelevated process and show user account control dialog when Flow is running as administrator.
///
/// Absolute file path. It can be an executable file or a script file
/// Working directory. If not specified, the current directory will be used
@@ -594,5 +595,19 @@ public interface IPublicAPI
/// The verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "");
+
+ ///
+ /// Start a process with the given file path and arguments
+ ///
+ ///
+ /// It can help to start a deelevated process and show user account control dialog when Flow is running as administrator.
+ ///
+ /// Absolute file path. It can be an executable file or a script file
+ /// Working directory. If not specified, the current directory will be used
+ /// Optional arguments to pass to the process. If not specified, no arguments will be passed
+ /// Whether to use shell to execute the process.
+ /// The verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
+ /// Whether process is started successfully
+ public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = true, string verb = "");
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 877e3feef06..4275e36a195 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Diagnostics;
@@ -617,6 +618,9 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
}
}
+ public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = true, string verb = "") =>
+ StartProcess(filePath, workingDirectory, argumentList == null ? string.Empty : string.Join(" ", argumentList), useShellExecute, verb);
+
#endregion
#region Private Methods
From a2be6e0d0e7690858bfaed1e9f94a5246c20b915 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 13:39:36 +0800
Subject: [PATCH 065/124] Use new api for shell plugin
---
.../Languages/en.xaml | 4 -
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 157 +-----------------
2 files changed, 2 insertions(+), 159 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
index 026f0b86fa0..941559cb53d 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
@@ -17,8 +17,4 @@
Run As Administrator
Copy the command
Only show number of most used commands:
- Windows Command Processor
- Windows PowerShell
- Microsoft PowerShell 7
- Terminal
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 6d469db6f5e..77e092b6afc 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -4,9 +4,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
-using System.Security.Principal;
using System.Threading.Tasks;
-using System.Windows;
using Flow.Launcher.Plugin.SharedCommands;
using WindowsInput;
using WindowsInput.Native;
@@ -25,32 +23,6 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, IDispo
private bool _winRStroked;
private readonly KeyboardSimulator _keyboardSimulator = new(new InputSimulator());
- private static readonly string[] possibleCmdPaths = new[]
- {
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe"),
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\cmd.exe")
- };
-
- private static readonly string[] possiblePowershellPaths = new[]
- {
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"WindowsPowerShell\v1.0\powershell.exe"),
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\WindowsPowerShell\v1.0\powershell.exe")
- };
-
- private static readonly string[] possiblePwshPaths = new[]
- {
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"PowerShell\7\pwsh.exe"),
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\pwsh.exe"),
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop
- };
-
- private static readonly List possibleWindowsTerminalPaths = new()
- {
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
- };
-
- private static readonly bool IsAdmin = IsAdministrator();
-
private Settings _settings;
public List Query(Query query)
@@ -337,111 +309,8 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
private static Process StartProcess(ProcessStartInfo info)
{
- switch (info.FileName)
- {
- case "cmd.exe":
- // Check if cmd.exe exists in the system PATH or the specified directories
- var cmdPath = possibleCmdPaths.FirstOrDefault(File.Exists);
- if (string.IsNullOrEmpty(cmdPath))
- {
- Context.API.LogError(ClassName, $"Cannot find cmd.exe");
- // Fall back to using the Process.Start method directly
- // Show user account control dialog if Flow is running as administrator
- if (IsAdmin)
- {
- var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd"), cmdPath, cmdPath);
- if (uacDialog != MessageBoxResult.Yes)
- {
- return null;
- }
- }
-
- return Process.Start(info);
- }
-
- // If Flow is running as administrator and the command is run as administrator, we need to use UAC dialog
- if (IsAdmin && info.Verb == "runas")
- {
- var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd"), cmdPath, cmdPath);
- if (uacDialog != MessageBoxResult.Yes)
- {
- return null;
- }
- }
-
- Context.API.StartProcess(cmdPath, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
- return null;
-
- case "powershell.exe":
- var powershellPath = possiblePowershellPaths.FirstOrDefault(File.Exists);
- if (string.IsNullOrEmpty(powershellPath))
- {
- Context.API.LogError(ClassName, $"Cannot find powershell.exe");
- // Fall back to using the Process.Start method directly
- // Show user account control dialog if Flow is running as administrator
- if (IsAdmin)
- {
- var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_powershell"), powershellPath, powershellPath);
- if (uacDialog != MessageBoxResult.Yes)
- {
- return null;
- }
- }
-
- return Process.Start(info);
- }
-
- // If Flow is running as administrator and the command is run as administrator, we need to use UAC dialog
- if (IsAdmin && info.Verb == "runas")
- {
- var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_powershell"), powershellPath, powershellPath);
- if (uacDialog != MessageBoxResult.Yes)
- {
- return null;
- }
- }
-
- Context.API.StartProcess(powershellPath, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
- return null;
-
- // Due to arguments pass issues, powershell 7 fails to work with deelevate model
- // So we use shell to execuete them which means if Flow is running as administrator,
- // all commands must be running as administrator
- case "pwsh.exe":
- // Fall back to using the Process.Start method directly
- // Show user account control dialog if Flow is running as administrator
- if (IsAdmin)
- {
- var pwshPath = possiblePwshPaths.FirstOrDefault(File.Exists);
- var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_pwsh"), pwshPath, pwshPath ?? "pwsh.exe");
- if (uacDialog != MessageBoxResult.Yes)
- {
- return null;
- }
- }
-
- return Process.Start(info);
-
- // Due to arguments pass issues, windows terminal fails to work with deelevate model
- // So we use shell to execuete them which means if Flow is running as administrator,
- // all commands must be running as administrator
- case "wt.exe":
- // Fall back to using the Process.Start method directly
- // Show user account control dialog if Flow is running as administrator
- if (IsAdmin)
- {
- var wtPath = possibleWindowsTerminalPaths.FirstOrDefault(File.Exists);
- var uacDialog = Context.API.ShowUACDialog(Context.API.GetTranslation("flowlauncher_plugin_cmd_wt"), wtPath, wtPath ?? "wt.exe");
- if (uacDialog != MessageBoxResult.Yes)
- {
- return null;
- }
- }
-
- return Process.Start(info);
- }
-
- return Process.Start(info);
+ Context.API.StartProcess(info.FileName, info.WorkingDirectory, info.ArgumentList, info.UseShellExecute, info.Verb);
+ return null;
}
private static void Execute(Func startProcess, ProcessStartInfo info)
@@ -498,21 +367,6 @@ public void Init(PluginInitContext context)
Context = context;
_settings = context.API.LoadSettingJsonStorage();
context.API.RegisterGlobalKeyboardCallback(API_GlobalKeyboardEvent);
-
- // Search for all folders with Microsoft.WindowsTerminal_ prefix
- /*var windowsAppsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsApps");
- var windowsTerminalFolders = Directory.EnumerateDirectories(windowsAppsPath, "Microsoft.WindowsTerminal_*",
- SearchOption.TopDirectoryOnly);
-
- // Find wt.exe among them
- foreach (var windowsTerminalFolder in windowsTerminalFolders)
- {
- var windowsTerminalPath = Path.Combine(windowsTerminalFolder, "wt.exe");
- if (File.Exists(windowsTerminalPath))
- {
- possibleWindowsTerminalPaths.Insert(0, windowsTerminalPath);
- }
- }*/
}
bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
@@ -612,12 +466,5 @@ public void Dispose()
{
Context.API.RemoveGlobalKeyboardCallback(API_GlobalKeyboardEvent);
}
-
- private static bool IsAdministrator()
- {
- using var identity = WindowsIdentity.GetCurrent();
- var principal = new WindowsPrincipal(identity);
- return principal.IsInRole(WindowsBuiltInRole.Administrator);
- }
}
}
From 50a8e888f0b9f1a6d51ec6bddb8b4394b558d90a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:13:39 +0800
Subject: [PATCH 066/124] Use double quotes to fix possible issue
---
Flow.Launcher/PublicAPIInstance.cs | 31 ++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 4275e36a195..591af79b3b9 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -590,7 +590,7 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
var result = Win32Helper.RunAsDesktopUser(
Constant.CommandExecutablePath,
Environment.CurrentDirectory,
- $"-StartProcess -FileName {filePath} -WorkingDirectory {workingDirectory} -Arguments {arguments} -UseShellExecute {useShellExecute} -Verb {verb}",
+ $"-StartProcess -FileName {AddDoubleQuotes(filePath)} -WorkingDirectory {AddDoubleQuotes(workingDirectory)} -Arguments {AddDoubleQuotes(arguments)} -UseShellExecute {useShellExecute} -Verb {AddDoubleQuotes(verb)}",
out var errorInfo);
if (!string.IsNullOrEmpty(errorInfo))
{
@@ -619,7 +619,34 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
}
public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = true, string verb = "") =>
- StartProcess(filePath, workingDirectory, argumentList == null ? string.Empty : string.Join(" ", argumentList), useShellExecute, verb);
+ StartProcess(filePath, workingDirectory, JoinArgumentList(argumentList), useShellExecute, verb);
+
+ private static string AddDoubleQuotes(string arg)
+ {
+ if (string.IsNullOrEmpty(arg))
+ return "\"\"";
+
+ // If already wrapped in double quotes, return as is
+ if (arg.Length >= 2 && arg[0] == '"' && arg[^1] == '"')
+ return arg;
+
+ return $"\"{arg}\"";
+ }
+
+ private static string JoinArgumentList(Collection args)
+ {
+ if (args == null || args.Count == 0)
+ return string.Empty;
+
+ return string.Join(" ", args.Select(arg =>
+ {
+ if (string.IsNullOrEmpty(arg))
+ return "\"\"";
+
+ // Add double quotes
+ return AddDoubleQuotes(arg);
+ }));
+ }
#endregion
From d56f0a0d1a050b4c84a0bb058ac2d62283b25849 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:13:52 +0800
Subject: [PATCH 067/124] Improve process information handler
---
Flow.Launcher.Command/Program.cs | 35 ++++++++++++++++++----
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 2 +-
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/Flow.Launcher.Command/Program.cs b/Flow.Launcher.Command/Program.cs
index 0dabbc5e66a..53529007d07 100644
--- a/Flow.Launcher.Command/Program.cs
+++ b/Flow.Launcher.Command/Program.cs
@@ -71,18 +71,43 @@ private static int Main(string[] args)
try
{
- using var process = new Process
+ ProcessStartInfo info;
+ if (argumentList.Count == 0)
{
- StartInfo = new ProcessStartInfo
+ info = new ProcessStartInfo
{
FileName = fileName,
WorkingDirectory = workingDirectory,
- Arguments = string.Join(" ", argumentList),
UseShellExecute = useShellExecute,
Verb = verb
+ };
+ }
+ else if (argumentList.Count == 1)
+ {
+ info = new ProcessStartInfo
+ {
+ FileName = fileName,
+ WorkingDirectory = workingDirectory,
+ Arguments = argumentList[0],
+ UseShellExecute = useShellExecute,
+ Verb = verb
+ };
+ }
+ else
+ {
+ info = new ProcessStartInfo
+ {
+ FileName = fileName,
+ WorkingDirectory = workingDirectory,
+ UseShellExecute = useShellExecute,
+ Verb = verb
+ };
+ foreach (var arg in argumentList)
+ {
+ info.ArgumentList.Add(arg);
}
- };
- process.Start();
+ }
+ Process.Start(info)?.Dispose();
Console.WriteLine("Success.");
return 0;
}
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 77e092b6afc..715b74bbe06 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -389,7 +389,7 @@ bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
return true;
}
- private void OnWinRPressed()
+ private static void OnWinRPressed()
{
Context.API.ShowMainWindow();
// show the main window and set focus to the query box
From dae6f5d95c5d9422d630b604f534fdc2fefd24b4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:19:43 +0800
Subject: [PATCH 068/124] Use WinExe to avoid console ui
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index 9f6a389af3c..63598a80b78 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -1,7 +1,7 @@
- Exe
+ WinExe
net7.0
enable
enable
From 6109504ddc7627a7a906d84424eaa955008653ae Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:25:51 +0800
Subject: [PATCH 069/124] Add solution assembly information
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index 63598a80b78..a8317070624 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -1,4 +1,4 @@
-
+
WinExe
@@ -40,4 +40,8 @@
+
+
+
+
From 8287b3373b6d8944ce97b7436dfd1c5ccf0803a4 Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:27:24 +0800
Subject: [PATCH 070/124] Fix typo
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 45424cccb17..064a15f486d 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -586,7 +586,7 @@ public interface IPublicAPI
/// Start a process with the given file path and arguments
///
///
- /// It can help to start a deelevated process and show user account control dialog when Flow is running as administrator.
+ /// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
///
/// Absolute file path. It can be an executable file or a script file
/// Working directory. If not specified, the current directory will be used
From be2c59e8ef76a5784897d20f326f0b2ae0540753 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:28:51 +0800
Subject: [PATCH 071/124] Call Win32Helper.IsAdministrator() directly
---
Flow.Launcher/Helper/AutoStartup.cs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 2601645dbba..a33c551350a 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -17,8 +17,6 @@ public class AutoStartup
private const string LogonTaskName = $"{Constant.FlowLauncher} Startup";
private const string LogonTaskDesc = $"{Constant.FlowLauncher} Auto Startup";
- private static readonly bool _isAdministrator = Win32Helper.IsAdministrator();
-
public static void CheckIsEnabled(bool useLogonTaskForStartup, bool alwaysRunAsAdministrator)
{
// We need to check both because if both of them are enabled,
@@ -67,7 +65,7 @@ private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
var pathCorrect = action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase);
var runLevelCorrect = CheckRunLevel(task.Definition.Principal.RunLevel, alwaysRunAsAdministrator);
- if (_isAdministrator)
+ if (Win32Helper.IsAdministrator())
{
// If path or run level is not correct, we need to unschedule and reschedule the task
if (!pathCorrect || !runLevelCorrect)
@@ -213,7 +211,7 @@ private static bool ScheduleLogonTask(bool alwaysRunAsAdministrator)
td.Actions.Add(Constant.ExecutablePath);
// Only if the app is running as administrator, we can set the run level to highest
- if (_isAdministrator && alwaysRunAsAdministrator)
+ if (Win32Helper.IsAdministrator() && alwaysRunAsAdministrator)
{
td.Principal.RunLevel = TaskRunLevel.Highest;
}
From 5ddf705a2f700934875752f8e4175369f252a87f Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:29:58 +0800
Subject: [PATCH 072/124] Fix typo
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 064a15f486d..260a4611264 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -600,7 +600,7 @@ public interface IPublicAPI
/// Start a process with the given file path and arguments
///
///
- /// It can help to start a deelevated process and show user account control dialog when Flow is running as administrator.
+ /// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
///
/// Absolute file path. It can be an executable file or a script file
/// Working directory. If not specified, the current directory will be used
From 6843fe0ac49129d6b5af3745e4e9ba701d35471e Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:34:39 +0800
Subject: [PATCH 073/124] Fix parameter issue
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
Flow.Launcher/PublicAPIInstance.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 591af79b3b9..4ba8f5a7432 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -605,7 +605,7 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
FileName = filePath,
WorkingDirectory = workingDirectory,
Arguments = arguments,
- UseShellExecute = true,
+ UseShellExecute = useShellExecute,
Verb = verb,
};
Process.Start(info)?.Dispose();
From 680419faa3a45a1e6fcf3d1a0f1d605a4d444adc Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 14:57:25 +0800
Subject: [PATCH 074/124] Code quality
---
.../SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 477db011768..c18a5b62c71 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -25,8 +25,6 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
private readonly Portable _portable;
private readonly Internationalization _translater;
- private static readonly bool _isAdministrator = Win32Helper.IsAdministrator();
-
public SettingsPaneGeneralViewModel(Settings settings, Updater updater, Portable portable, Internationalization translater)
{
Settings = settings;
@@ -150,7 +148,7 @@ private async Task CheckAdminChangeAndAskForRestartAsync()
{
// When we change from non-admin to admin, we need to restart the app as administrator to apply the changes
// Under non-administrator, we cannot delete or set the logon task which is run as administrator
- if (AlwaysRunAsAdministrator && !_isAdministrator)
+ if (AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
{
if (App.API.ShowMsgBox(
App.API.GetTranslation("runAsAdministratorChangeAndRestart"),
From dd0899f69af05ff1d70c52e627750c0b07cf87e7 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 17:39:21 +0800
Subject: [PATCH 075/124] Check always running as administrator
---
Flow.Launcher/App.xaml.cs | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 631b98cf1ae..23dbb1b4065 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -71,6 +71,13 @@ public App()
return;
}
+ // Check if the application is running as administrator
+ if (_settings.AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
+ {
+ RestartApp(true);
+ return;
+ }
+
// Configure the dependency injection container
try
{
From 1fabe8d8490bf225ef91941bee26c5fdf2ab3b43 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 17:43:41 +0800
Subject: [PATCH 076/124] Improve string resource
---
Flow.Launcher/Languages/en.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 97f294b14cb..b4847efe973 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -135,7 +135,7 @@
Show Search Window at Topmost
Show search window above other windows
Always run as administrator
- Run Flow Launcher as administrator on system startup
+ Run Flow Launcher as administrator on startup
Administrator Mode Change
Do you want to restart as administrator to apply this change? Or you need to run as administrator during next start manually.
From def02b34a14a3a0c5ab239694054806d0c89fef4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 17:50:51 +0800
Subject: [PATCH 077/124] Improve xml documents
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 260a4611264..a6ab4b10232 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -588,11 +588,11 @@ public interface IPublicAPI
///
/// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
///
- /// Absolute file path. It can be an executable file or a script file
+ /// File path
/// Working directory. If not specified, the current directory will be used
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
- /// Whether to use shell to execute the process.
- /// The verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
+ /// Whether to use shell to execute the process
+ /// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "");
@@ -602,11 +602,11 @@ public interface IPublicAPI
///
/// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
///
- /// Absolute file path. It can be an executable file or a script file
+ /// File path
/// Working directory. If not specified, the current directory will be used
- /// Optional arguments to pass to the process. If not specified, no arguments will be passed
- /// Whether to use shell to execute the process.
- /// The verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
+ /// Optional argument list to pass to the process. If not specified, no arguments will be passed
+ /// Whether to use shell to execute the process
+ /// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = true, string verb = "");
}
From 9d480fc2b93911e317d62f10f57d9e76e5084465 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 17:53:57 +0800
Subject: [PATCH 078/124] Quote the executable path to survive spaces & Improve
code quality
---
Flow.Launcher/App.xaml.cs | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 23dbb1b4065..e9ccbca22b1 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -349,29 +349,26 @@ private static void RegisterTaskSchedulerUnhandledException()
///
public static void RestartApp(bool forceAdmin = false)
{
- if (Win32Helper.IsAdministrator() || forceAdmin)
- {
- RestartAppAsAdministrator();
- }
- else
- {
- // Restart requires Squirrel's Update.exe to be present in the parent folder,
- // it is only published from the project's release pipeline. When debugging without it,
- // the project may not restart or just terminates. This is expected.
- UpdateManager.RestartApp(Constant.ApplicationFileName);
- }
+ // Restart requires Squirrel's Update.exe to be present in the parent folder,
+ // it is only published from the project's release pipeline. When debugging without it,
+ // the project may not restart or just terminates. This is expected.
+ RestartAppAsAdministrator(Win32Helper.IsAdministrator() || forceAdmin);
}
- // Since Squirrel does not provide a way to restart the app as administrator,
- // we need to do it manually by starting the update.exe with the runas verb
- private static void RestartAppAsAdministrator()
+ ///
+ /// Since Squirrel does not provide a way to restart the app as administrator,
+ /// we need to do it manually by starting the update.exe with the runas verb
+ ///
+ /// Whether to run the application as administrator or not
+ /// Thrown when the Update.exe is not found in the expected location
+ private static void RestartAppAsAdministrator(bool runAsAdmin)
{
var startInfo = new ProcessStartInfo
{
FileName = getUpdateExe(),
- Arguments = $"--processStartAndWait {Constant.ExecutablePath}",
+ Arguments = $"--processStartAndWait \"{Constant.ExecutablePath}\"",
UseShellExecute = true,
- Verb = "runas",
+ Verb = runAsAdmin ? "runas" : ""
};
Process.Start(startInfo);
Thread.Sleep(500);
From f2d3ba712f8e961f7a9e639f1b8aefb69a6d1617 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 17:58:05 +0800
Subject: [PATCH 079/124] Combine restart functions to one function
---
Flow.Launcher/App.xaml.cs | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index e9ccbca22b1..ef8d52e2206 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -26,7 +26,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.VisualStudio.Threading;
-using Squirrel;
namespace Flow.Launcher
{
@@ -258,7 +257,7 @@ private void AutoStartup()
API.GetTranslation("runAsAdministratorChange"),
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
- RestartAppAsAdministrator();
+ RestartApp(true);
}
}
catch (Exception e)
@@ -347,28 +346,26 @@ private static void RegisterTaskSchedulerUnhandledException()
///
/// Restart the application without changing the user privileges.
///
+ ///
+ /// Since Squirrel does not provide a way to restart the app as administrator,
+ /// we need to do it manually by starting the update.exe with the runas verb
+ ///
+ ///
+ /// If true, the application will be restarted as administrator.
+ /// If false, it will be restarted with the same privileges as the current user.
+ ///
+ /// Thrown when the Update.exe is not found in the expected location
public static void RestartApp(bool forceAdmin = false)
{
// Restart requires Squirrel's Update.exe to be present in the parent folder,
// it is only published from the project's release pipeline. When debugging without it,
// the project may not restart or just terminates. This is expected.
- RestartAppAsAdministrator(Win32Helper.IsAdministrator() || forceAdmin);
- }
-
- ///
- /// Since Squirrel does not provide a way to restart the app as administrator,
- /// we need to do it manually by starting the update.exe with the runas verb
- ///
- /// Whether to run the application as administrator or not
- /// Thrown when the Update.exe is not found in the expected location
- private static void RestartAppAsAdministrator(bool runAsAdmin)
- {
var startInfo = new ProcessStartInfo
{
FileName = getUpdateExe(),
Arguments = $"--processStartAndWait \"{Constant.ExecutablePath}\"",
UseShellExecute = true,
- Verb = runAsAdmin ? "runas" : ""
+ Verb = Win32Helper.IsAdministrator() || forceAdmin ? "runas" : ""
};
Process.Start(startInfo);
Thread.Sleep(500);
From 3a921022f3fffcfb115af4ef61427cf0cd4b3f56 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 18:07:42 +0800
Subject: [PATCH 080/124] Add new api RestartAppAsAdmin
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 7 +++++-
Flow.Launcher/PublicAPIInstance.cs | 8 +++++--
.../SettingsPaneGeneralViewModel.cs | 23 +++++--------------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index a6ab4b10232..484e6d09a99 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -30,10 +30,15 @@ public interface IPublicAPI
void ChangeQuery(string query, bool requery = false);
///
- /// Restart Flow Launcher
+ /// Restart Flow Launcher without changing the user privileges.
///
void RestartApp();
+ ///
+ /// Restart Flow Launcher as administrator.
+ ///
+ void RestartAppAsAdmin();
+
///
/// Run a shell command
///
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 4ba8f5a7432..df9964cac1f 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -72,8 +72,12 @@ public void ChangeQuery(string query, bool requery = false)
_mainVM.ChangeQueryText(query, requery);
}
+ public void RestartApp() => RestartApp(false);
+
+ public void RestartAppAsAdmin() => RestartApp(true);
+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")]
- public async void RestartApp()
+ private async void RestartApp(bool runAsAdmin)
{
_mainVM.Hide();
@@ -88,7 +92,7 @@ public async void RestartApp()
// Restart requires Squirrel's Update.exe to be present in the parent folder,
// it is only published from the project's release pipeline. When debugging without it,
// the project may not restart or just terminates. This is expected.
- App.RestartApp();
+ App.RestartApp(runAsAdmin);
}
public void ShowMainWindow() => _mainVM.Show();
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index c18a5b62c71..acdc305f4c6 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
using CommunityToolkit.Mvvm.Input;
@@ -10,7 +9,6 @@
using Flow.Launcher.Core.Resource;
using Flow.Launcher.Helper;
using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Image;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
using Flow.Launcher.Plugin.SharedModels;
@@ -75,7 +73,7 @@ public bool StartFlowLauncherOnSystemStartup
// even if we encounter an error while setting the startup method
if (value && UseLogonTaskForStartup)
{
- _ = CheckAdminChangeAndAskForRestartAsync();
+ CheckAdminChangeAndAskForRestart();
}
}
}
@@ -112,7 +110,7 @@ public bool UseLogonTaskForStartup
// even if we encounter an error while setting the startup method
if (StartFlowLauncherOnSystemStartup && value)
{
- _ = CheckAdminChangeAndAskForRestartAsync();
+ CheckAdminChangeAndAskForRestart();
}
}
}
@@ -139,12 +137,12 @@ public bool AlwaysRunAsAdministrator
// If we have enabled logon task startup, we need to check if we need to restart the app
// even if we encounter an error while setting the startup method
- _ = CheckAdminChangeAndAskForRestartAsync();
+ CheckAdminChangeAndAskForRestart();
}
}
}
- private async Task CheckAdminChangeAndAskForRestartAsync()
+ private void CheckAdminChangeAndAskForRestart()
{
// When we change from non-admin to admin, we need to restart the app as administrator to apply the changes
// Under non-administrator, we cannot delete or set the logon task which is run as administrator
@@ -155,17 +153,8 @@ private async Task CheckAdminChangeAndAskForRestartAsync()
App.API.GetTranslation("runAsAdministratorChange"),
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
- App.API.HideMainWindow();
-
- // We must manually save because of Environment.Exit(0)
- // which will cause ungraceful exit
- App.API.SaveAppAllSettings();
-
- // Wait for all image caches to be saved before restarting
- await ImageLoader.WaitSaveAsync();
-
// Restart the app as administrator
- App.RestartApp(true);
+ App.API.RestartAppAsAdmin();
}
}
}
@@ -195,7 +184,7 @@ public List ScreenNumbers
}
// This is only required to set at startup. When portable mode enabled/disabled a restart is always required
- private static bool _portableMode = DataLocation.PortableDataLocationInUse();
+ private static readonly bool _portableMode = DataLocation.PortableDataLocationInUse();
public bool PortableMode
{
From d363cade423cc9f16136ee26aa8c2e5b9b263f8d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 18:28:54 +0800
Subject: [PATCH 081/124] Improve code quality
---
Flow.Launcher.Infrastructure/Http/Http.cs | 2 +-
Flow.Launcher.Infrastructure/NativeMethods.txt | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/Http/Http.cs b/Flow.Launcher.Infrastructure/Http/Http.cs
index 22eb065f534..1bba319bd94 100644
--- a/Flow.Launcher.Infrastructure/Http/Http.cs
+++ b/Flow.Launcher.Infrastructure/Http/Http.cs
@@ -228,7 +228,7 @@ public static async Task GetStringAsync(string url, CancellationToken to
Log.Debug(ClassName, $"Url <{url}>");
return await client.GetStringAsync(url, token);
}
- catch (System.Exception e)
+ catch (System.Exception)
{
return string.Empty;
}
diff --git a/Flow.Launcher.Infrastructure/NativeMethods.txt b/Flow.Launcher.Infrastructure/NativeMethods.txt
index 403e1550483..afd94feeb74 100644
--- a/Flow.Launcher.Infrastructure/NativeMethods.txt
+++ b/Flow.Launcher.Infrastructure/NativeMethods.txt
@@ -80,4 +80,3 @@ OpenProcess
GetProcessId
DuplicateTokenEx
CreateProcessWithTokenW
-STARTUPINFO
\ No newline at end of file
From 06021433594df839f7e9e3dc2ed668038d4c2a26 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 19:23:19 +0800
Subject: [PATCH 082/124] Change target framework
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index a8317070624..6f7b6fce4be 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -2,7 +2,7 @@
WinExe
- net7.0
+ net7.0-windows
enable
enable
Flow.Launcher.Command
From 7930d57c911b8e8c1f8f8aaa1a04f63ed5a31a58 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 23:07:16 +0800
Subject: [PATCH 083/124] Add publish file
---
.../Net7.0-SelfContained.pubxml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml
diff --git a/Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml b/Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml
new file mode 100644
index 00000000000..0e5cf4489b2
--- /dev/null
+++ b/Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml
@@ -0,0 +1,18 @@
+
+
+
+
+ FileSystem
+ Release
+ Any CPU
+ net7.0-windows10.0.19041.0
+ ..\Output\Release\
+ win-x64
+ true
+ False
+ False
+ False
+
+
From 8dd9b9c963c0549c11bc945bf7e11188590b9f72 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 23:19:03 +0800
Subject: [PATCH 084/124] Publish command project
---
Scripts/post_build.ps1 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index e54852d321b..18e896f519f 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -104,6 +104,12 @@ function Publish-Self-Contained ($p) {
# we call dotnet publish on the main project.
# The other projects should have been built in Release at this point.
dotnet publish -c Release $csproj /p:PublishProfile=$profile
+
+ $command_csproj = Join-Path "$p" "Flow.Launcher.Command/Flow.Launcher.Command.csproj" -Resolve
+ $command_profile = Join-Path "$p" "Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
+
+ # we call dotnet publish on the command project.
+ dotnet publish -c Release $command_profile /p:PublishProfile=$profile
}
function Publish-Portable ($outputLocation, $version) {
From 11c0eb3111d3d3b4fcd906942ef4b6512f225146 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 13 Jun 2025 23:45:28 +0800
Subject: [PATCH 085/124] Fix command project publish issue
---
Scripts/post_build.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 18e896f519f..6ff4aff56ae 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -109,7 +109,7 @@ function Publish-Self-Contained ($p) {
$command_profile = Join-Path "$p" "Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
# we call dotnet publish on the command project.
- dotnet publish -c Release $command_profile /p:PublishProfile=$profile
+ dotnet publish -c Release $command_csproj /p:PublishProfile=$command_profile
}
function Publish-Portable ($outputLocation, $version) {
From a34e4042a487cea21edf22e3769ab5ca01145082 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 13:57:59 +0800
Subject: [PATCH 086/124] Change target framework
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index 6f7b6fce4be..c28b1897ad1 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -2,7 +2,7 @@
WinExe
- net7.0-windows
+ net7.0-windows10.0.19041.0
enable
enable
Flow.Launcher.Command
From ad6d598c4a4eb0746bfa854f73395d808b8fe780 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 14:26:59 +0800
Subject: [PATCH 087/124] Change publish sequence
---
Scripts/post_build.ps1 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 6ff4aff56ae..a1610372dce 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -98,18 +98,18 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
function Publish-Self-Contained ($p) {
+ $command_csproj = Join-Path "$p" "Flow.Launcher.Command/Flow.Launcher.Command.csproj" -Resolve
+ $command_profile = Join-Path "$p" "Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
+
+ # we call dotnet publish on the command project.
+ dotnet publish -c Release $command_csproj /p:PublishProfile=$command_profile
+
$csproj = Join-Path "$p" "Flow.Launcher/Flow.Launcher.csproj" -Resolve
$profile = Join-Path "$p" "Flow.Launcher/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
# we call dotnet publish on the main project.
# The other projects should have been built in Release at this point.
dotnet publish -c Release $csproj /p:PublishProfile=$profile
-
- $command_csproj = Join-Path "$p" "Flow.Launcher.Command/Flow.Launcher.Command.csproj" -Resolve
- $command_profile = Join-Path "$p" "Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
-
- # we call dotnet publish on the command project.
- dotnet publish -c Release $command_csproj /p:PublishProfile=$command_profile
}
function Publish-Portable ($outputLocation, $version) {
From 764b524ea4f495e80be3a22e6f2add7e886d02f4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 15:08:48 +0800
Subject: [PATCH 088/124] Use exe console type & Add flag support for helper
method
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 2 +-
Flow.Launcher.Infrastructure/Win32Helper.cs | 11 +++++++----
Flow.Launcher/PublicAPIInstance.cs | 2 ++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index c28b1897ad1..3478a6a5e3b 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -1,7 +1,7 @@
- WinExe
+ Exe
net7.0-windows10.0.19041.0
enable
enable
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 4fe995e8abf..d24db1718c7 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -808,7 +808,7 @@ public static bool IsAdministrator()
/// Inspired by
/// Document:
///
- public static unsafe bool RunAsDesktopUser(string app, string currentDir, string cmdLine, out string errorInfo)
+ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string cmdLine, bool loadProfile, bool createNoWindow, out string errorInfo)
{
STARTUPINFOW si = new();
PROCESS_INFORMATION pi = new();
@@ -916,11 +916,14 @@ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string
fixed (char* cmdLinePtr = $"- {cmdLine}")
fixed (char* currentDirPtr = currentDir)
{
- if (!PInvoke.CreateProcessWithToken(hPrimaryToken,
- 0,
+ if (!PInvoke.CreateProcessWithToken(
+ hPrimaryToken,
+ // If you need to access content in HKEY_CURRENT_USER, please set loadProfile to true
+ loadProfile ? CREATE_PROCESS_LOGON_FLAGS.LOGON_WITH_PROFILE : 0,
appPtr,
cmdLinePtr,
- 0,
+ // If you do not want to create a window for console app, please set createNoWindow to true
+ createNoWindow ? PROCESS_CREATION_FLAGS.CREATE_NO_WINDOW : 0,
null,
currentDirPtr,
&si,
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index df9964cac1f..9f32ffadc39 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -595,6 +595,8 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
Constant.CommandExecutablePath,
Environment.CurrentDirectory,
$"-StartProcess -FileName {AddDoubleQuotes(filePath)} -WorkingDirectory {AddDoubleQuotes(workingDirectory)} -Arguments {AddDoubleQuotes(arguments)} -UseShellExecute {useShellExecute} -Verb {AddDoubleQuotes(verb)}",
+ false,
+ true, // Do not show the command window
out var errorInfo);
if (!string.IsNullOrEmpty(errorInfo))
{
From 2f3b97302b90afc5e1d02278bb8f09de429bd654 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 15:08:59 +0800
Subject: [PATCH 089/124] Do not publish command project
---
Scripts/post_build.ps1 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index a1610372dce..e54852d321b 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -98,12 +98,6 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
function Publish-Self-Contained ($p) {
- $command_csproj = Join-Path "$p" "Flow.Launcher.Command/Flow.Launcher.Command.csproj" -Resolve
- $command_profile = Join-Path "$p" "Flow.Launcher.Command/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
-
- # we call dotnet publish on the command project.
- dotnet publish -c Release $command_csproj /p:PublishProfile=$command_profile
-
$csproj = Join-Path "$p" "Flow.Launcher/Flow.Launcher.csproj" -Resolve
$profile = Join-Path "$p" "Flow.Launcher/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve
From 935101c6e3dbc26cc7ad94209362ccd147d03882 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 15:51:30 +0800
Subject: [PATCH 090/124] Change command project output path
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 4 ++--
Flow.Launcher.Infrastructure/Constant.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index 3478a6a5e3b..b6aef65c866 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -17,7 +17,7 @@
true
portable
false
- ..\Output\Debug\
+ ..\Output\Debug\Command\
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
AnyCPU
pdbonly
true
- ..\Output\Release\
+ ..\Output\Release\Command\
TRACE;RELEASE
prompt
4
diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index dd916845a95..fae742d9908 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -16,7 +16,7 @@ public static class Constant
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, FlowLauncher + ".exe");
- public static readonly string CommandExecutablePath = Path.Combine(ProgramDirectory, "Flow.Launcher.Command.exe");
+ public static readonly string CommandExecutablePath = Path.Combine(ProgramDirectory, "Command", "Flow.Launcher.Command.exe");
public static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
From 8c8180815b72232b4e2dcbf69a38458d66c82179 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 16:03:41 +0800
Subject: [PATCH 091/124] Change default value
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 4 ++--
Flow.Launcher/PublicAPIInstance.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 484e6d09a99..2f07b686874 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -599,7 +599,7 @@ public interface IPublicAPI
/// Whether to use shell to execute the process
/// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
- public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "");
+ public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "");
///
/// Start a process with the given file path and arguments
@@ -613,6 +613,6 @@ public interface IPublicAPI
/// Whether to use shell to execute the process
/// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
- public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = true, string verb = "");
+ public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "");
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 9f32ffadc39..d2ac75c66af 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -582,7 +582,7 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
- public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = true, string verb = "")
+ public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "")
{
try
{
@@ -624,7 +624,7 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
}
}
- public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = true, string verb = "") =>
+ public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "") =>
StartProcess(filePath, workingDirectory, JoinArgumentList(argumentList), useShellExecute, verb);
private static string AddDoubleQuotes(string arg)
From e1242eefdab4b45bbb0dcc00406e727415290e16 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 14 Jun 2025 17:07:45 +0800
Subject: [PATCH 092/124] Check Process.Start usage
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 1 +
Flow.Launcher/App.xaml.cs | 2 +-
Flow.Launcher/PublicAPIInstance.cs | 9 +--------
.../Helper/ResultHelper.cs | 1 +
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index d24db1718c7..52ddb6dc924 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -674,6 +674,7 @@ public static void OpenImeSettings()
{
try
{
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start(new ProcessStartInfo("ms-settings:regionlanguage") { UseShellExecute = true });
}
catch (System.Exception)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index ef8d52e2206..4c05ea5f18f 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -367,7 +367,7 @@ public static void RestartApp(bool forceAdmin = false)
UseShellExecute = true,
Verb = Win32Helper.IsAdministrator() || forceAdmin ? "runas" : ""
};
- Process.Start(startInfo);
+ Process.Start(startInfo); // No need to de-elevate since we are restarting
Thread.Sleep(500);
Environment.Exit(0);
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index d2ac75c66af..bdf719c72ae 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -404,7 +404,6 @@ public void OpenDirectory(string directoryPath, string fileNameOrFilePath = null
}
}
-
private void OpenUri(Uri uri, bool? inPrivate = null)
{
if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
@@ -438,13 +437,7 @@ private void OpenUri(Uri uri, bool? inPrivate = null)
}
else
{
- Process.Start(new ProcessStartInfo()
- {
- FileName = uri.AbsoluteUri,
- UseShellExecute = true
- })?.Dispose();
-
- return;
+ StartProcess(uri.AbsoluteUri, arguments: null, useShellExecute: true);
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
index 9e85a8580c0..e1bdd2462ae 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
@@ -198,6 +198,7 @@ private static bool DoOpenSettingsAction(WindowsSetting entry)
try
{
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start(processStartInfo);
return true;
}
From e5316a0ac46db0e33f1fcf7aec60f62c08dac7e4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 01:16:46 +0800
Subject: [PATCH 093/124] Check Process.Start usage
---
Flow.Launcher/App.xaml.cs | 3 ++-
.../Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 13 ++++---------
.../Search/Everything/EverythingSearchManager.cs | 2 +-
.../ViewModels/SettingsViewModel.cs | 1 +
Plugins/Flow.Launcher.Plugin.Sys/Main.cs | 5 +++++
.../Helper/ResultHelper.cs | 1 +
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 4c05ea5f18f..95c6b15c098 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -367,7 +367,8 @@ public static void RestartApp(bool forceAdmin = false)
UseShellExecute = true,
Verb = Win32Helper.IsAdministrator() || forceAdmin ? "runas" : ""
};
- Process.Start(startInfo); // No need to de-elevate since we are restarting
+ // No need to de-elevate since we are restarting Flow Launcher which cannot bring security risks
+ Process.Start(startInfo);
Thread.Sleep(500);
Environment.Exit(0);
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index c331c498568..0fa5fd56206 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -360,11 +360,7 @@ private Result CreateOpenWithEditorResult(SearchResult record, string editorPath
{
try
{
- Process.Start(new ProcessStartInfo()
- {
- FileName = editorPath,
- ArgumentList = { record.FullPath }
- });
+ Main.Context.API.StartProcess(editorPath, arguments: record.FullPath);
return true;
}
catch (Exception e)
@@ -394,10 +390,7 @@ private Result CreateOpenWithShellResult(SearchResult record)
{
try
{
- Process.Start(new ProcessStartInfo()
- {
- FileName = shellPath, WorkingDirectory = record.FullPath
- });
+ Main.Context.API.StartProcess(shellPath, workingDirectory: record.FullPath);
return true;
}
catch (Exception e)
@@ -462,6 +455,7 @@ private Result CreateOpenWindowsIndexingOptions()
Arguments = "srchadmin.dll"
};
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start(psi);
return true;
}
@@ -486,6 +480,7 @@ private Result CreateOpenWithMenu(SearchResult record)
SubTitle = Context.API.GetTranslation("plugin_explorer_openwith_subtitle"),
Action = _ =>
{
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start("rundll32.exe", $"{Path.Combine(Environment.SystemDirectory, "shell32.dll")},OpenAs_RunDLL {record.FullPath}");
return true;
},
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs
index ce71c94ba34..4e92b7f10d1 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs
@@ -57,7 +57,7 @@ private async ValueTask ClickToInstallEverythingAsync(ActionContext _)
}
Settings.EverythingInstalledPath = installedPath;
- Process.Start(installedPath, "-startup");
+ Main.Context.API.StartProcess(installedPath, arguments: "-startup");
return true;
}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index 5aa6a13be49..abff4d9cd2a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -488,6 +488,7 @@ internal static void OpenWindowsIndexingOptions()
Arguments = Constants.WindowsIndexingOptions
};
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start(psi);
}
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 39bf4965494..a0f3467a53d 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -210,6 +210,7 @@ private List Commands()
if (EnableShutdownPrivilege())
PInvoke.ExitWindowsEx(EXIT_WINDOWS_FLAGS.EWX_SHUTDOWN | EXIT_WINDOWS_FLAGS.EWX_POWEROFF, REASON);
else
+ // No need to de-elevate since we already have message box asking for confirmation
Process.Start("shutdown", "/s /t 0");
return true;
@@ -231,6 +232,7 @@ private List Commands()
if (EnableShutdownPrivilege())
PInvoke.ExitWindowsEx(EXIT_WINDOWS_FLAGS.EWX_REBOOT, REASON);
else
+ // No need to de-elevate since we already have message box asking for confirmation
Process.Start("shutdown", "/r /t 0");
return true;
@@ -252,6 +254,7 @@ private List Commands()
if (EnableShutdownPrivilege())
PInvoke.ExitWindowsEx(EXIT_WINDOWS_FLAGS.EWX_REBOOT | EXIT_WINDOWS_FLAGS.EWX_BOOTOPTIONS, REASON);
else
+ // No need to de-elevate since we already have message box asking for confirmation
Process.Start("shutdown", "/r /o /t 0");
return true;
@@ -315,6 +318,7 @@ private List Commands()
Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe773"),
Action = c =>
{
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start("control.exe", "srchadmin.dll");
return true;
}
@@ -351,6 +355,7 @@ private List Commands()
CopyText = recycleBinFolder,
Action = c =>
{
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start("explorer", recycleBinFolder);
return true;
}
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
index e1bdd2462ae..7b8df532cd0 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
@@ -208,6 +208,7 @@ private static bool DoOpenSettingsAction(WindowsSetting entry)
{
processStartInfo.UseShellExecute = true;
processStartInfo.Verb = "runas";
+ // No need to de-elevate since we are opening windows settings which cannot bring security risks
Process.Start(processStartInfo);
return true;
}
From b6b45d495a2c7d73752ef6e8494f8a23666b1f1c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 01:24:07 +0800
Subject: [PATCH 094/124] Improve code quality
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 4 ++--
Flow.Launcher/PublicAPIInstance.cs | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 2 +-
.../Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs | 5 ++++-
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 6 +++++-
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 7 ++++++-
6 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 2f07b686874..d5efa3c1ee0 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -588,7 +588,7 @@ public interface IPublicAPI
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "");
///
- /// Start a process with the given file path and arguments
+ /// Start a process with support for handling administrative privileges
///
///
/// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
@@ -602,7 +602,7 @@ public interface IPublicAPI
public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "");
///
- /// Start a process with the given file path and arguments
+ /// Start a process with support for handling administrative privileges
///
///
/// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index bdf719c72ae..acfbe9d7648 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -437,7 +437,7 @@ private void OpenUri(Uri uri, bool? inPrivate = null)
}
else
{
- StartProcess(uri.AbsoluteUri, arguments: null, useShellExecute: true);
+ StartProcess(uri.AbsoluteUri, arguments: string.Empty, useShellExecute: true);
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 0fa5fd56206..c83f74b5b37 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -390,7 +390,7 @@ private Result CreateOpenWithShellResult(SearchResult record)
{
try
{
- Main.Context.API.StartProcess(shellPath, workingDirectory: record.FullPath);
+ Main.Context.API.StartProcess(shellPath, workingDirectory: record.FullPath, arguments: string.Empty);
return true;
}
catch (Exception e)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
index 646079946a8..abd08e181ab 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
@@ -516,7 +516,10 @@ private void Launch(bool elevated = false)
command = Environment.ExpandEnvironmentVariables(command.Trim());
_ = Task.Run(() => Main.Context.API.StartProcess(
- command, string.Empty, string.Empty, true, elevated ? "runas" : ""));
+ command,
+ arguments: string.Empty,
+ useShellExecute: true,
+ verb: elevated ? "runas" : ""));
}
internal static bool IfAppCanRunElevated(XmlNode appNode)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 3a443df5022..4034f8d7f9b 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -208,7 +208,11 @@ public Result Result(string query, IPublicAPI api)
private void Launch(bool runAsAdmin = false)
{
_ = Task.Run(() => Main.Context.API.StartProcess(
- FullPath, ParentDirectory, string.Empty, true, runAsAdmin ? "runas" : ""));
+ FullPath,
+ workingDirectory: ParentDirectory,
+ arguments: string.Empty,
+ useShellExecute: true,
+ verb: runAsAdmin ? "runas" : ""));
}
public List ContextMenus(IPublicAPI api)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 715b74bbe06..8b402f93087 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -309,7 +309,12 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
private static Process StartProcess(ProcessStartInfo info)
{
- Context.API.StartProcess(info.FileName, info.WorkingDirectory, info.ArgumentList, info.UseShellExecute, info.Verb);
+ Context.API.StartProcess(
+ info.FileName,
+ workingDirectory: info.WorkingDirectory,
+ argumentList: info.ArgumentList,
+ useShellExecute: info.UseShellExecute,
+ verb: info.Verb);
return null;
}
From 4df7264c8ae89ada21c95c3a5317de05692cc450 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 01:25:34 +0800
Subject: [PATCH 095/124] Improve documents
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 8 ++++----
Flow.Launcher/PublicAPIInstance.cs | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index d5efa3c1ee0..018eff18732 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -593,13 +593,13 @@ public interface IPublicAPI
///
/// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
///
- /// File path
+ /// File name
/// Working directory. If not specified, the current directory will be used
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
/// Whether to use shell to execute the process
/// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
- public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "");
+ public bool StartProcess(string fileName, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "");
///
/// Start a process with support for handling administrative privileges
@@ -607,12 +607,12 @@ public interface IPublicAPI
///
/// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
///
- /// File path
+ /// File name
/// Working directory. If not specified, the current directory will be used
/// Optional argument list to pass to the process. If not specified, no arguments will be passed
/// Whether to use shell to execute the process
/// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
/// Whether process is started successfully
- public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "");
+ public bool StartProcess(string fileName, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "");
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index acfbe9d7648..eaeb8fe3176 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -575,7 +575,7 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
- public bool StartProcess(string filePath, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "")
+ public bool StartProcess(string fileName, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "")
{
try
{
@@ -587,13 +587,13 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
var result = Win32Helper.RunAsDesktopUser(
Constant.CommandExecutablePath,
Environment.CurrentDirectory,
- $"-StartProcess -FileName {AddDoubleQuotes(filePath)} -WorkingDirectory {AddDoubleQuotes(workingDirectory)} -Arguments {AddDoubleQuotes(arguments)} -UseShellExecute {useShellExecute} -Verb {AddDoubleQuotes(verb)}",
+ $"-StartProcess -FileName {AddDoubleQuotes(fileName)} -WorkingDirectory {AddDoubleQuotes(workingDirectory)} -Arguments {AddDoubleQuotes(arguments)} -UseShellExecute {useShellExecute} -Verb {AddDoubleQuotes(verb)}",
false,
true, // Do not show the command window
out var errorInfo);
if (!string.IsNullOrEmpty(errorInfo))
{
- LogError(ClassName, $"Failed to start process {filePath} with error: {errorInfo}");
+ LogError(ClassName, $"Failed to start process {fileName} with arguments {arguments} under {workingDirectory}: {errorInfo}");
}
return result;
@@ -601,7 +601,7 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
var info = new ProcessStartInfo
{
- FileName = filePath,
+ FileName = fileName,
WorkingDirectory = workingDirectory,
Arguments = arguments,
UseShellExecute = useShellExecute,
@@ -612,13 +612,13 @@ public bool StartProcess(string filePath, string workingDirectory = "", string a
}
catch (Exception e)
{
- LogException(ClassName, $"Failed to start process {filePath} with arguments {arguments} under {workingDirectory}", e);
+ LogException(ClassName, $"Failed to start process {fileName} with arguments {arguments} under {workingDirectory}", e);
return false;
}
}
- public bool StartProcess(string filePath, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "") =>
- StartProcess(filePath, workingDirectory, JoinArgumentList(argumentList), useShellExecute, verb);
+ public bool StartProcess(string fileName, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "") =>
+ StartProcess(fileName, workingDirectory, JoinArgumentList(argumentList), useShellExecute, verb);
private static string AddDoubleQuotes(string arg)
{
From 44b25b487a2db3b986dc14bb81e859a950e84688 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 12:29:05 +0800
Subject: [PATCH 096/124] Prefer injected Context over static Main.Context
---
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index c83f74b5b37..9c09561977e 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -347,8 +347,6 @@ private Result CreateOpenContainingFolderResult(SearchResult record)
};
}
-
-
private Result CreateOpenWithEditorResult(SearchResult record, string editorPath)
{
var name = $"{Context.API.GetTranslation("plugin_explorer_openwitheditor")} {Path.GetFileNameWithoutExtension(editorPath)}";
@@ -360,7 +358,7 @@ private Result CreateOpenWithEditorResult(SearchResult record, string editorPath
{
try
{
- Main.Context.API.StartProcess(editorPath, arguments: record.FullPath);
+ Context.API.StartProcess(editorPath, arguments: record.FullPath);
return true;
}
catch (Exception e)
@@ -390,7 +388,7 @@ private Result CreateOpenWithShellResult(SearchResult record)
{
try
{
- Main.Context.API.StartProcess(shellPath, workingDirectory: record.FullPath, arguments: string.Empty);
+ Context.API.StartProcess(shellPath, workingDirectory: record.FullPath, arguments: string.Empty);
return true;
}
catch (Exception e)
From 478ba29966f2aa40c7306ed49d6bdd1595c11863 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 13:02:21 +0800
Subject: [PATCH 097/124] Change target framework to remove dll files
---
Flow.Launcher.Command/Flow.Launcher.Command.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Command/Flow.Launcher.Command.csproj b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
index b6aef65c866..4b68121f71b 100644
--- a/Flow.Launcher.Command/Flow.Launcher.Command.csproj
+++ b/Flow.Launcher.Command/Flow.Launcher.Command.csproj
@@ -2,7 +2,7 @@
Exe
- net7.0-windows10.0.19041.0
+ net7.0
enable
enable
Flow.Launcher.Command
From 911999810cf5812f6e717cee8837b59312340d63 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 15:54:17 +0800
Subject: [PATCH 098/124] Build command project after main project
---
Flow.Launcher/Flow.Launcher.csproj | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index d75d15a217e..2595ee5fac3 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -142,4 +142,13 @@
+
+
+
+
+
From 3493446d3ec8c3e2358e4557469791e3a7822280 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 16:22:56 +0800
Subject: [PATCH 099/124] Support createNoWindow for start process api
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 6 ++++--
Flow.Launcher/PublicAPIInstance.cs | 15 +++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index fb8a131eac2..788255cfb2d 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -613,8 +613,9 @@ public interface IPublicAPI
/// Optional arguments to pass to the process. If not specified, no arguments will be passed
/// Whether to use shell to execute the process
/// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
+ /// Whether to create console window
/// Whether process is started successfully
- public bool StartProcess(string fileName, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "");
+ public bool StartProcess(string fileName, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "", bool createNoWindow = false);
///
/// Start a process with support for handling administrative privileges
@@ -627,7 +628,8 @@ public interface IPublicAPI
/// Optional argument list to pass to the process. If not specified, no arguments will be passed
/// Whether to use shell to execute the process
/// Verb to use when starting the process, e.g. "runas" for elevated permissions. If not specified, no verb will be used.
+ /// Whether to create console window
/// Whether process is started successfully
- public bool StartProcess(string fileName, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "");
+ public bool StartProcess(string fileName, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "", bool createNoWindow = false);
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index dbd8faf1cb1..50a5f83118a 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -585,7 +585,7 @@ public long StopwatchLogInfo(string className, string message, Action action, [C
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "") =>
Stopwatch.InfoAsync(className, message, action, methodName);
- public bool StartProcess(string fileName, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "")
+ public bool StartProcess(string fileName, string workingDirectory = "", string arguments = "", bool useShellExecute = false, string verb = "", bool createNoWindow = false)
{
try
{
@@ -597,7 +597,13 @@ public bool StartProcess(string fileName, string workingDirectory = "", string a
var result = Win32Helper.RunAsDesktopUser(
Constant.CommandExecutablePath,
Environment.CurrentDirectory,
- $"-StartProcess -FileName {AddDoubleQuotes(fileName)} -WorkingDirectory {AddDoubleQuotes(workingDirectory)} -Arguments {AddDoubleQuotes(arguments)} -UseShellExecute {useShellExecute} -Verb {AddDoubleQuotes(verb)}",
+ $"-StartProcess " +
+ $"-FileName {AddDoubleQuotes(fileName)} " +
+ $"-WorkingDirectory {AddDoubleQuotes(workingDirectory)} " +
+ $"-Arguments {AddDoubleQuotes(arguments)} " +
+ $"-UseShellExecute {useShellExecute} " +
+ $"-Verb {AddDoubleQuotes(verb)} " +
+ $"-CreateNoWindow {createNoWindow}",
false,
true, // Do not show the command window
out var errorInfo);
@@ -616,6 +622,7 @@ public bool StartProcess(string fileName, string workingDirectory = "", string a
Arguments = arguments,
UseShellExecute = useShellExecute,
Verb = verb,
+ CreateNoWindow = createNoWindow
};
Process.Start(info)?.Dispose();
return true;
@@ -627,8 +634,8 @@ public bool StartProcess(string fileName, string workingDirectory = "", string a
}
}
- public bool StartProcess(string fileName, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "") =>
- StartProcess(fileName, workingDirectory, JoinArgumentList(argumentList), useShellExecute, verb);
+ public bool StartProcess(string fileName, string workingDirectory = "", Collection argumentList = null, bool useShellExecute = false, string verb = "", bool createNoWindow = false) =>
+ StartProcess(fileName, workingDirectory, JoinArgumentList(argumentList), useShellExecute, verb, createNoWindow);
private static string AddDoubleQuotes(string arg)
{
From 7ea76b8539eb27964e851d41b8574e96ff6031fb Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 16:25:16 +0800
Subject: [PATCH 100/124] Support administrator handling for ShellRun api
function
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 3 +++
Flow.Launcher/PublicAPIInstance.cs | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 788255cfb2d..b447d369f99 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -42,6 +42,9 @@ public interface IPublicAPI
///
/// Run a shell command
///
+ ///
+ /// It can help to start a de-elevated process and show user account control dialog when Flow is running as administrator.
+ ///
/// The command or program to run
/// the shell type to run, e.g. powershell.exe
/// Thrown when unable to find the file specified in the command
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 50a5f83118a..d1e500792de 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -158,8 +158,7 @@ public void ShellRun(string cmd, string filename = "cmd.exe")
{
var args = filename == "cmd.exe" ? $"/C {cmd}" : $"{cmd}";
- var startInfo = ShellCommand.SetProcessStartInfo(filename, arguments: args, createNoWindow: true);
- ShellCommand.Execute(startInfo);
+ StartProcess(filename, arguments: args, createNoWindow: true);
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")]
From 721bb987fd9e57ed217bf2f06ae03c8cba645a4f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 16:36:13 +0800
Subject: [PATCH 101/124] Handle create no window parameter in command exe
---
Flow.Launcher.Command/Program.cs | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher.Command/Program.cs b/Flow.Launcher.Command/Program.cs
index 53529007d07..e8a28cf5b99 100644
--- a/Flow.Launcher.Command/Program.cs
+++ b/Flow.Launcher.Command/Program.cs
@@ -10,7 +10,7 @@ private static int Main(string[] args)
if (args.Length == 0) return -1;
// Start process with arguments
- // Usage: Flow.Launcher.Command -StartProcess -FileName -WorkingDirectory -Arguments -UseShellExecute -Verb
+ // Usage: Flow.Launcher.Command -StartProcess -FileName -WorkingDirectory -Arguments -UseShellExecute -Verb -CreateNoWindow
if (args[0] == @"-StartProcess")
{
var fileName = string.Empty;
@@ -18,6 +18,7 @@ private static int Main(string[] args)
var argumentList = new List();
var useShellExecute = true;
var verb = string.Empty;
+ var createNoWindow = false;
var isArguments = false;
for (int i = 1; i < args.Length; i++)
@@ -54,6 +55,11 @@ private static int Main(string[] args)
isArguments = false;
break;
+ case "-CreateNoWindow":
+ if (i + 1 < args.Length && bool.TryParse(args[++i], out bool createNoWin))
+ createNoWindow = createNoWin;
+ break;
+
default:
if (isArguments)
argumentList.Add(args[i]);
@@ -79,7 +85,8 @@ private static int Main(string[] args)
FileName = fileName,
WorkingDirectory = workingDirectory,
UseShellExecute = useShellExecute,
- Verb = verb
+ Verb = verb,
+ CreateNoWindow = createNoWindow
};
}
else if (argumentList.Count == 1)
@@ -90,7 +97,8 @@ private static int Main(string[] args)
WorkingDirectory = workingDirectory,
Arguments = argumentList[0],
UseShellExecute = useShellExecute,
- Verb = verb
+ Verb = verb,
+ CreateNoWindow = createNoWindow
};
}
else
@@ -100,7 +108,8 @@ private static int Main(string[] args)
FileName = fileName,
WorkingDirectory = workingDirectory,
UseShellExecute = useShellExecute,
- Verb = verb
+ Verb = verb,
+ CreateNoWindow = createNoWindow
};
foreach (var arg in argumentList)
{
From 81667d03ee746682f700e7507a2859e618bfae4f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 15 Jun 2025 17:46:52 +0800
Subject: [PATCH 102/124] Fix ui issue
---
.../SettingPages/Views/SettingsPaneGeneral.xaml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index c339cc20923..6348ea8861b 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -44,11 +44,12 @@
OnContent="{DynamicResource enable}" />
-
+
+ Sub="{DynamicResource useLogonTaskForStartupTooltip}"
+ Type="Inside">
+ Sub="{DynamicResource alwaysRunAsAdministratorToolTip}"
+ Type="Inside">
-
+
Date: Mon, 16 Jun 2025 21:58:49 +0800
Subject: [PATCH 103/124] Check if the application is running as administrator
ealier
---
Flow.Launcher/App.xaml.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 5d5f3dd35c9..5ce2580dee0 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -59,13 +59,6 @@ public App()
// Initialize settings
_settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
- // Check if the application is running as administrator
- if (_settings.AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
- {
- RestartApp(true);
- return;
- }
-
// Configure the dependency injection container
try
{
@@ -143,6 +136,13 @@ public static void Main()
return;
}
+ // Check if the application is running as administrator
+ if (_settings.AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
+ {
+ RestartApp(true);
+ return;
+ }
+
// Initialize system language before changing culture info
Internationalization.InitSystemLanguageCode();
From 4416efece8c273afc5b8a86fa22220b5cc9c823c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 16 Jun 2025 22:53:35 +0800
Subject: [PATCH 104/124] Revert "Check if the application is running as
administrator ealier"
This reverts commit 4862a2d8163c821fe16a05a465576c9b80b78b4e.
---
Flow.Launcher/App.xaml.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 5ce2580dee0..5d5f3dd35c9 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -59,6 +59,13 @@ public App()
// Initialize settings
_settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
+ // Check if the application is running as administrator
+ if (_settings.AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
+ {
+ RestartApp(true);
+ return;
+ }
+
// Configure the dependency injection container
try
{
@@ -136,13 +143,6 @@ public static void Main()
return;
}
- // Check if the application is running as administrator
- if (_settings.AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
- {
- RestartApp(true);
- return;
- }
-
// Initialize system language before changing culture info
Internationalization.InitSystemLanguageCode();
From 71af5ef7e0f4eba62f2574da3fa16b398cb20a8c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 16 Jun 2025 22:54:23 +0800
Subject: [PATCH 105/124] Check if the application is running as administrator
ealier
---
Flow.Launcher/App.xaml.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 5d5f3dd35c9..7ae18a0ebb9 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -56,9 +56,6 @@ public partial class App : IDisposable, ISingleInstanceApp
public App()
{
- // Initialize settings
- _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
-
// Check if the application is running as administrator
if (_settings.AlwaysRunAsAdministrator && !Win32Helper.IsAdministrator())
{
@@ -66,6 +63,9 @@ public App()
return;
}
+ // Initialize settings
+ _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
+
// Configure the dependency injection container
try
{
From 8eaaf91db7aa04cc6896583a3b1c6eeca57260cc Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 23 Jun 2025 10:05:20 +0800
Subject: [PATCH 106/124] Adjust setting ui
---
.../Views/SettingsPaneGeneral.xaml | 42 +++++++++----------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 6348ea8861b..9a958f20a8c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -43,29 +43,16 @@
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
Date: Mon, 23 Jun 2025 10:28:20 +0800
Subject: [PATCH 107/124] Build command project before main project
---
Flow.Launcher/Flow.Launcher.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 2595ee5fac3..21f62725147 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -143,7 +143,7 @@
-
+
Date: Mon, 23 Jun 2025 10:39:17 +0800
Subject: [PATCH 108/124] Fix CI issue
---
Flow.Launcher/Flow.Launcher.csproj | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 21f62725147..78e853cb37b 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -143,6 +143,8 @@
+
+
From bedabb28d1cffa14a9971cf46019f123c361bfda Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 5 Jul 2025 18:08:32 +0800
Subject: [PATCH 109/124] Fix document & using issue
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 1 +
Flow.Launcher/PublicAPIInstance.cs | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 8e51484bb92..c5ac4b6df41 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -605,6 +605,7 @@ public interface IPublicAPI
/// The time taken to execute the method in milliseconds
public Task StopwatchLogInfoAsync(string className, string message, Func action, [CallerMemberName] string methodName = "");
+ ///
/// Representing whether the application is using a dark theme
///
///
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 19f04c36ea7..fa21666ae13 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -33,7 +33,6 @@
using Flow.Launcher.ViewModel;
using JetBrains.Annotations;
using ModernWpf;
-using Squirrel;
using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
namespace Flow.Launcher
From 42e11d88c8649db0547efd8ca460fab87b27a06a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 7 Jul 2025 21:02:20 +0800
Subject: [PATCH 110/124] Remove blank line
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 6177ba94798..c88f5bb5a58 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -986,6 +986,5 @@ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string
}
#endregion
-
}
}
From c8de5ef2d4df3cbf6304935034356f116ea2f2d3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 7 Jul 2025 21:05:19 +0800
Subject: [PATCH 111/124] Revert to InsideFit type
---
Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index d62d46dd9dd..bbdcc75741a 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -47,7 +47,7 @@
Title="{DynamicResource useLogonTaskForStartup}"
Icon=""
Sub="{DynamicResource useLogonTaskForStartupTooltip}"
- Type="Inside">
+ Type="InsideFit">
-
Date: Sun, 20 Jul 2025 21:00:32 +0800
Subject: [PATCH 112/124] Fix build issue
---
Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index b502c1d6c7a..bea761a26b5 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -338,7 +338,7 @@ private static Process StartProcess(ProcessStartInfo info)
return null;
}
- private static void Execute(Func startProcess, ProcessStartInfo info)
+ private void Execute(Func startProcess, ProcessStartInfo info)
{
try
{
From a029b2af5d6e8e993409b95fcf3324bc7903b436 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 21 Jul 2025 16:10:49 +0800
Subject: [PATCH 113/124] Fix card type
---
Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index f3e41d24685..e612004f2a0 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -47,7 +47,7 @@
Title="{DynamicResource useLogonTaskForStartup}"
Icon=""
Sub="{DynamicResource useLogonTaskForStartupTooltip}"
- Type="InsideFit">
+ Type="Inside">
+ IsEqualToBool=True}">
Date: Sat, 6 Sep 2025 13:34:30 +0800
Subject: [PATCH 114/124] Initialize STARTUPINFOW.cb
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index e644a0660bb..ea90fd47b21 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
@@ -923,7 +923,10 @@ public static bool IsAdministrator()
///
public static unsafe bool RunAsDesktopUser(string app, string currentDir, string cmdLine, bool loadProfile, bool createNoWindow, out string errorInfo)
{
- STARTUPINFOW si = new();
+ STARTUPINFOW si = new()
+ {
+ cb = (uint)Marshal.SizeOf()
+ };
PROCESS_INFORMATION pi = new();
errorInfo = string.Empty;
HANDLE hShellProcess = HANDLE.Null, hShellProcessToken = HANDLE.Null, hPrimaryToken = HANDLE.Null;
From e168984129c657a0153b8826e74e61dbef7950e9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 21 Sep 2025 13:06:14 +0800
Subject: [PATCH 115/124] Resolve conflicts
---
Flow.Launcher.Infrastructure/Win32Helper.cs | 28 ++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 2790225245f..6a0a4f9aa6f 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -908,6 +908,20 @@ public static void EnableWin32DarkMode(string colorScheme)
#endregion
+ #region File / Folder Dialog
+
+ public static string SelectFile()
+ {
+ var dlg = new OpenFileDialog();
+ var result = dlg.ShowDialog();
+ if (result == true)
+ return dlg.FileName;
+
+ return string.Empty;
+ }
+
+ #endregion
+
#region Administrator Mode
public static bool IsAdministrator()
@@ -1066,19 +1080,5 @@ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string
}
#endregion
-
- #region File / Folder Dialog
-
- public static string SelectFile()
- {
- var dlg = new OpenFileDialog();
- var result = dlg.ShowDialog();
- if (result == true)
- return dlg.FileName;
-
- return string.Empty;
- }
-
- #endregion
}
}
From 3d67ed4ae5cf504e8788f5acfbbac58bdd5b9e43 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 2 Oct 2025 20:15:57 +0800
Subject: [PATCH 116/124] Cleanup NativeMethods.txt
---
Flow.Launcher.Infrastructure/NativeMethods.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/Flow.Launcher.Infrastructure/NativeMethods.txt b/Flow.Launcher.Infrastructure/NativeMethods.txt
index cfa5f992856..979e91c5a56 100644
--- a/Flow.Launcher.Infrastructure/NativeMethods.txt
+++ b/Flow.Launcher.Infrastructure/NativeMethods.txt
@@ -92,7 +92,6 @@ PBT_APMRESUMEAUTOMATIC
PBT_APMRESUMESUSPEND
PowerRegisterSuspendResumeNotification
PowerUnregisterSuspendResumeNotification
-DeviceNotifyCallbackRoutine
OpenProcessToken
GetCurrentProcess
From 0da575dc16d53d1eb359f5602e58c0d9cb39c7d0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 2 Oct 2025 20:18:34 +0800
Subject: [PATCH 117/124] Fix build issue
---
Flow.Launcher.Core/Configuration/Portable.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Core/Configuration/Portable.cs b/Flow.Launcher.Core/Configuration/Portable.cs
index 0e8e770072a..cef8f046d70 100644
--- a/Flow.Launcher.Core/Configuration/Portable.cs
+++ b/Flow.Launcher.Core/Configuration/Portable.cs
@@ -43,7 +43,7 @@ public void DisablePortableMode()
PublicApi.Instance.ShowMsgBox(Localize.restartToDisablePortableMode());
- API.RestartApp();
+ PublicApi.Instance.RestartApp();
}
catch (Exception e)
{
@@ -66,7 +66,7 @@ public void EnablePortableMode()
PublicApi.Instance.ShowMsgBox(Localize.restartToEnablePortableMode());
- API.RestartApp();
+ PublicApi.Instance.RestartApp();
}
catch (Exception e)
{
From 20b473432140e870f6ee9e4f5450421db2a5b4e9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Oct 2025 19:13:38 +0800
Subject: [PATCH 118/124] Fix build issue
---
.../SettingPages/Views/SettingsPaneGeneral.xaml | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index e4445b0f20d..9d712735655 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -43,14 +43,28 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
Date: Sun, 5 Oct 2025 19:19:54 +0800
Subject: [PATCH 119/124] Add project build dependency
---
Flow.Launcher.sln | 1 +
Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index eb607689320..05b1f928cbc 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -16,6 +16,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher", "Flow.Launc
{5043CECE-E6A7-4867-9CBE-02D27D83747A} = {5043CECE-E6A7-4867-9CBE-02D27D83747A}
{403B57F2-1856-4FC7-8A24-36AB346B763E} = {403B57F2-1856-4FC7-8A24-36AB346B763E}
{588088F4-3262-4F9F-9663-A05DE12534C3} = {588088F4-3262-4F9F-9663-A05DE12534C3}
+ {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C} = {A9976C5C-B73A-4D29-B654-EF1C0C4C9C8C}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Test", "Flow.Launcher.Test\Flow.Launcher.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 9d712735655..45a296e1dce 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -43,9 +43,6 @@
-
-
-
Date: Sun, 5 Oct 2025 19:20:20 +0800
Subject: [PATCH 120/124] Remove unnecessary code comments
---
Flow.Launcher/Flow.Launcher.csproj | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 5180b971377..a60fc0d74ff 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -193,15 +193,4 @@
-
-
-
From 5ee2c3a916b77eabb6998ddfa0e919213e35b20b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Oct 2025 19:20:56 +0800
Subject: [PATCH 121/124] Revert changes
---
Flow.Launcher/Flow.Launcher.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index a60fc0d74ff..8c7670426bb 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -192,5 +192,4 @@
-
From 7bcde06b4c3e1205089c11b6e9a3773a41d7c3f9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Oct 2025 19:23:37 +0800
Subject: [PATCH 122/124] Fix format
---
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index b59b1cc0713..a4cdeb3bf04 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
@@ -622,7 +622,7 @@ public interface IPublicAPI
/// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
///
event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
-
+
///
/// Get the user data directory of Flow Launcher.
///
From 3b0242c4575d457e493ddd7410db07bbdeea4f3a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Oct 2025 20:53:30 +0800
Subject: [PATCH 123/124] Adjust UI
---
Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 45a296e1dce..f07794c1c3b 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -51,7 +51,10 @@
-
+
From 9797ad10a4054225293859df6dd0950add9f1948 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Oct 2025 20:54:32 +0800
Subject: [PATCH 124/124] Adjust UI
---
.../SettingPages/Views/SettingsPaneGeneral.xaml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index f07794c1c3b..d2586340247 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -53,28 +53,28 @@
+ Description="{DynamicResource hideOnStartupToolTip}"
+ Header="{DynamicResource hideOnStartup}">
-
+
+ Description="{DynamicResource alwaysRunAsAdministratorToolTip}"
+ Header="{DynamicResource alwaysRunAsAdministrator}">
-
+