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

@@ -36,7 +36,7 @@ namespace CleanFlashCommon {
         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/120.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

@@ -19,6 +19,17 @@
   <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(187, 28));
+                completeLabel.Links.Add(new LinkLabel.Link(191, 28));
             } else {
                 completeLabel.Text = COMPLETE_UNINSTALL_TEXT;
                 completeLabel.Links.Add(new LinkLabel.Link(110, 28));

CleanFlashInstaller/Installer.cs

@@ -1,6 +1,5 @@
 using CleanFlashCommon;
 using System;
-using System.Text;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -8,7 +7,7 @@ using System.Diagnostics;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using System.Runtime.InteropServices;
+using IWshRuntimeLibrary;
 
 namespace CleanFlashInstaller {
     public class Installer {
@@ -85,24 +84,16 @@ namespace CleanFlashInstaller {
         }
 
         public static void CreateShortcut(string folder, string executable, string name, string description) {
-            Type t = Type.GetTypeFromCLSID(new Guid("72C24DD5-D70A-438B-8A42-98424B88AFB8"));
-            dynamic shell = Activator.CreateInstance(t);
+            WshShell wsh = new WshShell();
+            IWshShortcut shortcut = wsh.CreateShortcut(Path.Combine(folder, name + ".lnk")) as IWshShortcut;
 
-            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);
-            }
+            shortcut.Arguments = "";
+            shortcut.TargetPath = executable;
+            shortcut.WindowStyle = (int) WshWindowStyle.WshNormalFocus;
+            shortcut.Description = description;
+            shortcut.WorkingDirectory = Path.GetDirectoryName(executable);
+            shortcut.IconLocation = executable;
+            shortcut.Save();
         }
 
         private static void InstallFromArchive(SevenZipArchive archive, IProgressForm form, InstallFlags flags) {
@@ -184,4 +175,4 @@ namespace CleanFlashInstaller {
             }
         }
     }
-}
+}