cleanflash: Update to 34.0.0.282

CleanFlashInstaller/CleanFlashInstaller.csproj

@@ -7,11 +7,11 @@
     <TargetFramework>net40</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.267 Installer</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.267 Installer</AssemblyTitle>
-    <FileVersion>34.0.0.267</FileVersion>
-    <AssemblyVersion>34.0.0.267</AssemblyVersion>
-    <Version>34.0.0.267</Version>
+    <Product>Clean Flash Player 34.0.0.282 Installer</Product>
+    <AssemblyTitle>Clean Flash Player 34.0.0.282 Installer</AssemblyTitle>
+    <FileVersion>34.0.0.282</FileVersion>
+    <AssemblyVersion>34.0.0.282</AssemblyVersion>
+    <Version>34.0.0.282</Version>
     <Authors>FlashPatch Team</Authors>
     <Company>FlashPatch Team</Company>
     <ApplicationIcon>icon.ico</ApplicationIcon>

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) {

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));