diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8792a27a..4c12366b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: run: nuget restore # Build the solution - name: Build - run: msbuild /p:Configuration=Release /p:Platform="Any CPU" /p:TargetFrameworkVersion=v4.6.2 GARbro.sln + run: msbuild /p:Configuration=Release /p:Platform="Any CPU" GARbro.sln # Publish the artifacts - name: Publish Artifact if: success() diff --git a/ArcFormats/AIRNovel/ArcAIR.cs b/ArcFormats/AIRNovel/ArcAIR.cs index addbe36c1..980783fdc 100644 --- a/ArcFormats/AIRNovel/ArcAIR.cs +++ b/ArcFormats/AIRNovel/ArcAIR.cs @@ -89,8 +89,8 @@ public override ArcFile TryOpen (ArcView file) SharpZip.ZipFile zip = null; try { - SharpZip.ZipStrings.CodePage = Encoding.UTF8.CodePage; - zip = new SharpZip.ZipFile (input); + var sc = SharpZip.StringCodec.FromCodePage (Encoding.UTF8.CodePage); + zip = new SharpZip.ZipFile (input, false, sc); var files = zip.Cast().Where (z => !z.IsDirectory); bool has_encrypted = false; var dir = new List(); diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index b5a4f579e..52659b011 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -1,5 +1,6 @@  + Debug @@ -9,7 +10,7 @@ Properties GameRes.Formats ArcFormats - v4.6.1 + v4.7.2 512 ..\ @@ -51,61 +52,74 @@ MinimumRecommendedRules.ruleset - - ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll + + ..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - ..\packages\NAudio.1.7.3\lib\net35\NAudio.dll + + ..\packages\NAudio.2.2.1\lib\net472\NAudio.dll - - ..\packages\NVorbis.0.10.4\lib\net45\NVorbis.dll + + ..\packages\NAudio.Asio.2.2.1\lib\netstandard2.0\NAudio.Asio.dll + + + ..\packages\NAudio.Core.2.2.1\lib\netstandard2.0\NAudio.Core.dll + + + ..\packages\NAudio.Midi.2.2.1\lib\netstandard2.0\NAudio.Midi.dll + + + ..\packages\NAudio.Wasapi.2.2.1\lib\netstandard2.0\NAudio.Wasapi.dll + + + ..\packages\NAudio.WinForms.2.2.1\lib\net472\NAudio.WinForms.dll + + + ..\packages\NAudio.WinMM.2.2.1\lib\netstandard2.0\NAudio.WinMM.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NVorbis.0.10.5\lib\net45\NVorbis.dll - - ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll + + ..\packages\Snappier.1.3.0\lib\net472\Snappier.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll + @@ -113,8 +127,8 @@ - - ..\packages\ZstdNet.1.4.5\lib\net45\ZstdNet.dll + + ..\packages\ZstdSharp.Port.0.8.7\lib\net462\ZstdSharp.dll @@ -1378,18 +1392,12 @@ exit 0 if not exist "$(TargetDir)\GameData" mkdir "$(TargetDir)\GameData" xcopy "$(ProjectDir)\Resources\*" "$(TargetDir)\GameData\" /D /Y >NUL - 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 diff --git a/ArcFormats/AudioWMA.cs b/ArcFormats/AudioWMA.cs index dca846a32..f80ffe3d5 100644 --- a/ArcFormats/AudioWMA.cs +++ b/ArcFormats/AudioWMA.cs @@ -136,7 +136,7 @@ protected override IMFSourceReader CreateReader (MediaFoundationReaderSettings s private static long GetDuration (IMFSourceReader reader) { - var variantPtr = Marshal.AllocHGlobal (MarshalHelpers.SizeOf()); + var variantPtr = Marshal.AllocHGlobal (Marshal.SizeOf()); try { int hResult = reader.GetPresentationAttribute (MediaFoundationInterop.MF_SOURCE_READER_MEDIASOURCE, @@ -146,7 +146,7 @@ private static long GetDuration (IMFSourceReader reader) if (hResult != 0) Marshal.ThrowExceptionForHR (hResult); - var variant = MarshalHelpers.PtrToStructure (variantPtr); + var variant = Marshal.PtrToStructure (variantPtr); return (long)variant.Value; } finally diff --git a/ArcFormats/Nexas/ArcPAC.cs b/ArcFormats/Nexas/ArcPAC.cs index 2aa5fded1..3857ab17a 100644 --- a/ArcFormats/Nexas/ArcPAC.cs +++ b/ArcFormats/Nexas/ArcPAC.cs @@ -313,7 +313,7 @@ static private byte[] HuffmanDecode (byte[] packed, int unpacked_size) static private byte[] ZstdDecompress (Stream s, uint unpackedSize) { - using (var ds = new ZstdNet.DecompressionStream (s)) + using (var ds = new ZstdSharp.DecompressionStream (s)) { var dst = new byte[unpackedSize]; ds.Read (dst, 0, dst.Length); diff --git a/ArcFormats/NitroPlus/ArcNPK.cs b/ArcFormats/NitroPlus/ArcNPK.cs index 19e038d84..98ab17280 100644 --- a/ArcFormats/NitroPlus/ArcNPK.cs +++ b/ArcFormats/NitroPlus/ArcNPK.cs @@ -527,7 +527,7 @@ private void NextSegment () m_stream = new DeflateStream (m_stream, CompressionMode.Decompress); break; case 3: - m_stream = new ZstdNet.DecompressionStream (m_stream); + m_stream = new ZstdSharp.DecompressionStream (m_stream); break; } } diff --git a/ArcFormats/PkWare/ArcZIP.cs b/ArcFormats/PkWare/ArcZIP.cs index 86c72c207..9d254de1c 100644 --- a/ArcFormats/PkWare/ArcZIP.cs +++ b/ArcFormats/PkWare/ArcZIP.cs @@ -126,8 +126,8 @@ public override ArcFile TryOpen (ArcView file) internal ArcFile OpenZipArchive (ArcView file, Stream input) { - SharpZip.ZipStrings.CodePage = Properties.Settings.Default.ZIPEncodingCP; - var zip = new SharpZip.ZipFile (input); + var sc = SharpZip.StringCodec.FromCodePage (Properties.Settings.Default.ZIPEncodingCP); + var zip = new SharpZip.ZipFile (input, false, sc); try { var files = zip.Cast().Where (z => !z.IsDirectory); diff --git a/ArcFormats/Properties/Settings.Designer.cs b/ArcFormats/Properties/Settings.Designer.cs index 2c870f61b..8fba100ae 100644 --- a/ArcFormats/Properties/Settings.Designer.cs +++ b/ArcFormats/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GameRes.Formats.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -585,20 +585,7 @@ public string BELLTitle { this["BELLTitle"] = value; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string BELLDATATitle - { - get { - return ((string)(this["BELLDATATitle"])); - } - set { - this["BELLDATATitle"] = value; - } - } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -862,5 +849,17 @@ public string TIM2AlphaFormat { this["TIM2AlphaFormat"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string BELLDATATitle { + get { + return ((string)(this["BELLDATATitle"])); + } + set { + this["BELLDATATitle"] = value; + } + } } } diff --git a/ArcFormats/Properties/Settings.settings b/ArcFormats/Properties/Settings.settings index 504574122..35cbe9922 100644 --- a/ArcFormats/Properties/Settings.settings +++ b/ArcFormats/Properties/Settings.settings @@ -209,5 +209,8 @@ RGBA + + + \ No newline at end of file diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs index accb3959c..1a0328873 100644 --- a/ArcFormats/Strings/arcStrings.Designer.cs +++ b/ArcFormats/Strings/arcStrings.Designer.cs @@ -754,14 +754,14 @@ public static string SGLabelEncoding { /// /// Looks up a localized string similar to Choose Tim2 image alpha format. - /// It can't be read correctly from the file. + ///It can't be read correctly from the file.. /// public static string Tim2AlphaFormat { get { return ResourceManager.GetString("Tim2AlphaFormat", resourceCulture); } } - + /// /// Looks up a localized string similar to Hex number. /// diff --git a/ArcFormats/VnMaker/ArcZIP.cs b/ArcFormats/VnMaker/ArcZIP.cs index e8ac81f51..4b13bf3b4 100644 --- a/ArcFormats/VnMaker/ArcZIP.cs +++ b/ArcFormats/VnMaker/ArcZIP.cs @@ -102,8 +102,8 @@ IBinaryStream DeobfuscateStream (IBinaryStream file, byte[] key) internal ArcFile OpenZipArchive (ArcView file, Stream input) { - SharpZip.ZipStrings.CodePage = Properties.Settings.Default.ZIPEncodingCP; - var zip = new SharpZip.ZipFile (input); + var sc = SharpZip.StringCodec.FromCodePage (Properties.Settings.Default.ZIPEncodingCP); + var zip = new SharpZip.ZipFile (input, false, sc); try { var files = zip.Cast().Where (z => !z.IsDirectory); diff --git a/ArcFormats/YuRis/ArcYPF.cs b/ArcFormats/YuRis/ArcYPF.cs index bc8646280..c9c12131b 100644 --- a/ArcFormats/YuRis/ArcYPF.cs +++ b/ArcFormats/YuRis/ArcYPF.cs @@ -31,7 +31,6 @@ using GameRes.Compression; using GameRes.Formats.Strings; using GameRes.Utility; -using Snappy; namespace GameRes.Formats.YuRis { @@ -185,7 +184,7 @@ public override Stream OpenEntry (ArcFile arc, Entry entry) { var compress_data = new byte[entry.Size]; input.Read(compress_data, 0, compress_data.Length); - var decomprrss_data = SnappyCodec.Uncompress(compress_data); + var decomprrss_data = Snappier.Snappy.DecompressToArray (compress_data); input = new BinMemoryStream(decomprrss_data, entry.Name); break; } diff --git a/ArcFormats/app.config b/ArcFormats/app.config index ef1cc1611..5f0b48d7a 100644 --- a/ArcFormats/app.config +++ b/ArcFormats/app.config @@ -31,9 +31,6 @@ shift-jis - - None - @@ -209,36 +206,35 @@ 932 - RGBA + RGBA + + + - + - - - - - - + + - - + + - - + + - - + + - - + + diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config index 74a50b67b..c23913ab4 100644 --- a/ArcFormats/packages.config +++ b/ArcFormats/packages.config @@ -1,18 +1,25 @@  - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Console/App.config b/Console/App.config index 45437954e..de277144e 100644 --- a/Console/App.config +++ b/Console/App.config @@ -1,6 +1,6 @@ - + diff --git a/Console/GARbro.Console.csproj b/Console/GARbro.Console.csproj index 1e0788c2f..c19a1fa72 100644 --- a/Console/GARbro.Console.csproj +++ b/Console/GARbro.Console.csproj @@ -9,7 +9,7 @@ Properties GARbro GARbro.Console - v4.6.1 + v4.7.2 512 publish\ true diff --git a/Experimental/Experimental.csproj b/Experimental/Experimental.csproj index b6643c322..06dfa1677 100644 --- a/Experimental/Experimental.csproj +++ b/Experimental/Experimental.csproj @@ -9,7 +9,7 @@ Properties GameRes.Extra ArcExtra - v4.6.1 + v4.7.2 512 @@ -49,11 +49,11 @@ MinimumRecommendedRules.ruleset - - ..\packages\Concentus.1.1.7\lib\portable-net45+win+wpa81+wp80\Concentus.dll + + ..\packages\Concentus.2.2.2\lib\net452\Concentus.dll - - ..\packages\Concentus.Oggfile.1.0.4\lib\net45\Concentus.Oggfile.dll + + ..\packages\Concentus.Oggfile.1.0.6\lib\net452\Concentus.Oggfile.dll ..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.dll @@ -61,75 +61,33 @@ ..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.Cab.dll - - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - - ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll - - ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll - - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - - - ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll @@ -138,12 +96,9 @@ - - ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll - - - ..\packages\ZstdNet.1.4.5\lib\net45\ZstdNet.dll + + ..\packages\ZstdSharp.Port.0.8.7\lib\net462\ZstdSharp.dll @@ -176,6 +131,8 @@ + + PreserveNewest @@ -209,16 +166,6 @@ - - - PreserveNewest - - - - - PreserveNewest - - ipt @@ -235,15 +182,6 @@ exit 0 $(ProjectDir)Artemis\IPT - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - @@ -256,21 +194,11 @@ exit 0 - + 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 diff --git a/Experimental/Opus/AudioOPUS.cs b/Experimental/Opus/AudioOPUS.cs index 41bab8f60..b8742c0fd 100644 --- a/Experimental/Opus/AudioOPUS.cs +++ b/Experimental/Opus/AudioOPUS.cs @@ -26,6 +26,7 @@ using System; using System.ComponentModel.Composition; using System.IO; +using Concentus; using Concentus.Oggfile; using Concentus.Structs; @@ -58,7 +59,7 @@ public override SoundInput TryOpen (IBinaryStream file) // int rate = header.ToInt32 (header_pos+0xC); int rate = 48000; file.Position = 0; - var decoder = OpusDecoder.Create (rate, channels); + var decoder = OpusCodecFactory.CreateDecoder (rate, channels); var ogg_in = new OpusOggReadStream (decoder, file.AsStream); var pcm = new MemoryStream(); try diff --git a/Experimental/SakanaGL/ArcSX.cs b/Experimental/SakanaGL/ArcSX.cs index 44ef1e65d..a36fe961c 100644 --- a/Experimental/SakanaGL/ArcSX.cs +++ b/Experimental/SakanaGL/ArcSX.cs @@ -123,10 +123,10 @@ public override Stream OpenEntry (ArcFile arc, Entry entry) internal static byte[] UnpackZstd (byte[] data) { int unpacked_size = BigEndian.ToInt32 (data, 0); - using (var dec = new ZstdNet.Decompressor()) + using (var dec = new ZstdSharp.Decompressor()) { - var packed = new ArraySegment (data, 4, data.Length - 4); - return dec.Unwrap (packed, unpacked_size); + var packed = new Span (data, 4, data.Length - 4); + return dec.Unwrap (packed, unpacked_size).ToArray(); } } diff --git a/Experimental/app.config b/Experimental/app.config index 741af0dff..95adc84d3 100644 --- a/Experimental/app.config +++ b/Experimental/app.config @@ -4,12 +4,32 @@ - + - + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/Experimental/packages.config b/Experimental/packages.config index a6bfb5955..112d6f110 100644 --- a/Experimental/packages.config +++ b/Experimental/packages.config @@ -1,32 +1,14 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/Experimental/x64/libzstd.dll b/Experimental/x64/libzstd.dll deleted file mode 100644 index a5def68eb..000000000 Binary files a/Experimental/x64/libzstd.dll and /dev/null differ diff --git a/Experimental/x86/libzstd.dll b/Experimental/x86/libzstd.dll deleted file mode 100644 index 55c5669ca..000000000 Binary files a/Experimental/x86/libzstd.dll and /dev/null differ diff --git a/GUI/App.config b/GUI/App.config index c702f3290..9a6e720db 100644 --- a/GUI/App.config +++ b/GUI/App.config @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + @@ -99,8 +99,8 @@ - - + + diff --git a/GUI/AutoComplete.cs b/GUI/AutoComplete.cs index 72c713d5f..af90dd0d0 100644 --- a/GUI/AutoComplete.cs +++ b/GUI/AutoComplete.cs @@ -48,11 +48,11 @@ public ExtAutoCompleteBox () public bool IsTextBoxFocused { - get { return (bool)GetValue (HasFocusProperty); } - private set { SetValue (HasFocusProperty, value); } + get { return (bool)GetValue (IsTextBoxFocusedProperty); } + private set { SetValue (IsTextBoxFocusedProperty, value); } } - public static readonly DependencyProperty HasFocusProperty = + public static readonly DependencyProperty IsTextBoxFocusedProperty = DependencyProperty.RegisterAttached ("IsTextBoxFocused", typeof(bool), typeof(ExtAutoCompleteBox), new UIPropertyMetadata()); protected override void OnKeyDown (KeyEventArgs e) diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj index 8291753f4..c081bda24 100644 --- a/GUI/GARbro.GUI.csproj +++ b/GUI/GARbro.GUI.csproj @@ -9,7 +9,7 @@ Properties GARbro.GUI GARbro.GUI - v4.6.1 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -89,22 +89,61 @@ - - ..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - ..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll + + ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.dll - - ..\packages\NAudio.1.10.0\lib\net35\NAudio.dll + + ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.Core.dll + + + ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll + + + ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.Sensors.dll + + + ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.Shell.dll + + + ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.ShellExtensions.dll + + + ..\packages\NAudio.2.2.1\lib\net472\NAudio.dll + + + ..\packages\NAudio.Asio.2.2.1\lib\netstandard2.0\NAudio.Asio.dll + + + ..\packages\NAudio.Core.2.2.1\lib\netstandard2.0\NAudio.Core.dll + + + ..\packages\NAudio.Midi.2.2.1\lib\netstandard2.0\NAudio.Midi.dll + + + ..\packages\NAudio.Wasapi.2.2.1\lib\netstandard2.0\NAudio.Wasapi.dll + + + ..\packages\NAudio.WinForms.2.2.1\lib\net472\NAudio.WinForms.dll + + + ..\packages\NAudio.WinMM.2.2.1\lib\netstandard2.0\NAudio.WinMM.dll + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + - ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll + ..\packages\WPFToolkits.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll - ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Layout.Toolkit.dll + ..\packages\WPFToolkits.3.5.50211.1\lib\System.Windows.Controls.Layout.Toolkit.dll @@ -112,14 +151,12 @@ - - 4.0 - + - ..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll + ..\packages\WPFToolkits.3.5.50211.1\lib\WPFToolkit.dll @@ -309,23 +346,6 @@ False - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - @@ -347,11 +367,4 @@ exit 0 - \ No newline at end of file diff --git a/GUI/MainWindow.xaml b/GUI/MainWindow.xaml index 1d9d6285f..0794df069 100644 --- a/GUI/MainWindow.xaml +++ b/GUI/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:jv="clr-namespace:JustView" xmlns:s="clr-namespace:GARbro.GUI.Strings" xmlns:p="clr-namespace:GARbro.GUI.Properties" - Title="GARbro" MinHeight="250" ResizeMode="CanResizeWithGrip" + Title="GARbro-Mod" MinHeight="250" ResizeMode="CanResizeWithGrip" Loaded="WindowLoaded" KeyDown="WindowKeyDown" AllowDrop="True" Drop="OnDropEvent" diff --git a/GUI/Properties/Settings.Designer.cs b/GUI/Properties/Settings.Designer.cs index ec0b8a0cb..bfc80ad05 100644 --- a/GUI/Properties/Settings.Designer.cs +++ b/GUI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GARbro.GUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.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/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs index 9ffc54d43..af8b11031 100644 --- a/GUI/Strings/guiStrings.Designer.cs +++ b/GUI/Strings/guiStrings.Designer.cs @@ -790,7 +790,7 @@ public static string MsgFiles2 { } /// - /// Looks up a localized string similar to Image {0} x {1} x {2}bpp. + /// Looks up a localized string similar to Image {0} x {1} x {2}bpp [{3}]. /// public static string MsgImageSize { get { @@ -1210,6 +1210,15 @@ public static string TextNewVersion { } } + /// + /// Looks up a localized string similar to OK. + /// + public static string TextOK { + get { + return ResourceManager.GetString("TextOK", resourceCulture); + } + } + /// /// Looks up a localized string similar to Archive parameters. /// @@ -1318,6 +1327,24 @@ public static string TooltipForward { } } + /// + /// Looks up a localized string similar to Archive. + /// + public static string Type_archive { + get { + return ResourceManager.GetString("Type_archive", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Audio. + /// + public static string Type_audio { + get { + return ResourceManager.GetString("Type_audio", resourceCulture); + } + } + /// /// Looks up a localized string similar to <DIR>. /// @@ -1328,7 +1355,16 @@ public static string Type_directory { } /// - /// Looks up a localized string similar to none. + /// Looks up a localized string similar to Image. + /// + public static string Type_image { + get { + return ResourceManager.GetString("Type_image", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to NONE. /// public static string Type_NONE { get { @@ -1336,6 +1372,24 @@ public static string Type_NONE { } } + /// + /// Looks up a localized string similar to Script. + /// + public static string Type_script { + get { + return ResourceManager.GetString("Type_script", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Video. + /// + public static string Type_video { + get { + return ResourceManager.GetString("Type_video", resourceCulture); + } + } + /// /// Looks up a localized string similar to Scale large images to fit window. /// diff --git a/GUI/Strings/guiStrings.ja-JP.resx b/GUI/Strings/guiStrings.ja-JP.resx index 4ff1dda7a..c6e30bfab 100644 --- a/GUI/Strings/guiStrings.ja-JP.resx +++ b/GUI/Strings/guiStrings.ja-JP.resx @@ -560,7 +560,7 @@ Overwrite? Assign file type - none + NONE none @@ -697,4 +697,22 @@ Overwrite? Scale large images to fit window + + アーカイブ + + + オーディオ + + + 画像 + + + スクリプト + + + 確認 + + + ビデオ + \ No newline at end of file diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx index df00a7646..45b7ed68f 100644 --- a/GUI/Strings/guiStrings.ko-KR.resx +++ b/GUI/Strings/guiStrings.ko-KR.resx @@ -388,7 +388,7 @@ 미디어 변환 - 파일 변환 + 파일 변환 {0} 멀티미디어 변환 오류 @@ -545,6 +545,12 @@ 환경설정 + + 이미지 뷰어 + + + 큰 이미지 파일을 창 크기에 맞춤 + 아카이브 @@ -557,10 +563,10 @@ 스크립트 - - 이미지 뷰어 + + OK - - 큰 이미지 파일을 창 크기에 맞춤 + + Video \ No newline at end of file diff --git a/GUI/Strings/guiStrings.resx b/GUI/Strings/guiStrings.resx index 484755bfb..ee9f55670 100644 --- a/GUI/Strings/guiStrings.resx +++ b/GUI/Strings/guiStrings.resx @@ -447,7 +447,7 @@ Overwrite? Assign file type - none + NONE Destination directory @@ -551,4 +551,22 @@ Overwrite? Scale large images to fit window + + Archive + + + Audio + + + Image + + + Script + + + OK + + + Video + \ No newline at end of file diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx index c19cdebd8..3473f0f0d 100644 --- a/GUI/Strings/guiStrings.ru-RU.resx +++ b/GUI/Strings/guiStrings.ru-RU.resx @@ -123,6 +123,9 @@ Извлечь + + OK + _Закрыть @@ -216,6 +219,9 @@ {0} извлечён в {1} + + Извлечён {0} файл + Извлекаются файлы из {0} @@ -270,6 +276,9 @@ Ошибка при создании архива + + <DIR> + Кодировка текста @@ -282,9 +291,6 @@ Извлечь из архива - - OK - Параметры архива @@ -315,15 +321,6 @@ Создание архива {0} - - архив - - - изображение - - - сценарий - Открыть... @@ -342,24 +339,15 @@ _Справка - - Извлечён {0} файл - Извлечено {0} файла - - Извлечено {0} файлов - {0} файл {0} файла - - {0} файлов - Вы действительно хотите удалить эти файлы? @@ -372,9 +360,6 @@ Удалено {0} файла - - Удалено {0} файлов - Подогнать размер окна под изображение @@ -426,21 +411,18 @@ Лицензия - - звук - не удалось интерпретировать формат аудио - - Пропускать файлы, не поддавшиеся конверсии. - Среди выбранных файлов нет мультимедиа. Аудио-файлы будут преобразованы в WAV, MP3 или OGG. + + Пропускать файлы, не поддавшиеся конверсии. + Нет файлов, подходящих под маску "{0}" @@ -450,9 +432,6 @@ {0} файла добавлено к выбранным - - {0} файлов добавлено к выбранным - Маска для имён файлов @@ -527,9 +506,6 @@ Проверить обновления... - - Не удалось обновить базу форматов. - Обновления недоступны. @@ -554,6 +530,9 @@ Перейти на страницу загрузки + + Не удалось обновить базу форматов. + Применить @@ -572,4 +551,34 @@ Масштабировать большие изображения + + архив + + + звук + + + изображение + + + сценарий + + + OK + + + Извлечено {0} файлов + + + {0} файлов + + + Удалено {0} файлов + + + {0} файлов добавлено к выбранным + + + Video + \ No newline at end of file diff --git a/GUI/Strings/guiStrings.zh-Hans.resx b/GUI/Strings/guiStrings.zh-Hans.resx index fd99d7d7e..24e62f377 100644 --- a/GUI/Strings/guiStrings.zh-Hans.resx +++ b/GUI/Strings/guiStrings.zh-Hans.resx @@ -439,8 +439,7 @@ 选择文件 - 提取{0}时 - 发生错误。 + 提取{0}时发生错误。 {1} @@ -456,6 +455,9 @@ 正在播放 {0} / {3} / {2}bps / {1}Hz {0}=filename, {1}=sampling rate, {2}=bitrate, {3}=total time + + 项目主页 + 用代号选择文件…… @@ -503,9 +505,6 @@ 检查更新…… - - 更新下载失败。 - 无可用更新。 @@ -530,6 +529,9 @@ 访问下载页面 + + 更新下载失败。 + 应用 @@ -542,25 +544,28 @@ 偏好设置 + + 图像查看器 + + + 缩放大图以适应窗口 + 档案 音频 - - 视频 - 图像 脚本 - - 图像查看器 + + 确认 - - 缩放大图以适应窗口 + + 视频 - + \ No newline at end of file diff --git a/GUI/packages.config b/GUI/packages.config index e54fbbafb..3e3cc0f5a 100644 --- a/GUI/packages.config +++ b/GUI/packages.config @@ -1,7 +1,15 @@  - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/GameRes/GameRes.csproj b/GameRes/GameRes.csproj index 90d244406..1a5447428 100644 --- a/GameRes/GameRes.csproj +++ b/GameRes/GameRes.csproj @@ -9,7 +9,7 @@ Properties GameRes GameRes - v4.6.1 + v4.7.2 512 ..\ @@ -46,17 +46,44 @@ MinimumRecommendedRules.ruleset - - ..\packages\NAudio.1.10.0\lib\net35\NAudio.dll + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll + + + ..\packages\NAudio.2.2.1\lib\net472\NAudio.dll + + + ..\packages\NAudio.Asio.2.2.1\lib\netstandard2.0\NAudio.Asio.dll + + + ..\packages\NAudio.Core.2.2.1\lib\netstandard2.0\NAudio.Core.dll + + + ..\packages\NAudio.Midi.2.2.1\lib\netstandard2.0\NAudio.Midi.dll + + + ..\packages\NAudio.Wasapi.2.2.1\lib\netstandard2.0\NAudio.Wasapi.dll + + + ..\packages\NAudio.WinForms.2.2.1\lib\net472\NAudio.WinForms.dll + + + ..\packages\NAudio.WinMM.2.2.1\lib\netstandard2.0\NAudio.WinMM.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + @@ -131,11 +158,4 @@ perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) exit 0 - \ No newline at end of file diff --git a/GameRes/Properties/Settings.Designer.cs b/GameRes/Properties/Settings.Designer.cs index 032258836..46fe0780b 100644 --- a/GameRes/Properties/Settings.Designer.cs +++ b/GameRes/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GameRes.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/GameRes/app.config b/GameRes/app.config index 7c7361cde..c064e08ff 100644 --- a/GameRes/app.config +++ b/GameRes/app.config @@ -1,4 +1,4 @@ - + @@ -18,4 +18,13 @@ - + + + + + + + + + + diff --git a/GameRes/packages.config b/GameRes/packages.config index 076090416..a5d7ca189 100644 --- a/GameRes/packages.config +++ b/GameRes/packages.config @@ -1,5 +1,14 @@  - - + + + + + + + + + + + \ No newline at end of file diff --git a/Image.Convert/App.config b/Image.Convert/App.config index 45437954e..de277144e 100644 --- a/Image.Convert/App.config +++ b/Image.Convert/App.config @@ -1,6 +1,6 @@ - + diff --git a/Image.Convert/Image.Convert.csproj b/Image.Convert/Image.Convert.csproj index 644fc4456..92417e3d4 100644 --- a/Image.Convert/Image.Convert.csproj +++ b/Image.Convert/Image.Convert.csproj @@ -9,7 +9,7 @@ Properties Image.Convert Image.Convert - v4.6.1 + v4.7.2 512 @@ -69,11 +69,4 @@ - \ No newline at end of file diff --git a/Legacy/Legacy.csproj b/Legacy/Legacy.csproj index ffa5f99e2..6606f24bd 100644 --- a/Legacy/Legacy.csproj +++ b/Legacy/Legacy.csproj @@ -9,7 +9,7 @@ Properties GameRes.Legacy ArcLegacy - v4.6.1 + v4.7.2 512 @@ -44,14 +44,30 @@ true - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll + + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll + @@ -361,11 +377,4 @@ perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) exit 0 - \ No newline at end of file diff --git a/Legacy/app.config b/Legacy/app.config index 741af0dff..a3aede632 100644 --- a/Legacy/app.config +++ b/Legacy/app.config @@ -4,12 +4,24 @@ - + - + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/Legacy/packages.config b/Legacy/packages.config index 8803282ee..7e3839a4c 100644 --- a/Legacy/packages.config +++ b/Legacy/packages.config @@ -1,4 +1,9 @@  - + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 76845eb3e..69951819f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ GARbro Visual Novels resource browser. -Requires .NET Framework v4.6 or newer (https://www.microsoft.com/net) +Requires .NET Framework v4.7.2 or newer (https://dotnet.microsoft.com/en-us/download/dotnet-framework/net472) [Supported formats](https://morkt.github.io/GARbro/supported.html) diff --git a/SchemeTool/App.config b/SchemeTool/App.config index 18d3b8dd9..3845a9472 100644 --- a/SchemeTool/App.config +++ b/SchemeTool/App.config @@ -1,22 +1,30 @@  - + + + + + - + + + + + - - + + - \ No newline at end of file + diff --git a/SchemeTool/SchemeTool.csproj b/SchemeTool/SchemeTool.csproj index 11b6fa298..166439207 100644 --- a/SchemeTool/SchemeTool.csproj +++ b/SchemeTool/SchemeTool.csproj @@ -8,10 +8,11 @@ Exe SchemeTool SchemeTool - v4.6.1 + v4.7.2 512 true true + AnyCPU @@ -34,19 +35,19 @@ - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll diff --git a/SchemeTool/packages.config b/SchemeTool/packages.config index 5324bbbe9..1af333b89 100644 --- a/SchemeTool/packages.config +++ b/SchemeTool/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file