Skip to content

Fix: Fixed an issue where arguments weren’t passed when running shortcuts as admin #15628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 24, 2024
Merged

Fix: Fixed an issue where arguments weren’t passed when running shortcuts as admin #15628

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e319779
Fix: Fixed an issue where args weren't passed when shortcut was run a…
yaira2 Jun 19, 2024
5e5a47f
Update Win32Helper.Process.cs
yaira2 Jun 20, 2024
9b6aa9e
Merge branch 'main' into ya/RunArgsAdmin
yaira2 Jun 20, 2024
f7dcbe0
Update Win32Helper.Process.cs
yaira2 Jun 23, 2024
39f80e7
Merge branch 'main' into ya/RunArgsAdmin
yaira2 Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions src/Files.App/Helpers/Win32/Win32Helper.Process.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,40 @@ public static async Task<bool> InvokeWin32ComponentAsync(string applicationPath,

public static async Task<bool> InvokeWin32ComponentsAsync(IEnumerable<string> applicationPaths, IShellPage associatedInstance, string arguments = null, bool runAsAdmin = false, string workingDirectory = null)
{
Debug.WriteLine("Launching EXE in FullTrustProcess");

if (string.IsNullOrEmpty(workingDirectory))
{
workingDirectory = associatedInstance.ShellViewModel.WorkingDirectory;
}

var application = applicationPaths.FirstOrDefault();
if (string.IsNullOrEmpty(workingDirectory))
{
workingDirectory = associatedInstance?.ShellViewModel?.WorkingDirectory;
}

if (runAsAdmin)
{
return await LaunchHelper.LaunchAppAsync(application, "RunAs", workingDirectory);
// TODO In the long run, we should consider modifying HandleApplicationLaunch to handle this correctly.
try
{
ProcessStartInfo startInfo = new ProcessStartInfo
{
FileName = application,
Arguments = arguments,
Verb = "runas",
WorkingDirectory = workingDirectory,
UseShellExecute = true
};

Process process = new Process
{
StartInfo = startInfo
};

process.Start();

return true;
}
catch (Exception)
{
return false;
}
}
else
{
Expand Down