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/UpdateChecker.cs

@@ -32,11 +32,11 @@ namespace CleanFlashCommon {
     }
 
     public class UpdateChecker {
-        private static readonly string FLASH_VERSION = "34.0.0.301";
-        private static readonly string VERSION = "34.0.0.301";
+        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/116.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/120.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.301 Installer</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.301 Installer</AssemblyTitle>
-    <FileVersion>34.0.0.301</FileVersion>
-    <AssemblyVersion>34.0.0.301</AssemblyVersion>
-    <Version>34.0.0.301</Version>
+    <Product>Clean Flash Player 34.0.0.315 Installer</Product>
+    <AssemblyTitle>Clean Flash Player 34.0.0.315 Installer</AssemblyTitle>
+    <FileVersion>34.0.0.315</FileVersion>
+    <AssemblyVersion>34.0.0.315</AssemblyVersion>
+    <Version>34.0.0.315</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>

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

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;
+            Type t = Type.GetTypeFromCLSID(new Guid("72C24DD5-D70A-438B-8A42-98424B88AFB8"));
+            dynamic shell = Activator.CreateInstance(t);
 
-            shortcut.Arguments = "";
-            shortcut.TargetPath = executable;
-            shortcut.WindowStyle = (int) WshWindowStyle.WshNormalFocus;
-            shortcut.Description = description;
-            shortcut.WorkingDirectory = Path.GetDirectoryName(executable);
-            shortcut.IconLocation = executable;
-            shortcut.Save();
+            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) {

CleanFlashUninstaller/CleanFlashUninstaller.csproj

@@ -10,11 +10,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <StartupObject></StartupObject>
-    <Product>Clean Flash Player 34.0.0.301 Uninstaller</Product>
-    <AssemblyTitle>Clean Flash Player 34.0.0.301 Uninstaller</AssemblyTitle>
-    <FileVersion>34.0.0.301</FileVersion>
-    <AssemblyVersion>34.0.0.301</AssemblyVersion>
-    <Version>34.0.0.301</Version>
+    <Product>Clean Flash Player 34.0.0.315 Uninstaller</Product>
+    <AssemblyTitle>Clean Flash Player 34.0.0.315 Uninstaller</AssemblyTitle>
+    <FileVersion>34.0.0.315</FileVersion>
+    <AssemblyVersion>34.0.0.315</AssemblyVersion>
+    <Version>34.0.0.315</Version>
     <Authors>FlashPatch Team</Authors>
 	<Company>FlashPatch Team</Company>
   </PropertyGroup>

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