-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix crash when starting from non ASCII path
This fixes a crash that occurs when the launcher is started from a folder whose absolute path does contain non ASCII characters. This was due to the use of the WshRuntimeLibrary (a wrapper around COM libraries) that does not handle Unicode (as far as my deductions go). When assigning the target path to the shortcut object, the runtime would error. This commit replaces the WshRuntimeLibrary with a COM wrapper around the IShellLink interface, using its Unicode oriented functions. The WshRuntimeLibrary is removed from dependencies and the .NET framework is updated to 4.8 as 4.0 has reached EOL. Tested on: Win10 64-bits.
- Loading branch information
Showing
3 changed files
with
52 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,60 @@ | ||
using IWshRuntimeLibrary; | ||
using System; | ||
using System.IO; | ||
using System.Runtime.CompilerServices; | ||
using System.Runtime.InteropServices; | ||
using System.Runtime.InteropServices.ComTypes; | ||
using System.Text; | ||
|
||
namespace UniversalTombLauncher.Helpers | ||
{ | ||
internal static class ShellHelper | ||
{ | ||
public static IWshShortcut CreateShortcutWithIcon(string exeFilePath, string iconLocation) | ||
public static IPersistFile CreateShortcutWithIcon(string exeFilePath, string iconLocation, string args) | ||
{ | ||
string fileName = Path.GetFileNameWithoutExtension(exeFilePath); | ||
IShellLink link = (IShellLink)new ShellLink(); | ||
link.SetPath(exeFilePath); | ||
link.SetWorkingDirectory(Path.GetDirectoryName(exeFilePath)); | ||
link.SetIconLocation(iconLocation, 0); | ||
link.SetArguments(args); | ||
return (IPersistFile)link; | ||
} | ||
|
||
var shell = new WshShell(); | ||
string shortcutPath = Path.Combine(Path.GetTempPath(), fileName + ".lnk"); | ||
public static string SaveShortcut(IPersistFile shortcut, string exeFilePath) | ||
{ | ||
string shortcutPath = Path.Combine(Path.GetTempPath(), Path.GetFileNameWithoutExtension(exeFilePath) + ".lnk"); | ||
shortcut.Save(shortcutPath, false); | ||
return shortcutPath; | ||
} | ||
} | ||
|
||
var shortcut = (IWshShortcut)shell.CreateShortcut(shortcutPath); | ||
shortcut.TargetPath = exeFilePath; | ||
shortcut.WorkingDirectory = Path.GetDirectoryName(exeFilePath); | ||
shortcut.IconLocation = iconLocation; | ||
[ComImport] | ||
[Guid("00021401-0000-0000-C000-000000000046")] | ||
internal class ShellLink | ||
{ | ||
} | ||
|
||
return shortcut; | ||
} | ||
[ComImport] | ||
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] | ||
[Guid("000214F9-0000-0000-C000-000000000046")] | ||
internal interface IShellLink | ||
{ | ||
void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, out IntPtr pfd, int fFlags); | ||
void GetIDList(out IntPtr ppidl); | ||
void SetIDList(IntPtr pidl); | ||
void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, int cchMaxName); | ||
void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName); | ||
void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath); | ||
void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir); | ||
void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath); | ||
void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs); | ||
void GetHotkey(out short pwHotkey); | ||
void SetHotkey(short wHotkey); | ||
void GetShowCmd(out int piShowCmd); | ||
void SetShowCmd(int iShowCmd); | ||
void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, int cchIconPath, out int piIcon); | ||
void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon); | ||
void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved); | ||
void Resolve(IntPtr hwnd, int fFlags); | ||
void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters