Skip to content

Commit

Permalink
remove some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ZingBallyhoo committed Dec 2, 2023
1 parent 7feecc6 commit 2ab6dc3
Show file tree
Hide file tree
Showing 27 changed files with 49 additions and 27 deletions.
25 changes: 24 additions & 1 deletion TACTLib.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,35 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/TYPE_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=APM/@EntryIndexedValue">APM</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BE/@EntryIndexedValue">BE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BGD/@EntryIndexedValue">BGDL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BGDL/@EntryIndexedValue">BGDL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BLTE/@EntryIndexedValue">BLTE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CAS/@EntryIndexedValue">CAS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CD/@EntryIndexedValue">CD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CDN/@EntryIndexedValue">CDN</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CMF/@EntryIndexedValue">CMF</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUID/@EntryIndexedValue">GUID</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IV/@EntryIndexedValue">IV</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KV/@EntryIndexedValue">KV</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MAR/@EntryIndexedValue">MAR</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MNDX/@EntryIndexedValue">MNDX</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NGDP/@EntryIndexedValue">NGDP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TACT/@EntryIndexedValue">TACT</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TOC/@EntryIndexedValue">TOC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TRG/@EntryIndexedValue">TRG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UID/@EntryIndexedValue">UID</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VFS/@EntryIndexedValue">VFS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CASC/@EntryIndexedValue">CASC</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=CASC/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cdns/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ckey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=decryptor/@EntryIndexedValue">True</s:Boolean>
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Config/BuildConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private void GetFileRecord(string key, out FileRecord? @out) {
@out = null;
return;
}
@out = GetFileRecord(Values[key]);
@out = GetFileRecord(list);
}

private void GetSizeRecord(string key, out SizeRecord? @out) {
Expand Down
1 change: 0 additions & 1 deletion TACTLib/Config/InstallationInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using TACTLib.Protocol;

namespace TACTLib.Config {
public class InstallationInfo {
Expand Down
1 change: 0 additions & 1 deletion TACTLib/Core/Product/MNDX/MARFileNameDB.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Diagnostics;
using System.IO;
using System.Text;
using static TACTLib.Helpers.Extensions;

// https://raw.githubusercontent.com/WoW-Tools/CascLib/master/CascLib/RootHandlers/MNDXRootHandler.cs

Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_52926.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_52926 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_53537.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_53537 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_54255.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_54255 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_54983.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_54983 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_55290.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_55290 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_56957.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_56957 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_60038.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_60038 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_60547.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_60547 : ICMFEncryptionProc
{
public byte[] Key(CMFHeader header, int length)
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_60993.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_60993 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_62065.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_62065 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_62591.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_62591 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_62906.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_62906 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_63372.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_63372 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_63568.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_63568 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_63778.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_63778 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_63869.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_63869 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_64346.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_64346 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_64719.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_64719 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_65302.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_65302 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
2 changes: 1 addition & 1 deletion TACTLib/Core/Product/Tank/CMF/ProCMF_65513.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using static TACTLib.Core.Product.Tank.ContentManifestFile;

namespace TACTLib.Core.Product.Tank.CMF {
[ManifestCryptoAttribute(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
[ManifestCrypto(AutoDetectVersion = true, Product = TACTProduct.Overwatch)]
public class ProCMF_65513 : ICMFEncryptionProc {
public byte[] Key(CMFHeader header, int length) {
byte[] buffer = new byte[length];
Expand Down
1 change: 0 additions & 1 deletion TACTLib/Core/Product/Tank/ProductHandler_Tank.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using TACTLib.Client;
using TACTLib.Client.HandlerArgs;
Expand Down
4 changes: 2 additions & 2 deletions TACTLib/Core/VFS/VFSManifestReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public enum PathEntryFlags {
}

[StructLayout(LayoutKind.Sequential, Pack = 1)]
public unsafe struct ManifestHeader {
public struct ManifestHeader {
/// <summary>
/// Magic identifier. "TVFS"/0x53465654
/// </summary>
Expand Down Expand Up @@ -154,7 +154,7 @@ public class Manifest {

public readonly List<VFSFile> Files;

public unsafe Manifest(ManifestHeader header) {
public Manifest(ManifestHeader header) {
Header = header;

Flags = header.GetFlags();
Expand Down
2 changes: 2 additions & 0 deletions TACTLib/Helpers/UInt32BE.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using System.Buffers.Binary;
using System.Runtime.InteropServices;

namespace TACTLib.Helpers {
[StructLayout(LayoutKind.Sequential)]
public struct UInt32BE
{
private uint m_data;
Expand Down

0 comments on commit 2ab6dc3

Please sign in to comment.