UnknownObject
/
CleanFlashInstaller
mirror of https://gitlab.com/cleanflash/installer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: UnknownObject:master
Branches Tags
UnknownObject:master
UnknownObject:testbuild
UnknownObject:test-ci
UnknownObject:34.0.0.192
UnknownObject:34.0.0.211
UnknownObject:34.0.0.231
UnknownObject:34.0.0.242
UnknownObject:34.0.0.251
UnknownObject:34.0.0.267
UnknownObject:34.0.0.277
UnknownObject:34.0.0.282
UnknownObject:34.0.0.289
UnknownObject:34.0.0.295
UnknownObject:34.0.0.301
UnknownObject:34.0.0.308
UnknownObject:34.0.0.315
UnknownObject:34.0.0.317
..
compare: UnknownObject:34.0.0.282
Branches Tags
UnknownObject:master
UnknownObject:testbuild
UnknownObject:test-ci
UnknownObject:34.0.0.192
UnknownObject:34.0.0.211
UnknownObject:34.0.0.231
UnknownObject:34.0.0.242
UnknownObject:34.0.0.251
UnknownObject:34.0.0.267
UnknownObject:34.0.0.277
UnknownObject:34.0.0.282
UnknownObject:34.0.0.289
UnknownObject:34.0.0.295
UnknownObject:34.0.0.301
UnknownObject:34.0.0.308
UnknownObject:34.0.0.315
UnknownObject:34.0.0.317

No commits in common. 'master' and '34.0.0.282' have entirely different histories.
master ... 34.0.0.282

8 changed files with 40 additions and 60 deletions
Show Stats

2
CleanFlashCommon/CleanFlashCommon.csproj
Unescape Escape View File

@ -21,7 +21,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

4
CleanFlashCommon/FileUtil.cs
Unescape Escape View File

@ -51,10 +51,6 @@ namespace CleanFlashCommon {
return;
}
if (file.Extension.ToLower().Equals(".ocx")) {
Uninstaller.UnregisterActiveX(file.FullName);
}
try {
file.IsReadOnly = false;
file.Delete();

18
CleanFlashCommon/Uninstaller.cs
Unescape Escape View File

@ -27,24 +27,6 @@ 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);

6
CleanFlashCommon/UpdateChecker.cs
Unescape Escape View File

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

23
CleanFlashInstaller/CleanFlashInstaller.csproj
Unescape Escape View File

@ -7,11 +7,11 @@
<TargetFramework>net40</TargetFramework>
<ApplicationManifest>app.manifest</ApplicationManifest>
<StartupObject></StartupObject>
<Product>Clean Flash Player 34.0.0.317 Installer</Product>
<AssemblyTitle>Clean Flash Player 34.0.0.317 Installer</AssemblyTitle>
<FileVersion>34.0.0.317</FileVersion>
<AssemblyVersion>34.0.0.317</AssemblyVersion>
<Version>34.0.0.317</Version>
<Product>Clean Flash Player 34.0.0.282 Installer</Product>
<AssemblyTitle>Clean Flash Player 34.0.0.282 Installer</AssemblyTitle>
<FileVersion>34.0.0.282</FileVersion>
<AssemblyVersion>34.0.0.282</AssemblyVersion>
<Version>34.0.0.282</Version>
<Authors>FlashPatch Team</Authors>
<Company>FlashPatch Team</Company>
<ApplicationIcon>icon.ico</ApplicationIcon>
@ -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>
@ -41,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.3">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
CleanFlashInstaller/InstallForm.cs
Unescape Escape View File

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

33
CleanFlashInstaller/Installer.cs
Unescape Escape View File

@ -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);
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);
}
WshShell wsh = new WshShell();
IWshShortcut shortcut = wsh.CreateShortcut(Path.Combine(folder, name + ".lnk")) as IWshShortcut;
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 {
}
}
}
}
}

12
CleanFlashUninstaller/CleanFlashUninstaller.csproj
Unescape Escape View File

@ -10,11 +10,11 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>icon.ico</ApplicationIcon>
<StartupObject></StartupObject>
<Product>Clean Flash Player 34.0.0.317 Uninstaller</Product>
<AssemblyTitle>Clean Flash Player 34.0.0.317 Uninstaller</AssemblyTitle>
<FileVersion>34.0.0.317</FileVersion>
<AssemblyVersion>34.0.0.317</AssemblyVersion>
<Version>34.0.0.317</Version>
<Product>Clean Flash Player 34.0.0.282 Uninstaller</Product>
<AssemblyTitle>Clean Flash Player 34.0.0.282 Uninstaller</AssemblyTitle>
<FileVersion>34.0.0.282</FileVersion>
<AssemblyVersion>34.0.0.282</AssemblyVersion>
<Version>34.0.0.282</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.3">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

Write Preview
Loading…
Cancel
Save