Winify

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 60  →  ?path2? @ 61
/trunk/Winify/Utilities/AES.cs
@@ -28,34 +28,26 @@
///////////////////////////////////////////////////////////////////////////
public static async Task<byte[]> Encrypt(byte[] plain, string password)
{
using (var rijndael = Rijndael.Create())
{
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
var salt = new byte[AESKeySaltBytes];
Rng.GetBytes(salt);
using (var pdb = new Rfc2898DeriveBytes(password, salt, 1000))
{
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
using var rijndael = Rijndael.Create();
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
var salt = new byte[AESKeySaltBytes];
Rng.GetBytes(salt);
using var pdb = new Rfc2898DeriveBytes(password, salt, 1000);
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
 
using (var memoryStream = new MemoryStream())
{
using (var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateEncryptor(), CryptoStreamMode.Write))
{
await cryptoStream.WriteAsync(plain, 0, plain.Length);
cryptoStream.Close();
using var memoryStream = new MemoryStream();
using var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateEncryptor(), CryptoStreamMode.Write);
await cryptoStream.WriteAsync(plain, 0, plain.Length);
cryptoStream.Close();
 
var ciphertext = memoryStream.ToArray();
var ciphertext = memoryStream.ToArray();
 
return salt.Concat(ciphertext).ToArray();
}
}
}
}
return salt.Concat(ciphertext).ToArray();
}
 
///////////////////////////////////////////////////////////////////////////
@@ -63,35 +55,27 @@
///////////////////////////////////////////////////////////////////////////
public static async Task<byte[]> Decrypt(byte[] cipher, string password)
{
using (var rijndael = Rijndael.Create())
{
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
using var rijndael = Rijndael.Create();
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
 
var salt = cipher.Take(AESKeySaltBytes).ToArray();
var salt = cipher.Take(AESKeySaltBytes).ToArray();
 
var ciphertext = cipher.Skip(AESKeySaltBytes).ToArray();
var ciphertext = cipher.Skip(AESKeySaltBytes).ToArray();
 
using (var pdb = new Rfc2898DeriveBytes(password, salt, 1000))
{
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
using var pdb = new Rfc2898DeriveBytes(password, salt, 1000);
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
 
using (var memoryStream = new MemoryStream())
{
using (var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateDecryptor(), CryptoStreamMode.Write))
{
await cryptoStream.WriteAsync(ciphertext, 0, ciphertext.Length);
cryptoStream.Close();
using var memoryStream = new MemoryStream();
using var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateDecryptor(), CryptoStreamMode.Write);
await cryptoStream.WriteAsync(ciphertext, 0, ciphertext.Length);
cryptoStream.Close();
 
return memoryStream.ToArray();
}
}
}
}
return memoryStream.ToArray();
}
 
#endregion
/trunk/Winify/Utilities/LogMemorySink.cs
@@ -20,11 +20,9 @@
{
if (logEvent == null) throw new ArgumentNullException(nameof(logEvent));
 
using (var stringWriter = new StringWriter())
{
_textFormatter.Format(logEvent, stringWriter);
Events.Add(stringWriter.ToString());
}
using var stringWriter = new StringWriter();
_textFormatter.Format(logEvent, stringWriter);
Events.Add(stringWriter.ToString());
}
 
public void Clear()
/trunk/Winify/Utilities/Miscellaneous.cs
@@ -17,32 +17,28 @@
 
public static bool LaunchOnBootSet(bool enable)
{
using (var key = Registry.CurrentUser.OpenSubKey
("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true))
using var key = Registry.CurrentUser.OpenSubKey
("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
if (key == null) return false;
 
switch (enable)
{
if (key == null) return false;
case true:
key.SetValue(Constants.AssemblyName, Assembly.GetEntryAssembly().Location);
break;
default:
key.DeleteValue(Constants.AssemblyName, false);
break;
}
 
switch (enable)
{
case true:
key.SetValue(Constants.AssemblyName, Assembly.GetEntryAssembly().Location);
break;
default:
key.DeleteValue(Constants.AssemblyName, false);
break;
}
 
return true;
}
return true;
}
 
public static bool LaunchOnBootGet()
{
using (var key = Registry.CurrentUser.OpenSubKey
("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true))
{
return key?.GetValue(Constants.AssemblyName) != null;
}
using var key = Registry.CurrentUser.OpenSubKey
("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
return key?.GetValue(Constants.AssemblyName) != null;
}
 
/// <summary>
@@ -66,13 +62,11 @@
public static async Task<Icon> CreateIconFromResource(string resource)
{
var iconBytes = await LoadResource(resource);
using (var iconMemoryStream = new MemoryStream(iconBytes))
{
var bitmap = (Bitmap)Image.FromStream(iconMemoryStream);
var bitmapIntPtr = bitmap.GetHicon();
var icon = Icon.FromHandle(bitmapIntPtr);
return icon;
}
using var iconMemoryStream = new MemoryStream(iconBytes);
var bitmap = (Bitmap)Image.FromStream(iconMemoryStream);
var bitmapIntPtr = bitmap.GetHicon();
var icon = Icon.FromHandle(bitmapIntPtr);
return icon;
}
 
public static async Task<byte[]> LoadResource(string resource)
@@ -79,18 +73,16 @@
{
var assembly = Assembly.GetExecutingAssembly();
 
using (var manifestResourceStream = assembly.GetManifestResourceStream(resource))
{
if (manifestResourceStream == null) return null;
using var manifestResourceStream = assembly.GetManifestResourceStream(resource);
if (manifestResourceStream == null) return null;
 
var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
 
await manifestResourceStream.CopyToAsync(memoryStream);
await manifestResourceStream.CopyToAsync(memoryStream);
 
memoryStream.Position = 0L;
memoryStream.Position = 0L;
 
return memoryStream.ToArray();
}
return memoryStream.ToArray();
}
 
public static void InvokeIfRequired<T>(this T control, Action<T> action) where T : Control
@@ -150,23 +142,19 @@
var location = @"SOFTWARE\Microsoft\Cryptography";
var name = "MachineGuid";
 
using (var localMachineX64View =
RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64))
{
using (var rk = localMachineX64View.OpenSubKey(location))
{
if (rk == null)
throw new KeyNotFoundException(
string.Format("Key Not Found: {0}", location));
using var localMachineX64View =
RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
using var rk = localMachineX64View.OpenSubKey(location);
if (rk == null)
throw new KeyNotFoundException(
string.Format("Key Not Found: {0}", location));
 
var machineGuid = rk.GetValue(name);
if (machineGuid == null)
throw new IndexOutOfRangeException(
string.Format("Index Not Found: {0}", name));
var machineGuid = rk.GetValue(name);
if (machineGuid == null)
throw new IndexOutOfRangeException(
string.Format("Index Not Found: {0}", name));
 
return machineGuid.ToString();
}
}
return machineGuid.ToString();
}
 
#endregion
/trunk/Winify/Utilities/Serialization/Serialization.cs
@@ -49,28 +49,24 @@
 
settings.Schemas.Add(targetNamespace, schemeUri);
 
using (var fileStream =
await Miscellaneous.GetFileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read,
cancellationToken))
using var fileStream =
await Miscellaneous.GetFileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read,
cancellationToken);
using var xmlReader = XmlReader.Create(fileStream,
settings);
var stringBuilder = new StringBuilder();
 
using (var stringWriter = new StringWriter(stringBuilder))
{
using (var xmlReader = XmlReader.Create(fileStream,
settings))
{
var stringBuilder = new StringBuilder();
while (await xmlReader.ReadAsync())
await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync());
}
 
using (var stringWriter = new StringWriter(stringBuilder))
{
while (await xmlReader.ReadAsync())
await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync());
}
 
using (var stringReader = new StringReader(stringBuilder.ToString()))
{
servers =
(T)xmlSerializer
.Deserialize(stringReader);
}
}
using (var stringReader = new StringReader(stringBuilder.ToString()))
{
servers =
(T)xmlSerializer
.Deserialize(stringReader);
}
}
catch (Exception exception)
@@ -93,36 +89,30 @@
 
try
{
using (var memoryStream = new MemoryStream())
{
using (var xmlWriter =
XmlWriter.Create(memoryStream,
new XmlWriterSettings
{
Async = true,
Indent = true,
IndentChars = " ",
OmitXmlDeclaration = false
}))
{
await xmlWriter.WriteDocTypeAsync(name,
null,
null,
subset);
using var memoryStream = new MemoryStream();
using var xmlWriter =
XmlWriter.Create(memoryStream,
new XmlWriterSettings
{
Async = true,
Indent = true,
IndentChars = " ",
OmitXmlDeclaration = false
});
await xmlWriter.WriteDocTypeAsync(name,
null,
null,
subset);
 
xmlSerializer.Serialize(xmlWriter, servers);
xmlSerializer.Serialize(xmlWriter, servers);
 
using (var fileStream =
await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write,
FileShare.Write,
cancellationToken))
{
memoryStream.Position = 0L;
using var fileStream =
await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write,
FileShare.Write,
cancellationToken);
memoryStream.Position = 0L;
 
await memoryStream.CopyToAsync(fileStream);
}
}
}
await memoryStream.CopyToAsync(fileStream);
}
catch (Exception exception)
{