Merge branch 'installer' into 'master'

UI fixes

See merge request cleanflash/installer!3

CleanFlashCommon/CleanFlashCommon.csproj

@@ -21,7 +21,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-	  <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.2">
+	  <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>

CleanFlashCommon/FileUtil.cs

@@ -51,6 +51,10 @@ namespace CleanFlashCommon {
                 return;
             }
 
+            if (file.Extension.ToLower().Equals(".ocx")) {
+                Uninstaller.UnregisterActiveX(file.FullName);
+            }
+
             try {
                 file.IsReadOnly = false;
                 file.Delete();

CleanFlashCommon/Uninstaller.cs

@@ -27,6 +27,24 @@ namespace CleanFlashCommon {
             WinAPI.AllowModifications();
         }
 
+        public static void UnregisterActiveX(string filename) {
+            string relativeFilename = Path.GetFileName(filename);
+            ProcessStartInfo info = new ProcessStartInfo {
+                FileName = "regsvr32.exe",
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(filename));
+
+            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));
+            }
+        }
+
         public static void UninstallRegistry() {
             if (Environment.Is64BitOperatingSystem) {
                 RegistryManager.ApplyRegistry(Properties.Resources.uninstallRegistry, Properties.Resources.uninstallRegistry64);

CleanFlashCommon/UpdateChecker.cs

@@ -32,14 +32,15 @@ namespace CleanFlashCommon {
     }
 
     public class UpdateChecker {
-        private static readonly string FLASH_VERSION = "34.0.0.267";
+        private static readonly string FLASH_VERSION = "34.0.0.330";
-        private static readonly string VERSION = "34.0.0.267";
+        private static readonly string VERSION = "34.0.0.330";
         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/136.0.0.0 Safari/537.36";
 
         public static string GetAPILink() {
             return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest";
+            // obsolete, todo: switch to new api
         }
 
         public static string GetFlashVersion() {

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>
+    <Product>Clean Flash Player 34.0.0.330 Installer</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.267 Installer</AssemblyTitle>
+    <AssemblyTitle>Clean Flash Player 34.0.0.330 Installer</AssemblyTitle>
-    <FileVersion>34.0.0.267</FileVersion>
+    <FileVersion>34.0.0.330</FileVersion>
-    <AssemblyVersion>34.0.0.267</AssemblyVersion>
+    <AssemblyVersion>34.0.0.330</AssemblyVersion>
-    <Version>34.0.0.267</Version>
+    <Version>34.0.0.330</Version>
     <Authors>FlashPatch Team</Authors>
     <Company>FlashPatch Team</Company>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -19,17 +19,6 @@
   <ItemGroup>
     <None Remove="cleanflash.7z" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="IWshRuntimeLibrary">
-      <WrapperTool>tlbimp</WrapperTool>
-      <VersionMinor>0</VersionMinor>
-      <VersionMajor>1</VersionMajor>
-      <Guid>f935dc20-1cf0-11d0-adb9-00c04fd58a0b</Guid>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>true</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
   </ItemGroup>
@@ -48,11 +37,10 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="CleanFlashCommon" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.2">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

CleanFlashInstaller/InstallForm.Designer.cs

@@ -374,6 +374,7 @@ namespace CleanFlashInstaller {
             this.prevButton.Name = "prevButton";
             this.prevButton.Size = new System.Drawing.Size(138, 31);
             this.prevButton.TabIndex = 3;
+            this.prevButton.TabStop = false;
             this.prevButton.Text = "QUIT";
             this.prevButton.UseVisualStyleBackColor = false;
             this.prevButton.Click += new System.EventHandler(this.prevButton_Click);
@@ -620,6 +621,7 @@ namespace CleanFlashInstaller {
             this.Name = "InstallForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Clean Flash Player Dev Installer";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.InstallForm_FormClosing);
             this.Load += new System.EventHandler(this.InstallForm_Load);
             ((System.ComponentModel.ISupportInitialize)(this.flashLogo)).EndInit();
             this.disclaimerPanel.ResumeLayout(false);

CleanFlashInstaller/InstallForm.cs

@@ -8,11 +8,10 @@ using System.Windows.Forms;
 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. We recommend using:
+Don't forget, Flash Player is no longer compatible with new browsers.
-   •  Older Google Chrome ≤ 87
-   •  Older Mozilla Firefox ≤ 84 or Waterfox
 
-For 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.
 
@@ -127,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(187, 28));
-                completeLabel.Links.Add(new LinkLabel.Link(260, 28));
             } else {
                 completeLabel.Text = COMPLETE_UNINSTALL_TEXT;
                 completeLabel.Links.Add(new LinkLabel.Link(110, 28));
@@ -283,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://gitlab.com/cleanflash/installer#clean-flash-player");
-                Process.Start("https://classic.waterfox.net");
-            } else {
-                Process.Start("https://cleanflash.github.io");
-            }
         }
 
         private void copyErrorButton_Click(object sender, EventArgs e) {
@@ -299,5 +293,35 @@ If you ever change your mind, check out Clean Flash Player's website!";
             debugChosen = MessageBox.Show("Are you sure you want to install the debug version?\n\nThis version is only meant to be used by experienced developers!\nIf you are not sure, choose No.", "Clean Flash Installer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes;
             OpenBeforeInstall();
         }
+
+        private void InstallForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            bool v1 = true;
+            // if installing
+            // note: msgbox not pauses the process
+            if (installPanel.Visible)
+            {
+                if (v1)
+                {
+                    // hardlock, only force quit process
+                    // follows current design since Back button is disabled
+                    MessageBox.Show("Please, wait until process end", "Clean Flash Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    e.Cancel = true;
+                }
+                else
+                // soft alternative, expert mode, todo: better warning of consequences  
+                if (MessageBox.Show("Are you sure you want to interrupt the process ?", "Clean Flash Installer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    e.Cancel = true;
+                }
+                else
+                {
+                    // use cases ?
+                    // uninstall, currently not implemented
+                }
+
+                //todo: same for uninstaller: share same F
+            }
+        }
     }
 }

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,20 +8,29 @@ using System.Diagnostics;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using IWshRuntimeLibrary;
+using System.Runtime.InteropServices;
 
 namespace CleanFlashInstaller {
     public class Installer {
         public static void RegisterActiveX(string filename) {
-            Directory.SetCurrentDirectory(Path.GetDirectoryName(filename));
+            string relativeFilename = Path.GetFileName(filename);
-            ExitedProcess process = ProcessUtils.RunProcess(
+            ProcessStartInfo info = new ProcessStartInfo {
-                new ProcessStartInfo {
                 FileName = "regsvr32.exe",
-                    Arguments = "/s " + Path.GetFileName(filename),
                 UseShellExecute = false,
                 CreateNoWindow = true
+            };
+
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(filename));
+
+            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));
@@ -75,16 +85,24 @@ namespace CleanFlashInstaller {
         }
 
         public static void CreateShortcut(string folder, string executable, string name, string description) {
-            WshShell wsh = new WshShell();
+            Type t = Type.GetTypeFromCLSID(new Guid("72C24DD5-D70A-438B-8A42-98424B88AFB8"));
-            IWshShortcut shortcut = wsh.CreateShortcut(Path.Combine(folder, name + ".lnk")) as IWshShortcut;
+            dynamic shell = Activator.CreateInstance(t);
 
-            shortcut.Arguments = "";
+            try {
-            shortcut.TargetPath = executable;
+                var lnk = shell.CreateShortcut(Path.Combine(folder, name + ".lnk"));
-            shortcut.WindowStyle = (int) WshWindowStyle.WshNormalFocus;
+
-            shortcut.Description = description;
+                try {
-            shortcut.WorkingDirectory = Path.GetDirectoryName(executable);
+                    lnk.TargetPath = executable;
-            shortcut.IconLocation = executable;
+                    lnk.IconLocation = executable;
-            shortcut.Save();
+                    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) {

CleanFlashInstaller/Properties/Resources.resx

@@ -130,11 +130,11 @@
 
 [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Clean Flash Player]
 "DisplayName"="Clean Flash Player ${VERSION}"
-"HelpLink"="https://cleanflash.github.io"
+"HelpLink"="https://gitlab.com/cleanflash/installer#clean-flash-player"
 "NoModify"=dword:00000001
 "NoRepair"=dword:00000001
-"URLInfoAbout"="https://cleanflash.github.io"
+"URLInfoAbout"="https://gitlab.com/cleanflash/installer#clean-flash-player"
-"URLUpdateInfo"="https://cleanflash.github.io"
+"URLUpdateInfo"="https://gitlab.com/cleanflash/installer#clean-flash-player"
 "VersionMajor"=dword:00000022
 "VersionMinor"=dword:00000000
 "Publisher"="CleanFlash Team"

CleanFlashUninstaller/CleanFlashUninstaller.csproj

@@ -10,11 +10,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.267 Uninstaller</Product>
+    <Product>Clean Flash Player 34.0.0.330 Uninstaller</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.267 Uninstaller</AssemblyTitle>
+    <AssemblyTitle>Clean Flash Player 34.0.0.330 Uninstaller</AssemblyTitle>
-    <FileVersion>34.0.0.267</FileVersion>
+    <FileVersion>34.0.0.330</FileVersion>
-    <AssemblyVersion>34.0.0.267</AssemblyVersion>
+    <AssemblyVersion>34.0.0.330</AssemblyVersion>
-    <Version>34.0.0.267</Version>
+    <Version>34.0.0.330</Version>
     <Authors>FlashPatch Team</Authors>
 	<Company>FlashPatch Team</Company>
   </PropertyGroup>
@@ -35,7 +35,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.2">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

CleanFlashUninstaller/UninstallForm.Designer.cs

@@ -41,6 +41,7 @@ namespace CleanFlashUninstaller {
             this.completeLabel = new System.Windows.Forms.LinkLabel();
             this.failurePanel = new System.Windows.Forms.Panel();
             this.copyErrorButton = new CleanFlashCommon.GradientButton();
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.InstallForm_FormClosing);
             this.failureBox = new System.Windows.Forms.TextBox();
             this.failureText = new System.Windows.Forms.Label();
             this.nextButton = new CleanFlashCommon.GradientButton();
@@ -242,6 +243,7 @@ namespace CleanFlashUninstaller {
             // 
             // prevButton
             // 
+            prevButton.TabStop = false;
             this.prevButton.BackColor = System.Drawing.Color.Black;
             this.prevButton.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118)))));
             this.prevButton.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(81)))), ((int)(((byte)(81)))));

CleanFlashUninstaller/UninstallForm.cs

@@ -114,16 +114,43 @@ namespace CleanFlashUninstaller {
         }
 
         private void completeLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            if (e.Link.Start == 212) {
+            Process.Start("https://gitlab.com/cleanflash/installer#clean-flash-player");
-                Process.Start("https://classic.waterfox.net");
-            } else {
-                Process.Start("https://cleanflash.github.io");
-            }
         }
 
         private void copyErrorButton_Click(object sender, EventArgs e) {
             Clipboard.SetText(failureBox.Text);
             MessageBox.Show("Copied error message to clipboard!", "Clean Flash Installer", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
+
+        // note: copy pasted from installer; todo: single F for both
+        private void InstallForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            bool v1 = true;
+            // if installing
+            // note: msgbox not pauses the process
+            if (installPanel.Visible)
+            {
+                if (v1)
+                {
+                    // hardlock, only force quit process
+                    // follows current design since Back button is disabled
+                    MessageBox.Show("Please, wait until process end", "Clean Flash Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    e.Cancel = true;
+                }
+                else
+                // soft alternative, expert mode, todo: better warning of consequences  
+                if (MessageBox.Show("Are you sure you want to interrupt the process ?", "Clean Flash Installer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    e.Cancel = true;
+                }
+                else
+                {
+                    // use cases ?
+                    // uninstall, currently not implemented
+                }
+
+                //todo: same for uninstaller: share same F
+            }
+        }
     }
 }

README.md

@@ -28,14 +28,27 @@ To keep using Flash Player on **Mozilla Firefox**, install [**Waterfox Classic**
 
 **Internet Explorer** still supports Flash Player on Windows 10.
 
+<details><summary>Alternatives</summary>
+
+- [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)
+- [Mypal 29.3.0](https://www.mypal-browser.org/download.html)
+
+</details> 
+
 ## Usage
 
 - Make sure you have a compatible browser to use Flash Player with
 - Download the latest version from [GitLab](https://gitlab.com/cleanflash/installer/-/releases)
-- Extract the installer and run it
+- Launch installer
 - Accept the disclaimer
 - Choose which browser plugins to install
 - Choose to install the standalone projector or not
+- Choose to install the debug build or not
 - Close all browser windows, or let the installer close them for you
 - Press the "Install" button and wait for Flash Player to install
 - Enjoy using Flash Player!