mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-08 04:07:40 +02:00
Merge pull request #426 from lances101/bugfix-404
Fix Crash when open containing folder of *.lnk item Fix #404
This commit is contained in:
@@ -5,7 +5,6 @@ using System.IO;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using IWshRuntimeLibrary;
|
|
||||||
using Wox.Infrastructure;
|
using Wox.Infrastructure;
|
||||||
using Wox.Plugin.Program.ProgramSources;
|
using Wox.Plugin.Program.ProgramSources;
|
||||||
using Wox.Infrastructure.Logger;
|
using Wox.Infrastructure.Logger;
|
||||||
@@ -50,14 +49,6 @@ namespace Wox.Plugin.Program
|
|||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
static string ResolveShortcut(string filePath)
|
|
||||||
{
|
|
||||||
// IWshRuntimeLibrary is in the COM library "Windows Script Host Object Model"
|
|
||||||
WshShell shell = new WshShell();
|
|
||||||
IWshShortcut shortcut = (IWshShortcut)shell.CreateShortcut(filePath);
|
|
||||||
return shortcut.TargetPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool MatchProgram(Program program, FuzzyMatcher matcher)
|
private bool MatchProgram(Program program, FuzzyMatcher matcher)
|
||||||
{
|
{
|
||||||
var scores = new List<string> { program.Title, program.PinyinTitle, program.AbbrTitle, program.ExecuteName };
|
var scores = new List<string> { program.Title, program.PinyinTitle, program.AbbrTitle, program.ExecuteName };
|
||||||
@@ -224,7 +215,9 @@ namespace Wox.Plugin.Program
|
|||||||
if (Path.EndsWith(".lnk"))
|
if (Path.EndsWith(".lnk"))
|
||||||
{
|
{
|
||||||
//get location of shortcut
|
//get location of shortcut
|
||||||
Path = ResolveShortcut(Path);
|
var resolved = ShortcutHelper.ResolveShortcut(Path);
|
||||||
|
if(!string.IsNullOrEmpty(resolved))
|
||||||
|
Path = resolved;
|
||||||
}
|
}
|
||||||
//get parent folder
|
//get parent folder
|
||||||
Path = Directory.GetParent(Path).FullName;
|
Path = Directory.GetParent(Path).FullName;
|
||||||
|
|||||||
74
Plugins/Wox.Plugin.Program/ShortcutHelper.cs
Normal file
74
Plugins/Wox.Plugin.Program/ShortcutHelper.cs
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -71,6 +71,7 @@
|
|||||||
<Compile Include="ProgramSuffixes.xaml.cs">
|
<Compile Include="ProgramSuffixes.xaml.cs">
|
||||||
<DependentUpon>ProgramSuffixes.xaml</DependentUpon>
|
<DependentUpon>ProgramSuffixes.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="ShortcutHelper.cs" />
|
||||||
<Compile Include="StringEmptyConverter.cs" />
|
<Compile Include="StringEmptyConverter.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -126,17 +127,6 @@
|
|||||||
<Name>Wox.Plugin</Name>
|
<Name>Wox.Plugin</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<COMReference Include="IWshRuntimeLibrary">
|
|
||||||
<Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
|
|
||||||
<VersionMajor>1</VersionMajor>
|
|
||||||
<VersionMinor>0</VersionMinor>
|
|
||||||
<Lcid>0</Lcid>
|
|
||||||
<WrapperTool>tlbimp</WrapperTool>
|
|
||||||
<Isolated>False</Isolated>
|
|
||||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
|
||||||
</COMReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
Reference in New Issue
Block a user