admin/mirror-processhacker
1
0
Fork 0
mirror of https://github.com/mirror/processhacker synced 2026-06-08 16:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Elevation button in Options now spawns a child options window instead of restarting Process Hacker elevated

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/processhacker/code@1066 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
wj32
2009-04-15 10:42:19 +00:00
parent 84fe347b3f
commit 15180b9956
12 changed files with 372 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/ProcessHacker/Program/Program.cs
+57 -21
View File
@@ -27,6 +27,7 @@ using System.Security.Principal;
using System.Threading;
using System.Windows.Forms;
using ProcessHacker.Components;
using ProcessHacker.UI;
namespace ProcessHacker
{
@@ -90,7 +91,6 @@ namespace ProcessHacker
public static bool Aggressive = false;
public static bool StartHidden = false;
public static bool StartVisible = false;
public static bool ShowOptions = false;
public static string SelectTab = "Processes";
public static Win32.TOKEN_ELEVATION_TYPE ElevationType;
public static KProcessHacker KPH;
@@ -129,7 +129,9 @@ namespace ProcessHacker
// In case the settings file is corrupt PH won't crash here - it will be dealt with later.
try
{
if (Properties.Settings.Default.AllowOnlyOneInstance && !pArgs.ContainsKey("-e"))
if (Properties.Settings.Default.AllowOnlyOneInstance &&
!(pArgs.ContainsKey("-e") || pArgs.ContainsKey("-o"))
)
CheckForPreviousInstance();
}
catch
@@ -252,13 +254,6 @@ namespace ProcessHacker
{ }
{
if (pArgs.ContainsKey("-m"))
StartHidden = true;
if (pArgs.ContainsKey("-v"))
StartVisible = true;
if (pArgs.ContainsKey("-o"))
ShowOptions = true;
if (pArgs.ContainsKey("-a"))
{
Aggressive = true;
@@ -271,18 +266,6 @@ namespace ProcessHacker
{ }
}
if (pArgs.ContainsKey(""))
if (pArgs[""].Replace("\"", "").Trim().ToLower().EndsWith("taskmgr.exe"))
StartVisible = true;
if (pArgs.ContainsKey("-t"))
{
if (pArgs["-t"] == "0")
SelectTab = "Processes";
else if (pArgs["-t"] == "1")
SelectTab = "Services";
}
if (pArgs.ContainsKey("-e"))
{
try
@@ -296,6 +279,51 @@ namespace ProcessHacker
return;
}
if (pArgs.ContainsKey("-o"))
{
OptionsWindow options = new OptionsWindow(true)
{
StartPosition = FormStartPosition.CenterScreen
};
IWin32Window window;
if (pArgs.ContainsKey("-hwnd"))
window = new WindowFromHandle(new IntPtr(int.Parse(pArgs["-hwnd"])));
else
window = new WindowFromHandle(IntPtr.Zero);
if (pArgs.ContainsKey("-rect"))
{
Rectangle rect = Misc.RectangleFromString(pArgs["-rect"]);
options.Location = new Point(rect.X + 20, rect.Y + 20);
options.StartPosition = FormStartPosition.Manual;
}
options.SelectedTab = options.TabPages["tabAdvanced"];
options.Show(window);
Application.Run(options);
return;
}
if (pArgs.ContainsKey(""))
if (pArgs[""].Replace("\"", "").Trim().ToLower().EndsWith("taskmgr.exe"))
StartVisible = true;
if (pArgs.ContainsKey("-m"))
StartHidden = true;
if (pArgs.ContainsKey("-v"))
StartVisible = true;
if (pArgs.ContainsKey("-t"))
{
if (pArgs["-t"] == "0")
SelectTab = "Processes";
else if (pArgs["-t"] == "1")
SelectTab = "Services";
}
}
#if DEBUG
@@ -397,6 +425,11 @@ namespace ProcessHacker
}
public static Win32.WaitResult StartProcessHackerAdminWait(string args, IntPtr hWnd, uint timeout)
{
return StartProcessHackerAdminWait(args, null, hWnd, timeout);
}
public static Win32.WaitResult StartProcessHackerAdminWait(string args, MethodInvoker successAction, IntPtr hWnd, uint timeout)
{
Win32.SHELLEXECUTEINFO info = new Win32.SHELLEXECUTEINFO();
@@ -410,6 +443,9 @@ namespace ProcessHacker
if (Win32.ShellExecuteEx(ref info))
{
if (successAction != null)
successAction();
var result = Win32.WaitForSingleObject(info.hProcess, timeout);
Win32.CloseHandle(info.hProcess);