github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge c1b7f1adfb into e85ed40be5

Browse source
This commit is contained in:
nvidiattx 2018-07-13 02:18:08 +00:00 • committed by GitHub
commit 4058cd233c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 62 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -156,8 +156,9 @@
<HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
<Aliases>global</Aliases> <Aliases>global</Aliases>
</Reference> </Reference>
<Reference Include="Windows"> <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
<HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17134.0\Windows.winmd</HintPath>
</Reference> </Reference>
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj"> <ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">
<Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project> <Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project>

47
src/Greenshot.Gfx/Murmur3.cs
View file

@ -64,13 +64,16 @@ namespace Greenshot.Gfx
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void AddBytes(byte one, byte two, byte three, byte four) public void AddBytes(byte one, byte two, byte three, byte four)
{ {
var k = (uint)(one | two << 8 | three << 16 | four << 24); unchecked
k *= C1; {
k = RotateLeft(k, R1); var k = (uint)(one | two << 8 | three << 16 | four << 24);
k *= C2; k *= C1;
_hash ^= k; k = RotateLeft(k, R1);
_hash = RotateLeft(_hash, R2); k *= C2;
_hash = _hash * M + N; _hash ^= k;
_hash = RotateLeft(_hash, R2);
_hash = _hash * M + N;
}
} }
/// <summary> /// <summary>
@ -81,11 +84,14 @@ namespace Greenshot.Gfx
/// <param name="three">third byte</param> /// <param name="three">third byte</param>
public void AddTrailingBytes(byte one, byte two = 0, byte three = 0) public void AddTrailingBytes(byte one, byte two = 0, byte three = 0)
{ {
var k = (uint)(one | two << 8 | three << 16); unchecked
k *= C1; {
k = RotateLeft(k, R1); var k = (uint) (one | two << 8 | three << 16);
k *= C2; k *= C1;
_hash ^= k; k = RotateLeft(k, R1);
k *= C2;
_hash ^= k;
}
} }
/// <inheritdoc /> /// <inheritdoc />
@ -126,13 +132,16 @@ namespace Greenshot.Gfx
{ {
get get
{ {
var hash = _hash ^ _length; unchecked
hash ^= hash >> 16; {
hash *= 0x85ebca6b; var hash = _hash ^ _length;
hash ^= hash >> 13; hash ^= hash >> 16;
hash *= 0xc2b2ae35; hash *= 0x85ebca6b;
hash ^= hash >> 16; hash ^= hash >> 13;
return hash; hash *= 0xc2b2ae35;
hash ^= hash >> 16;
return hash;
}
} }
} }

2
src/Greenshot.Tests/CommandlineTests.cs
View file

@ -51,7 +51,7 @@ namespace Greenshot.Tests
[Fact] [Fact]
public void TestLanguageOption() public void TestLanguageOption()
{ {
var arguments = new[] { "-language", "de-DE" }; var arguments = new[] { "--language", "de-DE" };
CommandlineCaptureOptions captureOptions = null; CommandlineCaptureOptions captureOptions = null;
CommandlineOptions commandlineOptions = null; CommandlineOptions commandlineOptions = null;

8
src/Greenshot.Tests/UpdateTests.cs
View file

@ -3,6 +3,10 @@ using System.ServiceModel.Syndication;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using Dapplo.HttpExtensions; using Dapplo.HttpExtensions;
using Dapplo.Ini;
using Dapplo.Language;
using Greenshot.Addons;
using Greenshot.Addons.Core;
using Greenshot.Components; using Greenshot.Components;
using Xunit; using Xunit;
@ -20,7 +24,9 @@ namespace Greenshot.Tests
[Fact] [Fact]
public void UpdateTest() public void UpdateTest()
{ {
var updateService = new UpdateService(null, null); var testConfig = new IniConfig("GreenShotTest", "testconfig");
var testLangLoader = new LanguageLoader("GreenShotTest", "en_US");
var updateService = new UpdateService(IniConfig.Current.Get<ICoreConfiguration>(), LanguageLoader.Current.Get<IGreenshotLanguage>());
using (var reader = XmlReader.Create(@"TestFiles\project-feed.xml")) using (var reader = XmlReader.Create(@"TestFiles\project-feed.xml"))
{ {
var feed = SyndicationFeed.Load(reader); var feed = SyndicationFeed.Load(reader);

3
src/Greenshot/Components/UpdateService.cs
View file

@ -202,7 +202,8 @@ namespace Greenshot.Components
{ {
BetaVersion = version; BetaVersion = version;
} }
if ("rc".Equals(type, StringComparison.OrdinalIgnoreCase)) Regex rcReg = new Regex(@"^rc\d*$",RegexOptions.IgnoreCase);
if (rcReg.IsMatch(type))
{ {
ReleaseCandidateVersion = version; ReleaseCandidateVersion = version;
} }

12
src/Greenshot/Greenshot.csproj
View file

@ -183,8 +183,8 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath> <HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
@ -192,8 +192,8 @@
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath> <HintPath>..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
@ -439,7 +439,9 @@
<None Include="Languages\language-zh-tw.xml"> <None Include="Languages\language-zh-tw.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" /> <None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj"> <ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">

28
src/Greenshot/packages.config
View file

@ -50,19 +50,19 @@
<package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net461" /> <package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Svg" version="2.3.0" targetFramework="net461" /> <package id="Svg" version="2.3.0" targetFramework="net461" />
<package id="System.Collections" version="4.0.11" targetFramework="net461" /> <package id="System.Collections" version="4.3.0" targetFramework="net461" />
<package id="System.Console" version="4.0.0" targetFramework="net461" /> <package id="System.Console" version="4.3.1" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" /> <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" /> <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" /> <package id="System.IO" version="4.3.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" /> <package id="System.Linq" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" /> <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.0.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" /> <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" /> <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" /> <package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" /> <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" /> <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" /> <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
<package id="Tools.InnoSetup" version="5.5.9" targetFramework="net461" /> <package id="Tools.InnoSetup" version="5.6.1" targetFramework="net461" />
</packages> </packages>