From 68448e704b7d6bf9b5dff660e06f3f2a88bd61eb Mon Sep 17 00:00:00 2001 From: Disyer Date: Fri, 17 Jun 2022 09:28:52 +0300 Subject: [PATCH] cleanflash: Update to 34.0.0.251 --- .gitignore | 2 + CleanFlashCommon/Properties/AssemblyInfo.cs | 2 +- CleanFlashCommon/Uninstaller.cs | 10 +++-- CleanFlashCommon/UpdateChecker.cs | 6 +-- CleanFlashInstaller/InstallForm.Designer.cs | 2 +- CleanFlashInstaller/InstallForm.cs | 4 +- CleanFlashInstaller/InstallForm.resx | 4 +- CleanFlashInstaller/Program.cs | 11 +++++- .../Properties/AssemblyInfo.cs | 8 ++-- CleanFlashInstaller/app.manifest | 39 +++++++++++-------- CleanFlashUninstaller/Program.cs | 7 ++++ .../Properties/AssemblyInfo.cs | 8 ++-- CleanFlashUninstaller/UninstallForm.cs | 2 +- CleanFlashUninstaller/UninstallForm.resx | 2 +- CleanFlashUninstaller/app.manifest | 39 +++++++++++-------- LICENSE | 21 ++++++++++ README.md | 8 ++-- 17 files changed, 114 insertions(+), 61 deletions(-) create mode 100644 LICENSE diff --git a/.gitignore b/.gitignore index f1d6df9..0b008f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .vs/ packages/ +cleanflash/ + bin obj diff --git a/CleanFlashCommon/Properties/AssemblyInfo.cs b/CleanFlashCommon/Properties/AssemblyInfo.cs index 78ce7c2..95bb088 100644 --- a/CleanFlashCommon/Properties/AssemblyInfo.cs +++ b/CleanFlashCommon/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("CleanFlashCommon")] -[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/CleanFlashCommon/Uninstaller.cs b/CleanFlashCommon/Uninstaller.cs index a5f95d5..4540e33 100644 --- a/CleanFlashCommon/Uninstaller.cs +++ b/CleanFlashCommon/Uninstaller.cs @@ -80,7 +80,7 @@ namespace CleanFlashCommon { // Remove Flash Center cache and user data FileUtil.WipeFolder(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Flash_Center")); - + // Remove shared start menu shortcuts FileUtil.WipeFolder(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonStartMenu), "Programs", "Flash Center")); FileUtil.WipeFolder(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Programs", "Flash Center")); @@ -93,14 +93,18 @@ namespace CleanFlashCommon { // Remove Flash Player from Program Files FileUtil.WipeFolder(SystemInfo.GetProgramFlash32Path()); - // Remove spyware dropped by Flash Center in the temporary folder + // Remove spyware dropped by Flash Center in the temporary folder string tempFolder = Path.GetTempPath(); foreach (string dir in Directory.GetDirectories(tempFolder)) { string parentName = Path.GetFileName(dir); if (parentName.Length == 11 && parentName.EndsWith(".tmp")) { - FileUtil.WipeFolder(dir); + try { + FileUtil.WipeFolder(dir); + } catch { + // Oh well... + } } } diff --git a/CleanFlashCommon/UpdateChecker.cs b/CleanFlashCommon/UpdateChecker.cs index 6ce070b..43143a7 100644 --- a/CleanFlashCommon/UpdateChecker.cs +++ b/CleanFlashCommon/UpdateChecker.cs @@ -32,11 +32,11 @@ namespace CleanFlashCommon { } public class UpdateChecker { - private static readonly string FLASH_VERSION = "34.0.0.192"; - private static readonly string VERSION = "v34.0.0.192"; + private static readonly string FLASH_VERSION = "34.0.0.251"; + private static readonly string VERSION = "v34.0.0.251"; 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/92.0.4515.159 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/101.0.4951.41 Safari/537.36"; public static string GetAPILink() { return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest"; diff --git a/CleanFlashInstaller/InstallForm.Designer.cs b/CleanFlashInstaller/InstallForm.Designer.cs index ea8d07a..b7361e5 100644 --- a/CleanFlashInstaller/InstallForm.Designer.cs +++ b/CleanFlashInstaller/InstallForm.Designer.cs @@ -593,7 +593,7 @@ namespace CleanFlashInstaller { // // InstallForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); this.ClientSize = new System.Drawing.Size(712, 329); diff --git a/CleanFlashInstaller/InstallForm.cs b/CleanFlashInstaller/InstallForm.cs index b0fb85f..d342f25 100644 --- a/CleanFlashInstaller/InstallForm.cs +++ b/CleanFlashInstaller/InstallForm.cs @@ -10,7 +10,7 @@ namespace CleanFlashInstaller { 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: • Older Google Chrome ≤ 87 - • Older Mozilla Firefox ≤ 84 or Waterfox + • Older Mozilla Firefox ≤ 84 or Basilisk For Flash Player updates, check out Clean Flash Player's website!"; private static string COMPLETE_UNINSTALL_TEXT = @" @@ -284,7 +284,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://waterfox.net"); + Process.Start("https://basilisk-browser.org"); } else { Process.Start("https://cleanflash.github.io"); } diff --git a/CleanFlashInstaller/InstallForm.resx b/CleanFlashInstaller/InstallForm.resx index 9f3765f..65fd0e4 100644 --- a/CleanFlashInstaller/InstallForm.resx +++ b/CleanFlashInstaller/InstallForm.resx @@ -119,8 +119,8 @@ I am aware that Adobe Flash Player is no longer supported, nor provided by Adobe Inc. -Clean Flash Player is a third-party version of Flash Player maintained by darktohka, -built from the latest Flash Player version by Adobe with adware removed. +Clean Flash Player is a third-party version of Flash Player built from the latest Flash Player +version with adware removed. Adobe is not required by any means to provide support for this version of Flash Player. diff --git a/CleanFlashInstaller/Program.cs b/CleanFlashInstaller/Program.cs index fd502e9..eadf086 100644 --- a/CleanFlashInstaller/Program.cs +++ b/CleanFlashInstaller/Program.cs @@ -1,16 +1,25 @@ using System; +using System.Runtime.InteropServices; using System.Windows.Forms; namespace CleanFlashInstaller { static class Program { + /// /// The main entry point for the application. /// [STAThread] - static void Main() { + static void Main(string[] args) { + if (Environment.OSVersion.Version.Major >= 6) { + //SetProcessDPIAware(); + } + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new InstallForm()); } + + [DllImport("user32.dll")] + private static extern bool SetProcessDPIAware(); } } diff --git a/CleanFlashInstaller/Properties/AssemblyInfo.cs b/CleanFlashInstaller/Properties/AssemblyInfo.cs index 17ee72a..b307305 100644 --- a/CleanFlashInstaller/Properties/AssemblyInfo.cs +++ b/CleanFlashInstaller/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Clean Flash Player 34.0.0.192 Installer")] +[assembly: AssemblyTitle("Clean Flash Player 34.0.0.251 Installer")] [assembly: AssemblyDescription("The newest version of Flash Player, patched and ready to go beyond 2021.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("FlashPatch Team")] -[assembly: AssemblyProduct("Clean Flash Player 34.0.0.192 Installer")] +[assembly: AssemblyProduct("Clean Flash Player 34.0.0.251 Installer")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("34.0.0.192")] -[assembly: AssemblyFileVersion("34.0.0.192")] +[assembly: AssemblyVersion("34.0.0.251")] +[assembly: AssemblyFileVersion("34.0.0.251")] diff --git a/CleanFlashInstaller/app.manifest b/CleanFlashInstaller/app.manifest index 5f57907..0863bf8 100644 --- a/CleanFlashInstaller/app.manifest +++ b/CleanFlashInstaller/app.manifest @@ -1,20 +1,25 @@  - - - - - - - - - - - - - - - - - + + + + + + + + + + + true + + + + + + + + + + + diff --git a/CleanFlashUninstaller/Program.cs b/CleanFlashUninstaller/Program.cs index 4a1d126..427dcb2 100644 --- a/CleanFlashUninstaller/Program.cs +++ b/CleanFlashUninstaller/Program.cs @@ -74,9 +74,16 @@ namespace CleanFlashUninstaller { return; } + if (Environment.OSVersion.Version.Major >= 6) { + //SetProcessDPIAware(); + } + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new UninstallForm()); } + + [DllImport("user32.dll")] + private static extern bool SetProcessDPIAware(); } } diff --git a/CleanFlashUninstaller/Properties/AssemblyInfo.cs b/CleanFlashUninstaller/Properties/AssemblyInfo.cs index de0091a..8f1c1bf 100644 --- a/CleanFlashUninstaller/Properties/AssemblyInfo.cs +++ b/CleanFlashUninstaller/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Clean Flash Player 34.0.0.192 Uninstaller")] +[assembly: AssemblyTitle("Clean Flash Player 34.0.0.251 Uninstaller")] [assembly: AssemblyDescription("The newest version of Flash Player, patched and ready to go beyond 2021.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("FlashPatch Team")] -[assembly: AssemblyProduct("Clean Flash Player 34.0.0.192 Uninstaller")] +[assembly: AssemblyProduct("Clean Flash Player 34.0.0.251 Uninstaller")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("34.0.0.192")] -[assembly: AssemblyFileVersion("34.0.0.192")] +[assembly: AssemblyVersion("34.0.0.251")] +[assembly: AssemblyFileVersion("34.0.0.251")] diff --git a/CleanFlashUninstaller/UninstallForm.cs b/CleanFlashUninstaller/UninstallForm.cs index c7f133f..99ac731 100644 --- a/CleanFlashUninstaller/UninstallForm.cs +++ b/CleanFlashUninstaller/UninstallForm.cs @@ -115,7 +115,7 @@ namespace CleanFlashUninstaller { private void completeLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { if (e.Link.Start == 212) { - Process.Start("https://waterfox.net"); + Process.Start("https://basilisk-browser.org"); } else { Process.Start("https://cleanflash.github.io"); } diff --git a/CleanFlashUninstaller/UninstallForm.resx b/CleanFlashUninstaller/UninstallForm.resx index 0ea7ff6..f955e91 100644 --- a/CleanFlashUninstaller/UninstallForm.resx +++ b/CleanFlashUninstaller/UninstallForm.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACY - CAAAAk1TRnQBSQFMAgEBAgEAAeABAQHgAQEBDwEAAQ8BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAfABAQHwAQEBDwEAAQ8BAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABPAMAAQ8DAAEBAQABCAUAAYQBAxgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz diff --git a/CleanFlashUninstaller/app.manifest b/CleanFlashUninstaller/app.manifest index 834d19d..443cfcc 100644 --- a/CleanFlashUninstaller/app.manifest +++ b/CleanFlashUninstaller/app.manifest @@ -1,20 +1,25 @@  - - - - - - - - - - - - - - - - - + + + + + + + + + + + true + + + + + + + + + + + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c39e471 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 darktohka + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index f1c1601..e474a49 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Clean Flash Player -[![Patreon](https://img.shields.io/badge/Kofi-donate-purple.svg)](https://ko-fi.com/disyer) [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/darktohka/FlashPatch/blob/master/LICENSE) +[![Patreon](https://img.shields.io/badge/Kofi-donate-purple.svg)](https://ko-fi.com/disyer) [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitlab.com/cleanflash/installer/-/blob/master/LICENSE) ![Image of Clean Flash Player](https://i.imgur.com/565LJBI.png) -[Download latest version](https://github.com/CleanFlash/installer/releases/latest) +[Download latest version](https://gitlab.com/cleanflash/installer/-/releases) ## What's this? @@ -24,14 +24,14 @@ Newer versions of Google Chrome and Mozilla Firefox do not support Flash Player To keep using Flash Player on **Google Chrome**, install an older version of Chrome. The last supported version is Chrome 87.0.4280.168. -To keep using Flash Player on **Mozilla Firefox**, install [**Waterfox**](https://waterfox.net) or [**Basilisk Browser**](https://basilisk-browser.org). Both of them are forks of Mozilla Firefox with built-in Flash Player support. +To keep using Flash Player on **Mozilla Firefox**, install [**Basilisk Browser**](https://basilisk-browser.org) or [**K-Meleon**](http://kmeleonbrowser.org/forum/read.php?19,154431). Both of them are forks of Mozilla Firefox with built-in Flash Player support. **Internet Explorer** still supports Flash Player on Windows. ## Usage - Make sure you have a compatible browser to use Flash Player with -- Download the latest version from [GitHub](https://github.com/CleanFlash/installer/releases/latest) +- Download the latest version from [GitLab](https://gitlab.com/cleanflash/installer/-/releases) - Extract the installer and run it - Accept the disclaimer - Choose which browser plugins to install