Update EndianBinaryIO to v1.1.1

Kermalis · Kermalis · commit 24d872760ae5 · 2020-09-11T05:31:22.000-04:00
diff --git a/VG Music Studio/Core/Debug.cs b/VG Music Studio/Core/Debug.cs
@@ -90,7 +90,7 @@ public static void GBAGameCodeScan(string path)
                 {
                     using (var reader = new EndianBinaryReader(File.OpenRead(file)))
                     {
-                        string gameCode = reader.ReadString(3, 0xAC);
+                        string gameCode = reader.ReadString(3, false, 0xAC);
                         char regionCode = reader.ReadChar(0xAF);
                         byte version = reader.ReadByte(0xBC);
                         scans.Add(string.Format("Code: {0}\tRegion: {1}\tVersion: {2}\tFile: {3}", gameCode, regionCode, version, file));
diff --git a/VG Music Studio/Core/GBA/AlphaDream/Config.cs b/VG Music Studio/Core/GBA/AlphaDream/Config.cs
@@ -34,7 +34,7 @@ public Config(byte[] rom)
                 {
                     ROM = rom;
                     Reader = new EndianBinaryReader(new MemoryStream(rom));
-                    GameCode = Reader.ReadString(4, 0xAC);
+                    GameCode = Reader.ReadString(4, false, 0xAC);
                     Version = Reader.ReadByte(0xBC);
                     gcv = $"{GameCode}_{Version:X2}";
                     var yaml = new YamlStream();
diff --git a/VG Music Studio/Core/GBA/MP2K/Config.cs b/VG Music Studio/Core/GBA/MP2K/Config.cs
@@ -36,7 +36,7 @@ public Config(byte[] rom)
                 {
                     ROM = rom;
                     Reader = new EndianBinaryReader(new MemoryStream(rom));
-                    GameCode = Reader.ReadString(4, 0xAC);
+                    GameCode = Reader.ReadString(4, false, 0xAC);
                     Version = Reader.ReadByte(0xBC);
                     gcv = $"{GameCode}_{Version:X2}";
                     var yaml = new YamlStream();
diff --git a/VG Music Studio/Core/NDS/DSE/SWD.cs b/VG Music Studio/Core/NDS/DSE/SWD.cs
@@ -325,7 +325,7 @@ public SWD(string path)
         {
             using (var reader = new EndianBinaryReader(new MemoryStream(File.ReadAllBytes(path))))
             {
-                Type = reader.ReadString(4);
+                Type = reader.ReadString(4, false);
                 Unknown = reader.ReadBytes(4);
                 Length = reader.ReadUInt32();
                 Version = reader.ReadUInt16();
@@ -362,7 +362,7 @@ private static long FindChunk(EndianBinaryReader reader, string chunk)
             reader.BaseStream.Position = 0;
             while (reader.BaseStream.Position < reader.BaseStream.Length)
             {
-                string str = reader.ReadString(4);
+                string str = reader.ReadString(4, false);
                 if (str == chunk)
                 {
                     pos = reader.BaseStream.Position - 4;
diff --git a/VG Music Studio/Core/NDS/SDAT/FileHeader.cs b/VG Music Studio/Core/NDS/SDAT/FileHeader.cs
@@ -14,7 +14,7 @@ internal class FileHeader : IBinarySerializable
 
         public void Read(EndianBinaryReader er)
         {
-            FileType = er.ReadString(4);
+            FileType = er.ReadString(4, false);
             er.Endianness = EndianBinaryIO.Endianness.BigEndian;
             Endianness = er.ReadUInt16();
             er.Endianness = Endianness == 0xFFFE ? EndianBinaryIO.Endianness.LittleEndian : EndianBinaryIO.Endianness.BigEndian;
diff --git a/VG Music Studio/Core/NDS/SDAT/SDAT.cs b/VG Music Studio/Core/NDS/SDAT/SDAT.cs
@@ -50,7 +50,7 @@ public Record(EndianBinaryReader er, long baseOffset)
             public void Read(EndianBinaryReader er)
             {
                 long baseOffset = er.BaseStream.Position;
-                BlockType = er.ReadString(4);
+                BlockType = er.ReadString(4, false);
                 BlockSize = er.ReadInt32();
                 RecordOffsets = er.ReadInt32s(8);
                 Padding = er.ReadBytes(24);
@@ -139,7 +139,7 @@ public class WaveArchiveInfo
             public void Read(EndianBinaryReader er)
             {
                 long baseOffset = er.BaseStream.Position;
-                BlockType = er.ReadString(4);
+                BlockType = er.ReadString(4, false);
                 BlockSize = er.ReadInt32();
                 InfoOffsets = er.ReadInt32s(8);
                 er.ReadBytes(24);
diff --git a/VG Music Studio/Core/NDS/SDAT/SSEQ.cs b/VG Music Studio/Core/NDS/SDAT/SSEQ.cs
@@ -17,7 +17,7 @@ public SSEQ(byte[] bytes)
             using (var er = new EndianBinaryReader(new MemoryStream(bytes)))
             {
                 FileHeader = er.ReadObject<FileHeader>();
-                BlockType = er.ReadString(4);
+                BlockType = er.ReadString(4, false);
                 BlockSize = er.ReadInt32();
                 DataOffset = er.ReadInt32();
 
diff --git a/VG Music Studio/Core/NDS/SDAT/SWAR.cs b/VG Music Studio/Core/NDS/SDAT/SWAR.cs
@@ -48,7 +48,7 @@ public SWAR(byte[] bytes)
             using (var er = new EndianBinaryReader(new MemoryStream(bytes)))
             {
                 FileHeader = er.ReadObject<FileHeader>();
-                BlockType = er.ReadString(4);
+                BlockType = er.ReadString(4, false);
                 BlockSize = er.ReadInt32();
                 Padding = er.ReadBytes(32);
                 NumWaves = er.ReadInt32();
diff --git a/VG Music Studio/VG Music Studio.csproj b/VG Music Studio/VG Music Studio.csproj
@@ -58,8 +58,8 @@
     <StartupObject>Kermalis.VGMusicStudio.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EndianBinaryIO, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EndianBinaryIO.1.0.3\lib\netstandard2.0\EndianBinaryIO.dll</HintPath>
+    <Reference Include="EndianBinaryIO, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EndianBinaryIO.1.1.1\lib\netstandard2.0\EndianBinaryIO.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
diff --git a/VG Music Studio/packages.config b/VG Music Studio/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EndianBinaryIO" version="1.0.3" targetFramework="net48" />
+  <package id="EndianBinaryIO" version="1.1.1" targetFramework="net48" />
   <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net471" />
   <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net471" />
   <package id="NAudio" version="1.10.0" targetFramework="net461" />

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static void GBAGameCodeScan(string path)`
`90`	`90`	`{`
`91`	`91`	`using (var reader = new EndianBinaryReader(File.OpenRead(file)))`
`92`	`92`	`{`
`93`		`- string gameCode = reader.ReadString(3, 0xAC);`
	`93`	`+ string gameCode = reader.ReadString(3, false, 0xAC);`
`94`	`94`	`char regionCode = reader.ReadChar(0xAF);`
`95`	`95`	`byte version = reader.ReadByte(0xBC);`
`96`	`96`	`scans.Add(string.Format("Code: {0}\tRegion: {1}\tVersion: {2}\tFile: {3}", gameCode, regionCode, version, file));`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public Config(byte[] rom)`
`34`	`34`	`{`
`35`	`35`	`ROM = rom;`
`36`	`36`	`Reader = new EndianBinaryReader(new MemoryStream(rom));`
`37`		`- GameCode = Reader.ReadString(4, 0xAC);`
	`37`	`+ GameCode = Reader.ReadString(4, false, 0xAC);`
`38`	`38`	`Version = Reader.ReadByte(0xBC);`
`39`	`39`	`gcv = $"{GameCode}_{Version:X2}";`
`40`	`40`	`var yaml = new YamlStream();`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public Config(byte[] rom)`
`36`	`36`	`{`
`37`	`37`	`ROM = rom;`
`38`	`38`	`Reader = new EndianBinaryReader(new MemoryStream(rom));`
`39`		`- GameCode = Reader.ReadString(4, 0xAC);`
	`39`	`+ GameCode = Reader.ReadString(4, false, 0xAC);`
`40`	`40`	`Version = Reader.ReadByte(0xBC);`
`41`	`41`	`gcv = $"{GameCode}_{Version:X2}";`
`42`	`42`	`var yaml = new YamlStream();`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public SWD(string path)`
`325`	`325`	`{`
`326`	`326`	`using (var reader = new EndianBinaryReader(new MemoryStream(File.ReadAllBytes(path))))`
`327`	`327`	`{`
`328`		`- Type = reader.ReadString(4);`
	`328`	`+ Type = reader.ReadString(4, false);`
`329`	`329`	`Unknown = reader.ReadBytes(4);`
`330`	`330`	`Length = reader.ReadUInt32();`
`331`	`331`	`Version = reader.ReadUInt16();`
`@@ -362,7 +362,7 @@ private static long FindChunk(EndianBinaryReader reader, string chunk)`
`362`	`362`	`reader.BaseStream.Position = 0;`
`363`	`363`	`while (reader.BaseStream.Position < reader.BaseStream.Length)`
`364`	`364`	`{`
`365`		`- string str = reader.ReadString(4);`
	`365`	`+ string str = reader.ReadString(4, false);`
`366`	`366`	`if (str == chunk)`
`367`	`367`	`{`
`368`	`368`	`pos = reader.BaseStream.Position - 4;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal class FileHeader : IBinarySerializable`
`14`	`14`
`15`	`15`	`public void Read(EndianBinaryReader er)`
`16`	`16`	`{`
`17`		`- FileType = er.ReadString(4);`
	`17`	`+ FileType = er.ReadString(4, false);`
`18`	`18`	`er.Endianness = EndianBinaryIO.Endianness.BigEndian;`
`19`	`19`	`Endianness = er.ReadUInt16();`
`20`	`20`	`er.Endianness = Endianness == 0xFFFE ? EndianBinaryIO.Endianness.LittleEndian : EndianBinaryIO.Endianness.BigEndian;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public SSEQ(byte[] bytes)`
`17`	`17`	`using (var er = new EndianBinaryReader(new MemoryStream(bytes)))`
`18`	`18`	`{`
`19`	`19`	`FileHeader = er.ReadObject<FileHeader>();`
`20`		`- BlockType = er.ReadString(4);`
	`20`	`+ BlockType = er.ReadString(4, false);`
`21`	`21`	`BlockSize = er.ReadInt32();`
`22`	`22`	`DataOffset = er.ReadInt32();`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public SWAR(byte[] bytes)`
`48`	`48`	`using (var er = new EndianBinaryReader(new MemoryStream(bytes)))`
`49`	`49`	`{`
`50`	`50`	`FileHeader = er.ReadObject<FileHeader>();`
`51`		`- BlockType = er.ReadString(4);`
	`51`	`+ BlockType = er.ReadString(4, false);`
`52`	`52`	`BlockSize = er.ReadInt32();`
`53`	`53`	`Padding = er.ReadBytes(32);`
`54`	`54`	`NumWaves = er.ReadInt32();`