From 036e2182a705d1ce89e114206bca8787f521fe6b Mon Sep 17 00:00:00 2001 From: Sylmir Date: Sat, 28 Dec 2024 14:33:28 +0100 Subject: [PATCH] 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. --- .../Helpers/ShellHelper.cs | 59 +++++++++++++++---- Universal Tomb Launcher/Program.cs | 7 +-- .../Universal Tomb Launcher.csproj | 14 +---- 3 files changed, 52 insertions(+), 28 deletions(-) diff --git a/Universal Tomb Launcher/Helpers/ShellHelper.cs b/Universal Tomb Launcher/Helpers/ShellHelper.cs index ae67470..a144d8f 100644 --- a/Universal Tomb Launcher/Helpers/ShellHelper.cs +++ b/Universal Tomb Launcher/Helpers/ShellHelper.cs @@ -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); } } diff --git a/Universal Tomb Launcher/Program.cs b/Universal Tomb Launcher/Program.cs index 828ec08..c297841 100644 --- a/Universal Tomb Launcher/Program.cs +++ b/Universal Tomb Launcher/Program.cs @@ -125,7 +125,6 @@ private static string CreateGameShortcut(string exeFilePath, bool setup, bool de { string iconLocation = Assembly.GetExecutingAssembly().Location; // Target icon is the icon of this launcher - var shortcut = ShellHelper.CreateShortcutWithIcon(exeFilePath, iconLocation); var argumentsBuilder = new StringBuilder(); if (setup) @@ -134,10 +133,8 @@ private static string CreateGameShortcut(string exeFilePath, bool setup, bool de if (debug) argumentsBuilder.Append("-debug "); - shortcut.Arguments = argumentsBuilder.ToString(); - shortcut.Save(); - - return shortcut.FullName; + var shortcut = ShellHelper.CreateShortcutWithIcon(exeFilePath, iconLocation, argumentsBuilder.ToString()); + return ShellHelper.SaveShortcut(shortcut, exeFilePath); } } } diff --git a/Universal Tomb Launcher/Universal Tomb Launcher.csproj b/Universal Tomb Launcher/Universal Tomb Launcher.csproj index 6fbdc22..e0179a5 100644 --- a/Universal Tomb Launcher/Universal Tomb Launcher.csproj +++ b/Universal Tomb Launcher/Universal Tomb Launcher.csproj @@ -8,9 +8,10 @@ WinExe UniversalTombLauncher launch - v4.0 + v4.8 512 true + AnyCPU @@ -79,17 +80,6 @@ - - - {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} - 1 - 0 - 0 - tlbimp - False - True - - FormExtraSettings.cs