Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove ShellRun

Browse Source 
1. Remove ShellRun using p/invoke
2. Remove ResolveShortcut when open contanning folder
3. fix #88
This commit is contained in:
bao-qian
2016-01-03 23:18:51 +00:00
parent 99a7453f28
commit 38b3c82ece
9 changed files with 40 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Plugins/Wox.Plugin.Program/Programs.cs
View File

@@ -42,7 +42,7 @@ namespace Wox.Plugin.Program
Action = (e) =>
{
context.API.HideApp();
context.API.ShellRun(c.ExecutePath);
Process.Start(c.ExecutePath);
return true;
}
}).ToList();
@@ -198,7 +198,11 @@ namespace Wox.Plugin.Program
Action = _ =>
{
context.API.HideApp();
context.API.ShellRun(p.ExecutePath, true);
Process.Start( new ProcessStartInfo
{
FileName = p.ExecutePath,
Verb = "runas"
});
return true;
},
IcoPath = "Images/cmd.png"
@@ -209,19 +213,10 @@ namespace Wox.Plugin.Program
Action = _ =>
{
context.API.HideApp();
String Path = p.ExecutePath;
//check if shortcut
if (Path.EndsWith(".lnk"))
{
//get location of shortcut
var resolved = ShortcutHelper.ResolveShortcut(Path);
if(!string.IsNullOrEmpty(resolved))
Path = resolved;
}
//get parent folder
Path = Directory.GetParent(Path).FullName;
var folderPath = Directory.GetParent(p.ExecutePath).FullName;
//open the folder
context.API.ShellRun("explorer.exe " + Path, false);
Process.Start(folderPath);
return true;
},
IcoPath = "Images/folder.png"

74
Plugins/Wox.Plugin.Program/ShortcutHelper.cs
View File

@@ -1,74 +0,0 @@
/*
Shortcut resolver. Avoids using IWshRuntimeLibrary
Proposed by Sam Saffron @ StackOverflow
*/
using System;
using System.Runtime.InteropServices;
using System.Text;
namespace Wox.Plugin.Program
{
public class ShortcutHelper
{
#region Signatures
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
struct WIN32_FIND_DATAW
{
public uint dwFileAttributes;
public long ftCreationTime;
public long ftLastAccessTime;
public long ftLastWriteTime;
public uint nFileSizeHigh;
public uint nFileSizeLow;
public uint dwReserved0;
public uint dwReserved1;
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
public string cFileName;
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
public string cAlternateFileName;
}
/// <summary>The IShellLink interface allows Shell links to be created, modified, and resolved</summary>
[ComImport(), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("000214F9-0000-0000-C000-000000000046")]
interface IShellLinkW
{
/// <summary>Retrieves the path and file name of a Shell link object</summary>
void GetPath([Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, out WIN32_FIND_DATAW pfd, uint fFlags);
}
[ComImport, Guid("0000010c-0000-0000-c000-000000000046"),
InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public interface IPersist { }
[ComImport, Guid("0000010b-0000-0000-C000-000000000046"),
InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public interface IPersistFile : IPersist
{
new void GetClassID(out Guid pClassID);
[PreserveSig]
void Load([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName, uint dwMode);
}
const uint STGM_READ = 0;
const int MAX_PATH = 260;
// CLSID_ShellLink from ShlGuid.h
[
ComImport(),
Guid("00021401-0000-0000-C000-000000000046")
]
public class ShellLink
{
}
#endregion
public static string ResolveShortcut(string filename)
{
ShellLink link = new ShellLink();
((IPersistFile)link).Load(filename, STGM_READ);
StringBuilder sb = new StringBuilder(MAX_PATH);
WIN32_FIND_DATAW data = new WIN32_FIND_DATAW();
((IShellLinkW)link).GetPath(sb, sb.Capacity, out data, 0);
return sb.ToString();
}
}
}

1
Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
View File

@@ -73,7 +73,6 @@
<Compile Include="ProgramSuffixes.xaml.cs">
<DependentUpon>ProgramSuffixes.xaml</DependentUpon>
</Compile>
<Compile Include="ShortcutHelper.cs" />
<Compile Include="StringEmptyConverter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>