diff --git a/CleanFlashCommon/CleanFlashCommon.csproj b/CleanFlashCommon/CleanFlashCommon.csproj index 9085a9f..00fdba0 100644 --- a/CleanFlashCommon/CleanFlashCommon.csproj +++ b/CleanFlashCommon/CleanFlashCommon.csproj @@ -1,35 +1,13 @@  - - + - Debug - AnyCPU - {D00F629B-455A-42DE-B2FA-A3759A3095AE} Library - Properties CleanFlashCommon CleanFlashCommon - v4.0 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - + + + net40 + @@ -43,46 +21,13 @@ - - - - Component - - - - Component - - - ImageCheckBox.cs - - - - - - - True - True - Resources.resx - - - - - UserControl - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - \ No newline at end of file + + False + None + + diff --git a/CleanFlashCommon/HandleUtil.cs b/CleanFlashCommon/HandleUtil.cs index 7fe6a33..8f2dd2c 100644 --- a/CleanFlashCommon/HandleUtil.cs +++ b/CleanFlashCommon/HandleUtil.cs @@ -205,8 +205,8 @@ namespace CleanFlashCommon { RuntimeHelpers.PrepareConstrainedRegions(); try { } finally { - // CER guarantees that the address of the allocated - // memory is actually assigned to ptr if an + // CER guarantees that the address of the allocated + // memory is actually assigned to ptr if an // asynchronous exception occurs. ptr = Marshal.AllocHGlobal(length); } @@ -223,7 +223,7 @@ namespace CleanFlashCommon { for (int i = 0; i < handleCount; i++) { SYSTEM_HANDLE_ENTRY handleEntry = (SYSTEM_HANDLE_ENTRY) Marshal.PtrToStructure((IntPtr)((int)ptr + offset), typeof(SYSTEM_HANDLE_ENTRY)); - + if (handleEntry.OwnerPid == processId) { IntPtr handle = (IntPtr) handleEntry.HandleValue; SystemHandleType handleType; @@ -245,8 +245,8 @@ namespace CleanFlashCommon { } } } finally { - // CER guarantees that the allocated memory is freed, - // if an asynchronous exception occurs. + // CER guarantees that the allocated memory is freed, + // if an asynchronous exception occurs. Marshal.FreeHGlobal(ptr); } } while (ret == NT_STATUS.STATUS_INFO_LENGTH_MISMATCH); @@ -294,8 +294,8 @@ namespace CleanFlashCommon { RuntimeHelpers.PrepareConstrainedRegions(); try { } finally { - // CER guarantees the assignment of the allocated - // memory address to ptr, if an ansynchronous exception + // CER guarantees the assignment of the allocated + // memory address to ptr, if an ansynchronous exception // occurs. ptr = Marshal.AllocHGlobal(length); } @@ -306,7 +306,7 @@ namespace CleanFlashCommon { RuntimeHelpers.PrepareConstrainedRegions(); try { } finally { // CER guarantees that the previous allocation is freed, - // and that the newly allocated memory address is + // and that the newly allocated memory address is // assigned to ptr if an asynchronous exception occurs. Marshal.FreeHGlobal(ptr); ptr = Marshal.AllocHGlobal(length); @@ -318,7 +318,7 @@ namespace CleanFlashCommon { return fileName.Length != 0; } } finally { - // CER guarantees that the allocated memory is freed, + // CER guarantees that the allocated memory is freed, // if an asynchronous exception occurs. Marshal.FreeHGlobal(ptr); } diff --git a/CleanFlashCommon/Properties/AssemblyInfo.cs b/CleanFlashCommon/Properties/AssemblyInfo.cs deleted file mode 100644 index 95bb088..0000000 --- a/CleanFlashCommon/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -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("CleanFlashCommon")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CleanFlashCommon")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d00f629b-455a-42de-b2fa-a3759a3095ae")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CleanFlashCommon/Properties/Resources.Designer.cs b/CleanFlashCommon/Properties/Resources.Designer.cs index f2c2680..fdd4280 100644 --- a/CleanFlashCommon/Properties/Resources.Designer.cs +++ b/CleanFlashCommon/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CleanFlashCommon.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/CleanFlashCommon/UpdateChecker.cs b/CleanFlashCommon/UpdateChecker.cs index 43143a7..e9a10a8 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.251"; - private static readonly string VERSION = "v34.0.0.251"; + private static readonly string FLASH_VERSION = "34.0.0.267"; + private static readonly string VERSION = "34.0.0.267"; 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/101.0.4951.41 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/104.0.0.0 Safari/537.36"; public static string GetAPILink() { return "https://api.github.com/repos/" + AUTHOR + "/" + REPO + "/releases/latest"; diff --git a/CleanFlashInstaller/App.config b/CleanFlashInstaller/App.config deleted file mode 100644 index 74ade9d..0000000 --- a/CleanFlashInstaller/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/CleanFlashInstaller/CleanFlashInstaller.csproj b/CleanFlashInstaller/CleanFlashInstaller.csproj index 4938ba0..7945ebd 100644 --- a/CleanFlashInstaller/CleanFlashInstaller.csproj +++ b/CleanFlashInstaller/CleanFlashInstaller.csproj @@ -1,114 +1,42 @@  - - - - + - Debug - AnyCPU - {317B6619-2419-4778-95A2-1A97DC55AB83} - WinExe CleanFlashInstaller CleanFlashInstaller - v4.0 - 512 - true - true - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - ..\CleanFlashCommon\icon.ico - - - + WinExe + net40 app.manifest + + Clean Flash Player 34.0.0.267 Installer + Clean Flash Player 34.0.0.267 Installer + 34.0.0.267 + 34.0.0.267 + 34.0.0.267 + FlashPatch Team + FlashPatch Team + icon.ico - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - 7.3 - prompt - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - 7.3 - prompt - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - 7.3 - prompt - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - 7.3 - prompt - true - - - CleanFlashInstaller.Program - - - ..\packages\SharpCompress.0.24.0\lib\net35\SharpCompress.dll - + + + + + tlbimp + 0 + 1 + f935dc20-1cf0-11d0-adb9-00c04fd58a0b + 0 + false + true + + + + + + + + + @@ -120,86 +48,34 @@ + - - - - - Form - - - InstallForm.cs - - - - - InstallForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - + - - - - - - - {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} - 1 - 0 - 0 - tlbimp - False - True - - - - - False - .NET Framework 3.5 SP1 - false - + + True + True + Settings.settings + - - {d00f629b-455a-42de-b2fa-a3759a3095ae} - CleanFlashCommon - + + SettingsSingleFileGenerator + Settings.Designer.cs + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + + False + None + + diff --git a/CleanFlashInstaller/ILMerge.props b/CleanFlashInstaller/ILMerge.props deleted file mode 100644 index aaadb12..0000000 --- a/CleanFlashInstaller/ILMerge.props +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CleanFlashInstaller/ILMergeOrder.txt b/CleanFlashInstaller/ILMergeOrder.txt deleted file mode 100644 index 3fda7f5..0000000 --- a/CleanFlashInstaller/ILMergeOrder.txt +++ /dev/null @@ -1,4 +0,0 @@ -# this file contains the partial list of the merged assemblies in the merge order -# you can fill it from the obj\CONFIG\PROJECT.ilmerge generated on every build -# and finetune merge order to your satisfaction - diff --git a/CleanFlashInstaller/Properties/AssemblyInfo.cs b/CleanFlashInstaller/Properties/AssemblyInfo.cs deleted file mode 100644 index b307305..0000000 --- a/CleanFlashInstaller/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -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.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.251 Installer")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("317b6619-2419-4778-95a2-1a97dc55ab83")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.251")] -[assembly: AssemblyFileVersion("34.0.0.251")] diff --git a/CleanFlashInstaller/Properties/Resources.Designer.cs b/CleanFlashInstaller/Properties/Resources.Designer.cs index 638ed9c..d88d56f 100644 --- a/CleanFlashInstaller/Properties/Resources.Designer.cs +++ b/CleanFlashInstaller/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CleanFlashInstaller.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/CleanFlashInstaller/Properties/Settings.Designer.cs b/CleanFlashInstaller/Properties/Settings.Designer.cs index f0aa8b4..dc28158 100644 --- a/CleanFlashInstaller/Properties/Settings.Designer.cs +++ b/CleanFlashInstaller/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace CleanFlashInstaller.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/CleanFlashInstaller/app.manifest b/CleanFlashInstaller/app.manifest index 0863bf8..4f163c3 100644 --- a/CleanFlashInstaller/app.manifest +++ b/CleanFlashInstaller/app.manifest @@ -8,11 +8,6 @@ - - - true - - diff --git a/CleanFlashInstaller/icon.ico b/CleanFlashInstaller/icon.ico new file mode 100644 index 0000000..43dc170 Binary files /dev/null and b/CleanFlashInstaller/icon.ico differ diff --git a/CleanFlashInstaller/packages.config b/CleanFlashInstaller/packages.config deleted file mode 100644 index f26b7c9..0000000 --- a/CleanFlashInstaller/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CleanFlashUninstaller/CleanFlashUninstaller.csproj b/CleanFlashUninstaller/CleanFlashUninstaller.csproj index 598a731..013f768 100644 --- a/CleanFlashUninstaller/CleanFlashUninstaller.csproj +++ b/CleanFlashUninstaller/CleanFlashUninstaller.csproj @@ -1,49 +1,26 @@  - - - - + - Debug - AnyCPU - {E193EEA6-BE73-4E34-BEB0-E13AC8D30C5C} - WinExe CleanFlashUninstaller CleanFlashUninstaller - v4.0 - 512 - true - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - ..\CleanFlashCommon\icon.ico + WinExe + net40 app.manifest - - - CleanFlashUninstaller.Program + icon.ico + + Clean Flash Player 34.0.0.267 Uninstaller + Clean Flash Player 34.0.0.267 Uninstaller + 34.0.0.267 + 34.0.0.267 + 34.0.0.267 + FlashPatch Team + FlashPatch Team + + + @@ -57,62 +34,17 @@ - - Form - - - UninstallForm.cs - - - - - UninstallForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - {d00f629b-455a-42de-b2fa-a3759a3095ae} - CleanFlashCommon - + - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - + + False + None + \ No newline at end of file diff --git a/CleanFlashUninstaller/ILMerge.props b/CleanFlashUninstaller/ILMerge.props deleted file mode 100644 index aaadb12..0000000 --- a/CleanFlashUninstaller/ILMerge.props +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CleanFlashUninstaller/ILMergeOrder.txt b/CleanFlashUninstaller/ILMergeOrder.txt deleted file mode 100644 index 3fda7f5..0000000 --- a/CleanFlashUninstaller/ILMergeOrder.txt +++ /dev/null @@ -1,4 +0,0 @@ -# this file contains the partial list of the merged assemblies in the merge order -# you can fill it from the obj\CONFIG\PROJECT.ilmerge generated on every build -# and finetune merge order to your satisfaction - diff --git a/CleanFlashUninstaller/Properties/AssemblyInfo.cs b/CleanFlashUninstaller/Properties/AssemblyInfo.cs deleted file mode 100644 index 8f1c1bf..0000000 --- a/CleanFlashUninstaller/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -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.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.251 Uninstaller")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e193eea6-be73-4e34-beb0-e13ac8d30c5c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.251")] -[assembly: AssemblyFileVersion("34.0.0.251")] diff --git a/CleanFlashUninstaller/icon.ico b/CleanFlashUninstaller/icon.ico new file mode 100644 index 0000000..43dc170 Binary files /dev/null and b/CleanFlashUninstaller/icon.ico differ diff --git a/CleanFlashUninstaller/packages.config b/CleanFlashUninstaller/packages.config deleted file mode 100644 index 09b27c4..0000000 --- a/CleanFlashUninstaller/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file