Updated to 2.1

hellzerg · May 18, 2018 · dce3b99 · dce3b99
1 parent 925bd6e
commit dce3b99
Show file tree

Hide file tree

Showing 19 changed files with 1,029 additions and 212 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.1] - 2018-05-18
+- Added option for single-instance
+- Added option for staying always on top
+- Added file browser for adding files/folders
+- Added functionality to analyze JSON files
+- Prompt to enable SHA256 when clicking on VirusTotal, if disabled
+- For security reasons VirusTotal will now works only with SHA256
+- Added: Check for new versions
+
 ## [2.0] - 2017-12-19
 - Added option to convert CRC32 to decimal
 - Open in VirusTotal support added

diff --git a/Hashing/AboutForm.cs b/Hashing/AboutForm.cs
@@ -27,6 +27,15 @@ private void button7_Click(object sender, EventArgs e)
 
         private void About_Load(object sender, EventArgs e)
         {
+            if (Options.CurrentOptions.StayOnTop)
+            {
+                this.TopMost = true;
+            }
+            else
+            {
+                this.TopMost = false;
+            }
+
             t1.Interval = 50;
             t2.Interval = 50;
 
@@ -48,7 +57,7 @@ private void t2_Tick(object sender, EventArgs e)
             string s10 = "deadmoon © 2";
             string s11 = "deadmoon © 20";
             string s12 = "deadmoon © 201";
-            string s13 = "deadmoon © 2017";
+            string s13 = "deadmoon © 2018";
 
             switch (l2.Text)
             {
@@ -93,15 +102,15 @@ private void t2_Tick(object sender, EventArgs e)
                     t2.Stop();
                     //t1.Start();
                     break;
-                case "deadmoon © 2017":
+                case "deadmoon © 2018":
                     l2.Text = s0;
                     break;
             }
         }
 
         private void l2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            Process.Start("http://5.249.159.211/deadmoon");
+            Process.Start("https://elgaming.eu/deadmoon");
         }
 
         private void t1_Tick(object sender, EventArgs e)

diff --git a/Hashing/AnalyzedForm.Designer.cs b/Hashing/AnalyzedForm.Designer.cs
diff --git a/Hashing/AnalyzedForm.cs b/Hashing/AnalyzedForm.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Hashing
+{
+    public partial class AnalyzedForm : Form
+    {
+        public AnalyzedForm(IEnumerable<string> files)
+        {
+            InitializeComponent();
+            CheckForIllegalCrossThreadCalls = false;
+
+            Options.ApplyTheme(this);
+
+            foreach (string x in files) listFiles.Items.Add("[✓] " + x);
+        }
+
+        private void AnalyzedForm_Load(object sender, EventArgs e)
+        {
+            if (Options.CurrentOptions.StayOnTop)
+            {
+                this.TopMost = true;
+            }
+            else
+            {
+                this.TopMost = false;
+            }
+        }
+    }
+}
diff --git a/Hashing/AnalyzedForm.resx b/Hashing/AnalyzedForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
diff --git a/Hashing/CompareForm.cs b/Hashing/CompareForm.cs
@@ -34,6 +34,15 @@ public CompareForm()
 
         private void CompareForm_Load(object sender, EventArgs e)
         {
+            if (Options.CurrentOptions.StayOnTop)
+            {
+                this.TopMost = true;
+            }
+            else
+            {
+                this.TopMost = false;
+            }
+
             txtExpected.Select();
         }
 

diff --git a/Hashing/FileSummary.cs b/Hashing/FileSummary.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hashing
+{
+    public class FileSummary
+    {
+        public string File { get; set; }
+        public string MD5 { get; set; }
+        public string SHA1 { get; set; }
+        public string SHA256 { get; set; }
+        public string SHA384 { get; set; }
+        public string SHA512 { get; set; }
+        public string CRC32 { get; set; }
+        public string RIPEMD160 { get; set; }
+    }
+}
diff --git a/Hashing/Hashing.csproj b/Hashing/Hashing.csproj
@@ -64,12 +64,19 @@
     <Compile Include="AboutForm.Designer.cs">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="AnalyzedForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AnalyzedForm.Designer.cs">
+      <DependentUpon>AnalyzedForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="CompareForm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="CompareForm.Designer.cs">
       <DependentUpon>CompareForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="FileSummary.cs" />
     <Compile Include="IdenticalsForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -96,10 +103,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SumResult.cs" />
     <Compile Include="ToolStripRendererMaterial.cs" />
+    <Compile Include="TopMostMessageBox.cs" />
     <Compile Include="Utilities.cs" />
     <EmbeddedResource Include="AboutForm.resx">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="AnalyzedForm.resx">
+      <DependentUpon>AnalyzedForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CompareForm.resx">
       <DependentUpon>CompareForm.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/Hashing/IdenticalsForm.cs b/Hashing/IdenticalsForm.cs
@@ -125,7 +125,14 @@ private void ListIdenticals()
 
         private void CompareForm_Load(object sender, EventArgs e)
         {
-
+            if (Options.CurrentOptions.StayOnTop)
+            {
+                this.TopMost = true;
+            }
+            else
+            {
+                this.TopMost = false;
+            }
         }
 
         private void SumView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)