diff --git a/CleanFlashCommon/UpdateChecker.cs b/CleanFlashCommon/UpdateChecker.cs index d75e33e..a5ecab3 100644 --- a/CleanFlashCommon/UpdateChecker.cs +++ b/CleanFlashCommon/UpdateChecker.cs @@ -32,11 +32,11 @@ namespace CleanFlashCommon { } public class UpdateChecker { - private static readonly string FLASH_VERSION = "34.0.0.267"; - private static readonly string VERSION = "34.0.0.267"; + private static readonly string FLASH_VERSION = "34.0.0.282"; + private static readonly string VERSION = "34.0.0.282"; 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/104.0.0.0 Safari/537.36"; + private static readonly string USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36"; public static string GetAPILink() { return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest"; diff --git a/CleanFlashInstaller/CleanFlashInstaller.csproj b/CleanFlashInstaller/CleanFlashInstaller.csproj index 7945ebd..62fc0ed 100644 --- a/CleanFlashInstaller/CleanFlashInstaller.csproj +++ b/CleanFlashInstaller/CleanFlashInstaller.csproj @@ -7,11 +7,11 @@ net40 app.manifest - Clean Flash Player 34.0.0.267 Installer - Clean Flash Player 34.0.0.267 Installer - 34.0.0.267 - 34.0.0.267 - 34.0.0.267 + Clean Flash Player 34.0.0.282 Installer + Clean Flash Player 34.0.0.282 Installer + 34.0.0.282 + 34.0.0.282 + 34.0.0.282 FlashPatch Team FlashPatch Team icon.ico diff --git a/CleanFlashInstaller/InstallForm.cs b/CleanFlashInstaller/InstallForm.cs index cbfdc9d..f3ccf7f 100644 --- a/CleanFlashInstaller/InstallForm.cs +++ b/CleanFlashInstaller/InstallForm.cs @@ -9,7 +9,9 @@ namespace CleanFlashInstaller { public partial class InstallForm : Form, IProgressForm { private static string COMPLETE_INSTALL_TEXT = @"Clean Flash Player has been successfully installed! Don't forget, Flash Player is no longer compatible with new browsers. -For browser recommendations and Flash Player updates, check out Clean Flash Player's website!"; + +For browser recommendations and Flash Player updates, +check out Clean Flash Player's website!"; private static string COMPLETE_UNINSTALL_TEXT = @" All versions of Flash Player have been successfully uninstalled. @@ -124,8 +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(212, 8)); - completeLabel.Links.Add(new LinkLabel.Link(260, 28)); + completeLabel.Links.Add(new LinkLabel.Link(191, 28)); } else { completeLabel.Text = COMPLETE_UNINSTALL_TEXT; completeLabel.Links.Add(new LinkLabel.Link(110, 28)); @@ -280,11 +281,7 @@ If you ever change your mind, check out Clean Flash Player's website!"; } private void completeLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - if (e.Link.Start == 212) { - Process.Start("https://classic.waterfox.net"); - } else { - Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player"); - } + Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player"); } private void copyErrorButton_Click(object sender, EventArgs e) { diff --git a/CleanFlashInstaller/Installer.cs b/CleanFlashInstaller/Installer.cs index 03e75de..da3a3ac 100644 --- a/CleanFlashInstaller/Installer.cs +++ b/CleanFlashInstaller/Installer.cs @@ -12,15 +12,24 @@ using IWshRuntimeLibrary; namespace CleanFlashInstaller { public class Installer { public static void RegisterActiveX(string filename) { + string relativeFilename = Path.GetFileName(filename); + ProcessStartInfo info = new ProcessStartInfo { + FileName = "regsvr32.exe", + UseShellExecute = false, + CreateNoWindow = true + }; + Directory.SetCurrentDirectory(Path.GetDirectoryName(filename)); - ExitedProcess process = ProcessUtils.RunProcess( - new ProcessStartInfo { - FileName = "regsvr32.exe", - Arguments = "/s " + Path.GetFileName(filename), - UseShellExecute = false, - CreateNoWindow = true - } - ); + + info.Arguments = "/s /u " + relativeFilename; + ExitedProcess process = ProcessUtils.RunProcess(info); + + if (!process.IsSuccessful) { + throw new InstallException(string.Format("Failed to unregister ActiveX plugin: error code {0}\n\n{1}", process.ExitCode, process.Output)); + } + + info.Arguments = "/s " + relativeFilename; + process = ProcessUtils.RunProcess(info); if (!process.IsSuccessful) { throw new InstallException(string.Format("Failed to register ActiveX plugin: error code {0}\n\n{1}", process.ExitCode, process.Output)); diff --git a/CleanFlashUninstaller/CleanFlashUninstaller.csproj b/CleanFlashUninstaller/CleanFlashUninstaller.csproj index 013f768..c06fff9 100644 --- a/CleanFlashUninstaller/CleanFlashUninstaller.csproj +++ b/CleanFlashUninstaller/CleanFlashUninstaller.csproj @@ -10,11 +10,11 @@ app.manifest icon.ico - Clean Flash Player 34.0.0.267 Uninstaller - Clean Flash Player 34.0.0.267 Uninstaller - 34.0.0.267 - 34.0.0.267 - 34.0.0.267 + Clean Flash Player 34.0.0.282 Uninstaller + Clean Flash Player 34.0.0.282 Uninstaller + 34.0.0.282 + 34.0.0.282 + 34.0.0.282 FlashPatch Team FlashPatch Team diff --git a/CleanFlashUninstaller/UninstallForm.cs b/CleanFlashUninstaller/UninstallForm.cs index a24f18d..c3c5db5 100644 --- a/CleanFlashUninstaller/UninstallForm.cs +++ b/CleanFlashUninstaller/UninstallForm.cs @@ -114,11 +114,7 @@ namespace CleanFlashUninstaller { } private void completeLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - if (e.Link.Start == 212) { - Process.Start("https://classic.waterfox.net"); - } else { - Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player"); - } + Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player"); } private void copyErrorButton_Click(object sender, EventArgs e) { diff --git a/README.md b/README.md index b8ace38..d10c800 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,12 @@ To keep using Flash Player on **Mozilla Firefox**, install [**Waterfox Classic**
Alternatives -- Cent Browser 4.3.9.248 [(link)](https://static.centbrowser.com/win_stable/4.3.9.248/) -- Chromium 88.0.4285.0 -[Link](https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html): specify your platform and select/enter 814251 -- [Basilisk](https://www.basilisk-browser.org/) -- [Otter Browser](https://otter-browser.org/) -- Portable old browser versions [(guide)](https://www.raymond.cc/blog/how-to-enable-flash-support-in-firefox-portable/) -- roytam's XP-compatible browser builds [(link)](http://rtfreesoft.blogspot.com/) +- [Cent Browser 4.3.9.248](https://static.centbrowser.com/win_stable/4.3.9.248) +- [Chromium 88.0.4285.0](https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html): specify your platform and select/enter 814251 +- [Basilisk](https://www.basilisk-browser.org) +- [Otter Browser](https://otter-browser.org) +- [roytam's XP-compatible browser builds](http://rtfreesoft.blogspot.com) +- [Portable old browser versions (guide)](https://www.raymond.cc/blog/how-to-enable-flash-support-in-firefox-portable)