Merge branch 'gentrydeng-master-patch-97142' into 'master'

readme: update download link for .NET Framework 4.0.3

See merge request cleanflash/installer!4

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,11 +32,11 @@ namespace CleanFlashCommon {
     }
 
     public class UpdateChecker {
-        private static readonly string FLASH_VERSION = "34.0.0.289";
+        private static readonly string FLASH_VERSION = "34.0.0.315";
-        private static readonly string VERSION = "34.0.0.289";
+        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/114.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/125.0.0.0 Safari/537.36";
 
         public static string GetAPILink() {
             return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest";

CleanFlashInstaller/CleanFlashInstaller.csproj

@@ -7,11 +7,11 @@
     <TargetFramework>net40</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.289 Installer</Product>
+    <Product>Clean Flash Player 34.0.0.315 Installer</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.289 Installer</AssemblyTitle>
+    <AssemblyTitle>Clean Flash Player 34.0.0.315 Installer</AssemblyTitle>
-    <FileVersion>34.0.0.289</FileVersion>
+    <FileVersion>34.0.0.315</FileVersion>
-    <AssemblyVersion>34.0.0.289</AssemblyVersion>
+    <AssemblyVersion>34.0.0.315</AssemblyVersion>
-    <Version>34.0.0.289</Version>
+    <Version>34.0.0.315</Version>
     <Authors>FlashPatch Team</Authors>
     <Company>FlashPatch Team</Company>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -52,7 +52,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/CleanFlashUninstaller.csproj

@@ -10,11 +10,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.289 Uninstaller</Product>
+    <Product>Clean Flash Player 34.0.0.315 Uninstaller</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.289 Uninstaller</AssemblyTitle>
+    <AssemblyTitle>Clean Flash Player 34.0.0.315 Uninstaller</AssemblyTitle>
-    <FileVersion>34.0.0.289</FileVersion>
+    <FileVersion>34.0.0.315</FileVersion>
-    <AssemblyVersion>34.0.0.289</AssemblyVersion>
+    <AssemblyVersion>34.0.0.315</AssemblyVersion>
-    <Version>34.0.0.289</Version>
+    <Version>34.0.0.315</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>

README.md

@@ -16,7 +16,9 @@ Clean Flash Player uses a modified version of this updated Flash Player version,
 
 Google Chrome, Mozilla Firefox and Internet Explorer browser plugins are supported. Clean Flash Player ships with a standalone Flash Projector as well.
 
-**Clean Flash is compatible and tested with Windows XP, Windows Vista, Windows 7, Windows 8.1, Windows 10 and Windows 11**. If attempting to run on Windows XP, download [.NET Framework 4.0](https://dotnet.microsoft.com/download/dotnet-framework/net40) first and optionally update to [.NET Framework 4.0.3](https://www.microsoft.com/en-us/download/details.aspx?id=29053).
+**Clean Flash is compatible and tested with Windows XP, Windows Vista, Windows 7, Windows 8.1, Windows 10 and Windows 11**.
+
+If attempting to run on Windows XP, download [.NET Framework 4.0](https://dotnet.microsoft.com/download/dotnet-framework/net40) first and optionally update to [.NET Framework 4.0.3](https://web.archive.org/web/20200803205224/https://download.microsoft.com/download/3/3/9/3396A3CA-BFE8-4C9B-83D3-CADAE72C17BE/NDP40-KB2600211-x86.exe) (The original link is no longer working, the file is courtesy of the Internet Archive's **Wayback Machine**).
 
 ## Browser compatibility