Merge pull request #1 from AlexanderPro/master

Light · web-flow · commit f32097a62d2b · 2020-10-04T14:45:15.000+08:00
upeated 1.7.4 from AlexanderPro
diff --git a/SmartSystemMenu/EnumWindows.cs b/SmartSystemMenu/EnumWindows.cs
@@ -29,9 +29,13 @@ public static IList<Window> EnumProcessWindows(int processId, IntPtr[] filterHan
             _filterHandles = filterHandles ?? new IntPtr[0];
             _windows = new List<Window>();
             _menuItems = menuItems;
-            foreach (ProcessThread thread in Process.GetProcessById(processId).Threads)
+            var process = SystemUtils.GetProcessByIdSafely(processId);
+            if (process != null)
             {
-                NativeMethods.EnumThreadWindows(thread.Id, EnumWindowCallback, 0);
+                foreach (ProcessThread thread in process.Threads)
+                {
+                    NativeMethods.EnumThreadWindows(thread.Id, EnumWindowCallback, 0);
+                }
             }
             return _windows;
         }
diff --git a/SmartSystemMenu/Forms/AboutForm.cs b/SmartSystemMenu/Forms/AboutForm.cs
@@ -23,7 +23,13 @@ private void CloseClick(object sender, EventArgs e)
 
         private void LinkClick(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start(URL);
+            try
+            {
+                SystemUtils.RunAsDesktopUser(SystemUtils.GetDefaultBrowserModuleName(), URL);
+            }
+            catch
+            {
+            }
         }
 
         private void KeyDownClick(object sender, KeyEventArgs e)
diff --git a/SmartSystemMenu/Forms/InfoForm.cs b/SmartSystemMenu/Forms/InfoForm.cs
@@ -24,9 +24,12 @@ private void InitializeControls()
             lblRectangleValue.Text = string.Format("({0},{1}) - ({2},{3})  -  {4}x{5}", _window.Size.Left, _window.Size.Top, _window.Size.Right, _window.Size.Bottom, _window.Size.Width, _window.Size.Height);
             lblProcessIdValue.Text = string.Format("{0:X8} ({0})", _window.ProcessId);
             lblThreadIdValue.Text = string.Format("{0:X8} ({0})", _window.ThreadId);
-            var process = Process.GetProcessById(_window.ProcessId);
-            txtModuleNameValue.Text = Path.GetFileName(process.MainModule.FileName);
-            txtModulePathValue.Text = process.MainModule.FileName;
+            var process = SystemUtils.GetProcessByIdSafely(_window.ProcessId);
+            if (process != null)
+            {
+                txtModuleNameValue.Text = Path.GetFileName(process.MainModule.FileName);
+                txtModulePathValue.Text = process.MainModule.FileName;
+            }
         }
 
         private void FormKeyDown(object sender, KeyEventArgs e)
diff --git a/SmartSystemMenu/Forms/MainForm.cs b/SmartSystemMenu/Forms/MainForm.cs
@@ -72,7 +72,7 @@ protected override void OnLoad(EventArgs e)
                     return;
                 }
             }
-            _systemTrayMenu = new SystemTrayMenu();
+            _systemTrayMenu = new SystemTrayMenu(_settings.ShowSystemTrayIcon);
             _systemTrayMenu.MenuItemAutoStart.Click += MenuItemAutoStartClick;
             _systemTrayMenu.MenuItemSettings.Click += MenuItemSettingsClick;
             _systemTrayMenu.MenuItemAbout.Click += MenuItemAboutClick;
@@ -437,8 +437,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
                             {
                                 try
                                 {
-                                    var process = Process.Start("explorer.exe", "/select, " + window.Process.GetMainModuleFileName());
-                                    Window.ForceForegroundWindow(process.MainWindowHandle);
+                                    SystemUtils.RunAsDesktopUser("explorer.exe", "/select, " + window.Process.GetMainModuleFileName());
                                 }
                                 catch
                                 {
@@ -660,11 +659,13 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
                     {
                         if (lowOrder - SystemMenu.SC_START_PROGRAM == i)
                         {
-                            var processStartInfo = new ProcessStartInfo();
-                            processStartInfo.FileName = _settings.MenuItems.StartProgramItems[i].FileName;
-                            processStartInfo.WorkingDirectory = Path.GetDirectoryName(_settings.MenuItems.StartProgramItems[i].FileName);
-                            processStartInfo.Arguments = _settings.MenuItems.StartProgramItems[i].Arguments;
-                            Process.Start(processStartInfo);
+                            try
+                            {
+                                SystemUtils.RunAsDesktopUser(_settings.MenuItems.StartProgramItems[i].FileName, _settings.MenuItems.StartProgramItems[i].Arguments);
+                            }
+                            catch
+                            {
+                            }
                             break;
                         }
                     }
diff --git a/SmartSystemMenu/NativeMethods.cs b/SmartSystemMenu/NativeMethods.cs
@@ -227,5 +227,29 @@ public static IntPtr GetClassLongPtr(IntPtr hWnd, int nIndex)
 
         [DllImport("user32.dll")]
         public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+        [DllImport("kernel32.dll")]
+        public static extern IntPtr GetCurrentProcess();
+
+        [DllImport("advapi32.dll")]
+        public static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok);
+
+        [DllImport("advapi32.dll")]
+        public static extern bool LookupPrivilegeValue(string host, string name, ref LUID pluid);
+
+        [DllImport("advapi32.dll")]
+        public static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall, ref TOKEN_PRIVILEGES newst, int len, IntPtr prev, IntPtr relen);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetShellWindow();
+
+        [DllImport("kernel32.dll")]
+        public static extern IntPtr OpenProcess(ProcessAccessFlags processAccess, bool bInheritHandle, int processId);
+
+        [DllImport("advapi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool DuplicateTokenEx(IntPtr hExistingToken, uint dwDesiredAccess, IntPtr lpTokenAttributes, SECURITY_IMPERSONATION_LEVEL impersonationLevel, TOKEN_TYPE tokenType, out IntPtr phNewToken);
+
+        [DllImport("advapi32", CharSet = CharSet.Unicode)]
+        public static extern bool CreateProcessWithTokenW(IntPtr hToken, int dwLogonFlags, string lpApplicationName, string lpCommandLine, int dwCreationFlags, IntPtr lpEnvironment, string lpCurrentDirectory, [In] ref STARTUPINFO lpStartupInfo, out PROCESS_INFORMATION lpProcessInformation);
     }
 }
diff --git a/SmartSystemMenu/NativeTypes.cs b/SmartSystemMenu/NativeTypes.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace SmartSystemMenu
@@ -175,4 +174,90 @@ public void Init()
             cbSize = (uint)Marshal.SizeOf(this);
         }
     }
+
+    struct TOKEN_PRIVILEGES
+    {
+        public uint PrivilegeCount;
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
+        public LUID_AND_ATTRIBUTES[] Privileges;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    struct LUID_AND_ATTRIBUTES
+    {
+        public LUID Luid;
+        public uint Attributes;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct LUID
+    {
+        public uint LowPart;
+        public int HighPart;
+    }
+
+    [Flags]
+    enum ProcessAccessFlags : uint
+    {
+        All = 0x001F0FFF,
+        Terminate = 0x00000001,
+        CreateThread = 0x00000002,
+        VirtualMemoryOperation = 0x00000008,
+        VirtualMemoryRead = 0x00000010,
+        VirtualMemoryWrite = 0x00000020,
+        DuplicateHandle = 0x00000040,
+        CreateProcess = 0x000000080,
+        SetQuota = 0x00000100,
+        SetInformation = 0x00000200,
+        QueryInformation = 0x00000400,
+        QueryLimitedInformation = 0x00001000,
+        Synchronize = 0x00100000
+    }
+
+    enum SECURITY_IMPERSONATION_LEVEL
+    {
+        SecurityAnonymous,
+        SecurityIdentification,
+        SecurityImpersonation,
+        SecurityDelegation
+    }
+
+    enum TOKEN_TYPE
+    {
+        TokenPrimary = 1,
+        TokenImpersonation
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct PROCESS_INFORMATION
+    {
+        public IntPtr hProcess;
+        public IntPtr hThread;
+        public int dwProcessId;
+        public int dwThreadId;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    struct STARTUPINFO
+    {
+        public int cb;
+        public string lpReserved;
+        public string lpDesktop;
+        public string lpTitle;
+        public int dwX;
+        public int dwY;
+        public int dwXSize;
+        public int dwYSize;
+        public int dwXCountChars;
+        public int dwYCountChars;
+        public int dwFillAttribute;
+        public int dwFlags;
+        public short wShowWindow;
+        public short cbReserved2;
+        public IntPtr lpReserved2;
+        public IntPtr hStdInput;
+        public IntPtr hStdOutput;
+        public IntPtr hStdError;
+    }
 }
diff --git a/SmartSystemMenu/Properties/AssemblyInfo.cs b/SmartSystemMenu/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.2")]
-[assembly: AssemblyFileVersion("1.7.2")]
+[assembly: AssemblyVersion("1.7.4")]
+[assembly: AssemblyFileVersion("1.7.4")]
diff --git a/SmartSystemMenu/Settings/SmartSystemMenuSettings.cs b/SmartSystemMenu/Settings/SmartSystemMenuSettings.cs
@@ -12,12 +12,15 @@ public class SmartSystemMenuSettings : ICloneable
     {
         public IList<string> ProcessExclusions { get; private set; }
 
-        public MenuItems MenuItems { get; set; }
+        public MenuItems MenuItems { get; private set; }
+
+        public bool ShowSystemTrayIcon { get; private set; }
 
         public SmartSystemMenuSettings()
         {
             ProcessExclusions = new List<string>();
             MenuItems = new MenuItems();
+            ShowSystemTrayIcon = true;
         }
 
         public object Clone()
@@ -130,6 +133,12 @@ public static SmartSystemMenuSettings Read(string fileName)
                 })
                 .ToList();
 
+            var systemTrayIconElement = document.XPathSelectElement("/smartSystemMenu/systemTrayIcon");
+            if (systemTrayIconElement != null && systemTrayIconElement.Attribute("show") != null && systemTrayIconElement.Attribute("show").Value != null && systemTrayIconElement.Attribute("show").Value.ToLower() == "false")
+            {
+                settings.ShowSystemTrayIcon = false;
+            }
+
             return settings;
         }
 
@@ -142,7 +151,10 @@ public static void Save(string fileName, SmartSystemMenuSettings settings)
                                      new XElement("startProgramItem", settings.MenuItems.StartProgramItems.Select(x => new XElement("item", 
                                          new XAttribute("title", x.Title),
                                          new XAttribute("fileName", x.FileName),
-                                         new XAttribute("arguments", x.Arguments)))))));
+                                         new XAttribute("arguments", x.Arguments))))),
+                                 new XElement("systemTrayIcon",
+                                     new XAttribute("show", settings.ShowSystemTrayIcon.ToString().ToLower())
+                                 )));
             Save(fileName, document);
         }
 
diff --git a/SmartSystemMenu/SmartSystemMenu.xml b/SmartSystemMenu/SmartSystemMenu.xml
@@ -14,7 +14,7 @@
       <item title="Calculator" fileName="calc.exe" arguments="" />
       <item title="Paint" fileName="mspaint.exe" arguments="" />
       <item title="Explorer" fileName="explorer.exe" arguments="" />
-      <item title="Registry" fileName="regedit.exe" arguments="" />
     </startProgramItem>
   </menuItems>
+  <systemTrayIcon show="true" />
 </smartSystemMenu>
diff --git a/SmartSystemMenu/SmartSystemMenu64.exe b/SmartSystemMenu/SmartSystemMenu64.exe
diff --git a/SmartSystemMenu/SystemTrayMenu.cs b/SmartSystemMenu/SystemTrayMenu.cs
@@ -15,7 +15,7 @@ class SystemTrayMenu
 
         public NotifyIcon Icon { get; private set; }
 
-        public SystemTrayMenu()
+        public SystemTrayMenu(bool showIcon)
         {
             MenuItemAutoStart = new ToolStripMenuItem();
             MenuItemAutoStart.Name = "miAutoStart";
@@ -56,7 +56,7 @@ public SystemTrayMenu()
             Icon.ContextMenuStrip = systemTrayMenu;
             Icon.Icon = Properties.Resources.SmartSystemMenu;
             Icon.Text = AssemblyUtils.AssemblyTitle;
-            Icon.Visible = true;
+            Icon.Visible = showIcon;
         }
     }
 }
diff --git a/SmartSystemMenu/Utils/SystemUtils.cs b/SmartSystemMenu/Utils/SystemUtils.cs
diff --git a/SmartSystemMenu/Window.cs b/SmartSystemMenu/Window.cs

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,13 @@ public static IList<Window> EnumProcessWindows(int processId, IntPtr[] filterHan`
`29`	`29`	`_filterHandles = filterHandles ?? new IntPtr[0];`
`30`	`30`	`_windows = new List<Window>();`
`31`	`31`	`_menuItems = menuItems;`
`32`		`- foreach (ProcessThread thread in Process.GetProcessById(processId).Threads)`
	`32`	`+ var process = SystemUtils.GetProcessByIdSafely(processId);`
	`33`	`+ if (process != null)`
`33`	`34`	`{`
`34`		`- NativeMethods.EnumThreadWindows(thread.Id, EnumWindowCallback, 0);`
	`35`	`+ foreach (ProcessThread thread in process.Threads)`
	`36`	`+ {`
	`37`	`+ NativeMethods.EnumThreadWindows(thread.Id, EnumWindowCallback, 0);`
	`38`	`+ }`
`35`	`39`	`}`
`36`	`40`	`return _windows;`
`37`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,13 @@ private void CloseClick(object sender, EventArgs e)`
`23`	`23`
`24`	`24`	`private void LinkClick(object sender, EventArgs e)`
`25`	`25`	`{`
`26`		`- System.Diagnostics.Process.Start(URL);`
	`26`	`+ try`
	`27`	`+ {`
	`28`	`+ SystemUtils.RunAsDesktopUser(SystemUtils.GetDefaultBrowserModuleName(), URL);`
	`29`	`+ }`
	`30`	`+ catch`
	`31`	`+ {`
	`32`	`+ }`
`27`	`33`	`}`
`28`	`34`
`29`	`35`	`private void KeyDownClick(object sender, KeyEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected override void OnLoad(EventArgs e)`
`72`	`72`	`return;`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`- _systemTrayMenu = new SystemTrayMenu();`
	`75`	`+ _systemTrayMenu = new SystemTrayMenu(_settings.ShowSystemTrayIcon);`
`76`	`76`	`_systemTrayMenu.MenuItemAutoStart.Click += MenuItemAutoStartClick;`
`77`	`77`	`_systemTrayMenu.MenuItemSettings.Click += MenuItemSettingsClick;`
`78`	`78`	`_systemTrayMenu.MenuItemAbout.Click += MenuItemAboutClick;`
`@@ -437,8 +437,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)`
`437`	`437`	`{`
`438`	`438`	`try`
`439`	`439`	`{`
`440`		`- var process = Process.Start("explorer.exe", "/select, " + window.Process.GetMainModuleFileName());`
`441`		`- Window.ForceForegroundWindow(process.MainWindowHandle);`
	`440`	`+ SystemUtils.RunAsDesktopUser("explorer.exe", "/select, " + window.Process.GetMainModuleFileName());`
`442`	`441`	`}`
`443`	`442`	`catch`
`444`	`443`	`{`
`@@ -660,11 +659,13 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)`
`660`	`659`	`{`
`661`	`660`	`if (lowOrder - SystemMenu.SC_START_PROGRAM == i)`
`662`	`661`	`{`
`663`		`- var processStartInfo = new ProcessStartInfo();`
`664`		`- processStartInfo.FileName = _settings.MenuItems.StartProgramItems[i].FileName;`
`665`		`- processStartInfo.WorkingDirectory = Path.GetDirectoryName(_settings.MenuItems.StartProgramItems[i].FileName);`
`666`		`- processStartInfo.Arguments = _settings.MenuItems.StartProgramItems[i].Arguments;`
`667`		`- Process.Start(processStartInfo);`
	`662`	`+ try`
	`663`	`+ {`
	`664`	`+ SystemUtils.RunAsDesktopUser(_settings.MenuItems.StartProgramItems[i].FileName, _settings.MenuItems.StartProgramItems[i].Arguments);`
	`665`	`+ }`
	`666`	`+ catch`
	`667`	`+ {`
	`668`	`+ }`
`668`	`669`	`break;`
`669`	`670`	`}`
`670`	`671`	`}`