diff --git a/CleanFlashCommon/UpdateChecker.cs b/CleanFlashCommon/UpdateChecker.cs index 8dc29c2..a206a31 100644 --- a/CleanFlashCommon/UpdateChecker.cs +++ b/CleanFlashCommon/UpdateChecker.cs @@ -32,8 +32,8 @@ namespace CleanFlashCommon { } public class UpdateChecker { - private static readonly string FLASH_VERSION = "34.0.0.308"; - private static readonly string VERSION = "34.0.0.308"; + private static readonly string FLASH_VERSION = "34.0.0.315"; + private static readonly string VERSION = "34.0.0.315"; private static readonly string AUTHOR = "cleanflash"; private static readonly string REPO = "installer"; private static readonly string USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"; diff --git a/CleanFlashInstaller/CleanFlashInstaller.csproj b/CleanFlashInstaller/CleanFlashInstaller.csproj index 7d036f0..374a2d0 100644 --- a/CleanFlashInstaller/CleanFlashInstaller.csproj +++ b/CleanFlashInstaller/CleanFlashInstaller.csproj @@ -7,11 +7,11 @@ net40 app.manifest - Clean Flash Player 34.0.0.308 Installer - Clean Flash Player 34.0.0.308 Installer - 34.0.0.308 - 34.0.0.308 - 34.0.0.308 + Clean Flash Player 34.0.0.315 Installer + Clean Flash Player 34.0.0.315 Installer + 34.0.0.315 + 34.0.0.315 + 34.0.0.315 FlashPatch Team FlashPatch Team icon.ico @@ -19,17 +19,6 @@ - - - tlbimp - 0 - 1 - f935dc20-1cf0-11d0-adb9-00c04fd58a0b - 0 - false - true - - diff --git a/CleanFlashInstaller/InstallForm.cs b/CleanFlashInstaller/InstallForm.cs index f3ccf7f..2dae8b0 100644 --- a/CleanFlashInstaller/InstallForm.cs +++ b/CleanFlashInstaller/InstallForm.cs @@ -126,7 +126,7 @@ If you ever change your mind, check out Clean Flash Player's website!"; if (pepperBox.Checked || netscapeBox.Checked || activeXBox.Checked) { completeLabel.Text = COMPLETE_INSTALL_TEXT; - completeLabel.Links.Add(new LinkLabel.Link(191, 28)); + completeLabel.Links.Add(new LinkLabel.Link(187, 28)); } else { completeLabel.Text = COMPLETE_UNINSTALL_TEXT; completeLabel.Links.Add(new LinkLabel.Link(110, 28)); diff --git a/CleanFlashInstaller/Installer.cs b/CleanFlashInstaller/Installer.cs index da3a3ac..26de868 100644 --- a/CleanFlashInstaller/Installer.cs +++ b/CleanFlashInstaller/Installer.cs @@ -1,5 +1,6 @@ using CleanFlashCommon; using System; +using System.Text; using System.Collections.Generic; using System.IO; using System.Reflection; @@ -7,7 +8,7 @@ using System.Diagnostics; using SharpCompress.Archives.SevenZip; using SharpCompress.Common; using SharpCompress.Readers; -using IWshRuntimeLibrary; +using System.Runtime.InteropServices; namespace CleanFlashInstaller { public class Installer { @@ -84,16 +85,24 @@ namespace CleanFlashInstaller { } public static void CreateShortcut(string folder, string executable, string name, string description) { - WshShell wsh = new WshShell(); - IWshShortcut shortcut = wsh.CreateShortcut(Path.Combine(folder, name + ".lnk")) as IWshShortcut; - - shortcut.Arguments = ""; - shortcut.TargetPath = executable; - shortcut.WindowStyle = (int) WshWindowStyle.WshNormalFocus; - shortcut.Description = description; - shortcut.WorkingDirectory = Path.GetDirectoryName(executable); - shortcut.IconLocation = executable; - shortcut.Save(); + Type t = Type.GetTypeFromCLSID(new Guid("72C24DD5-D70A-438B-8A42-98424B88AFB8")); + dynamic shell = Activator.CreateInstance(t); + + try { + var lnk = shell.CreateShortcut(Path.Combine(folder, name + ".lnk")); + + try { + lnk.TargetPath = executable; + lnk.IconLocation = executable; + lnk.Description = description; + lnk.WorkingDirectory = folder; + lnk.Save(); + } finally { + Marshal.FinalReleaseComObject(lnk); + } + } finally { + Marshal.FinalReleaseComObject(shell); + } } private static void InstallFromArchive(SevenZipArchive archive, IProgressForm form, InstallFlags flags) { @@ -175,4 +184,4 @@ namespace CleanFlashInstaller { } } } -} \ No newline at end of file +} diff --git a/CleanFlashUninstaller/CleanFlashUninstaller.csproj b/CleanFlashUninstaller/CleanFlashUninstaller.csproj index 859336a..f37e676 100644 --- a/CleanFlashUninstaller/CleanFlashUninstaller.csproj +++ b/CleanFlashUninstaller/CleanFlashUninstaller.csproj @@ -10,11 +10,11 @@ app.manifest icon.ico - Clean Flash Player 34.0.0.308 Uninstaller - Clean Flash Player 34.0.0.308 Uninstaller - 34.0.0.308 - 34.0.0.308 - 34.0.0.308 + Clean Flash Player 34.0.0.315 Uninstaller + Clean Flash Player 34.0.0.315 Uninstaller + 34.0.0.315 + 34.0.0.315 + 34.0.0.315 FlashPatch Team FlashPatch Team