Fix some warnings.

AsYlum- · AsYlum- · commit 6d132b7b1dad · 2025-11-11T18:53:00.000+01:00
diff --git a/Ultima/ASCIIFont.cs b/Ultima/ASCIIFont.cs
@@ -87,7 +87,7 @@ public static unsafe void Initialize()
             using (var reader = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
             {
                 var buffer = new byte[(int)reader.Length];
-                reader.Read(buffer, 0, (int)reader.Length);
+                reader.ReadExactly(buffer, 0, (int)reader.Length);
                 fixed (byte* bin = buffer)
                 {
                     byte* read = bin;
diff --git a/Ultima/Art.cs b/Ultima/Art.cs
@@ -181,7 +181,7 @@ public static bool IsValidStatic(int index)
             }
 
             stream.Seek(4, SeekOrigin.Current);
-            stream.Read(_validBuffer, 0, 4);
+            stream.ReadExactly(_validBuffer, 0, 4);
 
             short width = (short)(_validBuffer[0] | (_validBuffer[1] << 8));
             short height = (short)(_validBuffer[2] | (_validBuffer[3] << 8));
@@ -272,7 +272,7 @@ public static byte[] GetRawLand(int index)
             }
 
             var buffer = new byte[length];
-            stream.Read(buffer, 0, length);
+            stream.ReadExactly(buffer, 0, length);
             stream.Close();
             return buffer;
         }
@@ -344,7 +344,7 @@ public static byte[] GetRawStatic(int index)
             }
 
             var buffer = new byte[length];
-            stream.Read(buffer, 0, length);
+            stream.ReadExactly(buffer, 0, length);
             stream.Close();
             return buffer;
         }
@@ -429,7 +429,7 @@ private static unsafe Bitmap LoadStatic(Stream stream, int length)
                 _streamBuffer = new byte[length];
             }
 
-            stream.Read(_streamBuffer, 0, length);
+            stream.ReadExactly(_streamBuffer, 0, length);
             stream.Close();
 
             Bitmap bmp;
@@ -504,7 +504,7 @@ private static unsafe Bitmap LoadLand(Stream stream, int length)
                 _streamBuffer = new byte[length];
             }
 
-            stream.Read(_streamBuffer, 0, length);
+            stream.ReadExactly(_streamBuffer, 0, length);
             stream.Close();
             fixed (byte* binData = _streamBuffer)
             {
diff --git a/Ultima/Client.cs b/Ultima/Client.cs
@@ -90,7 +90,7 @@ public static int Read(ProcessStream pc, int bytes)
         {
             var buffer = new byte[bytes];
 
-            pc.Read(buffer, 0, bytes);
+            pc.ReadExactly(buffer, 0, bytes);
 
             switch (bytes)
             {
diff --git a/Ultima/Gumps.cs b/Ultima/Gumps.cs
@@ -157,7 +157,7 @@ public static byte[] GetRawGump(int index, out int width, out int height)
                     _streamBuffer = new byte[entry.Length];
                 }
 
-                stream.Read(_streamBuffer, 0, entry.Length);
+                stream.ReadExactly(_streamBuffer, 0, entry.Length);
 
                 var result = UopUtils.Decompress(_streamBuffer);
                 if (result.success is false)
@@ -272,7 +272,7 @@ public static unsafe Bitmap GetGump(int index, Hue hue, bool onlyHueGrayPixels,
                 _colorTable = colorTable = new byte[128];
             }
 
-            stream.Read(streamBuffer, 0, length);
+            stream.ReadExactly(streamBuffer, 0, length);
 
             fixed (ushort* psHueColors = hue.Colors)
             {
@@ -445,7 +445,7 @@ public static unsafe Bitmap GetGump(int index, out bool patched)
                 _streamBuffer = new byte[length];
             }
 
-            stream.Read(_streamBuffer, 0, length);
+            stream.ReadExactly(_streamBuffer, 0, length);
 
             uint width = (uint)entry.Extra1;
             uint height = (uint)entry.Extra2;
diff --git a/Ultima/Hues.cs b/Ultima/Hues.cs
@@ -47,7 +47,7 @@ public static void Initialize()
                     GCHandle gc = GCHandle.Alloc(buffer, GCHandleType.Pinned);
                     try
                     {
-                        fs.Read(buffer, 0, buffer.Length);
+                        fs.ReadExactly(buffer, 0, buffer.Length);
                         long currentPos = 0;
 
                         for (int i = 0; i < blockCount; ++i)
diff --git a/Ultima/RadarCol.cs b/Ultima/RadarCol.cs
@@ -44,7 +44,7 @@ public static void Initialize()
                     Colors = new ushort[fs.Length / 2];
                     GCHandle gc = GCHandle.Alloc(Colors, GCHandleType.Pinned);
                     var buffer = new byte[(int)fs.Length];
-                    fs.Read(buffer, 0, (int)fs.Length);
+                    fs.ReadExactly(buffer, 0, (int)fs.Length);
                     Marshal.Copy(buffer, 0, gc.AddrOfPinnedObject(), (int)fs.Length);
                     gc.Free();
                 }
diff --git a/Ultima/Sound.cs b/Ultima/Sound.cs
@@ -130,8 +130,8 @@ public static UoSound GetSound(int soundId, out bool translated)
             var stringBuffer = new byte[32];
             var buffer = new byte[length];
 
-            stream.Read(stringBuffer, 0, 32);
-            stream.Read(buffer, 0, length);
+            stream.ReadExactly(stringBuffer, 0, 32);
+            stream.ReadExactly(buffer, 0, length);
             stream.Close();
 
             var resultBuffer = new byte[buffer.Length + (waveHeader.Length << 2)];
@@ -233,7 +233,7 @@ public static bool IsValidSound(int soundId, out string name, out bool translate
             }
 
             var stringBuffer = new byte[32];
-            stream.Read(stringBuffer, 0, 32);
+            stream.ReadExactly(stringBuffer, 0, 32);
             stream.Close();
             name = Encoding.ASCII.GetString(stringBuffer); // seems that the null terminator's not being properly recognized :/
             if (name.IndexOf('\0') > 0)
@@ -303,7 +303,7 @@ public static void Add(int id, string name, string file)
             {
                 byte[] resultBuffer = new byte[wav.Length];
                 wav.Seek(0, SeekOrigin.Begin);
-                wav.Read(resultBuffer, 0, (int)wav.Length);
+                wav.ReadExactly(resultBuffer, 0, (int)wav.Length);
 
                 resultBuffer = CheckAndFixWave(resultBuffer);
 
@@ -376,7 +376,7 @@ public static void Save(string path)
                         {
                             m.Seek(headerLength, SeekOrigin.Begin);
                             var resultBuffer = new byte[m.Length - headerLength];
-                            m.Read(resultBuffer, 0, (int)m.Length - headerLength);
+                            m.ReadExactly(resultBuffer, 0, (int)m.Length - headerLength);
                             binmul.Write(resultBuffer);
                         }
 
diff --git a/Ultima/Textures.cs b/Ultima/Textures.cs
@@ -140,7 +140,7 @@ public static unsafe Bitmap GetTexture(int index, out bool patched)
 
             byte[] streamBuffer = new byte[max];
 
-            stream.Read(streamBuffer, 0, max);
+            stream.ReadExactly(streamBuffer, 0, max);
 
             fixed (byte* data = streamBuffer)
             {
diff --git a/Ultima/TileData.cs b/Ultima/TileData.cs
@@ -1321,7 +1321,7 @@ public static unsafe void Initialize()
                 long currentPos = 0;
                 try
                 {
-                    fs.Read(buffer, 0, buffer.Length);
+                    fs.ReadExactly(buffer, 0, buffer.Length);
                     for (int i = 0; i < 0x4000; i += 32)
                     {
                         var ptrHeader = new IntPtr(gc.AddrOfPinnedObject() + currentPos);
diff --git a/Ultima/TileMatrix.cs b/Ultima/TileMatrix.cs
@@ -241,7 +241,7 @@ private void InitStatics()
 
                 GCHandle gc = GCHandle.Alloc(_staticIndex, GCHandleType.Pinned);
                 var buffer = new byte[index.Length];
-                index.Read(buffer, 0, (int)index.Length);
+                index.ReadExactly(buffer, 0, (int)index.Length);
                 Marshal.Copy(buffer, 0, gc.AddrOfPinnedObject(), (int)Math.Min(index.Length, BlockHeight * BlockWidth * 12));
                 gc.Free();
                 for (var i = (int)Math.Min(index.Length, BlockHeight * BlockWidth); i < BlockHeight * BlockWidth; ++i)
@@ -297,7 +297,7 @@ private unsafe HuedTile[][][] ReadStaticBlock(int x, int y)
             GCHandle gc = GCHandle.Alloc(_buffer, GCHandleType.Pinned);
             try
             {
-                _statics.Read(_buffer, 0, length);
+                _statics.ReadExactly(_buffer, 0, length);
 
                 if (_lists == null)
                 {
@@ -496,7 +496,7 @@ private Tile[] ReadLandBlock(int x, int y)
                     _buffer = new byte[192];
                 }
 
-                _map.Read(_buffer, 0, 192);
+                _map.ReadExactly(_buffer, 0, 192);
 
                 Marshal.Copy(_buffer, 0, gc.AddrOfPinnedObject(), 192);
             }
diff --git a/Ultima/TileMatrixPatch.cs b/Ultima/TileMatrixPatch.cs
@@ -193,7 +193,7 @@ private int PatchLand(TileMatrix matrix, string dataPath, string indexPath)
                             _buffer = new byte[192];
                         }
 
-                        fsData.Read(_buffer, 0, 192);
+                        fsData.ReadExactly(_buffer, 0, 192);
 
                         Marshal.Copy(_buffer, 0, gc.AddrOfPinnedObject(), 192);
                     }
@@ -277,7 +277,7 @@ private int PatchStatics(TileMatrix matrix, string dataPath, string indexPath, s
                             _buffer = new byte[length];
                         }
 
-                        fsData.Read(_buffer, 0, length);
+                        fsData.ReadExactly(_buffer, 0, length);
 
                         Marshal.Copy(_buffer, 0, gc.AddrOfPinnedObject(), length);
 
diff --git a/UoFiddler.Plugin.Compare/Classes/SecondArt.cs b/UoFiddler.Plugin.Compare/Classes/SecondArt.cs
@@ -81,7 +81,7 @@ public static bool IsValidStatic(int index)
             }
 
             stream.Seek(4, SeekOrigin.Current);
-            stream.Read(_validBuffer, 0, 4);
+            stream.ReadExactly(_validBuffer, 0, 4);
 
             short width = (short)(_validBuffer[0] | (_validBuffer[1] << 8));
             short height = (short)(_validBuffer[2] | (_validBuffer[3] << 8));
@@ -140,7 +140,7 @@ private static unsafe Bitmap LoadStatic(Stream stream, int length)
                 _streamBuffer = new byte[length];
             }
 
-            stream.Read(_streamBuffer, 0, length);
+            stream.ReadExactly(_streamBuffer, 0, length);
             stream.Close();
 
             fixed (byte* data = _streamBuffer)
@@ -255,7 +255,7 @@ private static unsafe Bitmap LoadLand(Stream stream, int length)
                 _streamBuffer = new byte[length];
             }
 
-            stream.Read(_streamBuffer, 0, length);
+            stream.ReadExactly(_streamBuffer, 0, length);
             stream.Close();
             fixed (byte* binData = _streamBuffer)
             {
diff --git a/UoFiddler.Plugin.Compare/Classes/SecondFileIndex.cs b/UoFiddler.Plugin.Compare/Classes/SecondFileIndex.cs
@@ -119,7 +119,7 @@ public SecondFileIndex(string idxFile, string mulFile, int length)
 
                     GCHandle gc = GCHandle.Alloc(Index, GCHandleType.Pinned);
                     byte[] buffer = new byte[index.Length];
-                    index.Read(buffer, 0, (int)index.Length);
+                    index.ReadExactly(buffer, 0, (int)index.Length);
                     Marshal.Copy(buffer, 0, gc.AddrOfPinnedObject(), (int)Math.Min(IdxLength, length * 12));
                     gc.Free();
 
diff --git a/UoFiddler.Plugin.Compare/Classes/SecondGump.cs b/UoFiddler.Plugin.Compare/Classes/SecondGump.cs
@@ -74,7 +74,7 @@ public static byte[] GetRawGump(int index, out int width, out int height)
             }
 
             byte[] buffer = new byte[length];
-            stream.Read(buffer, 0, length);
+            stream.ReadExactly(buffer, 0, length);
             return buffer;
         }
 
@@ -111,7 +111,7 @@ public static unsafe Bitmap GetGump(int index)
                 _streamBuffer = new byte[length];
             }
 
-            stream.Read(_streamBuffer, 0, length);
+            stream.ReadExactly(_streamBuffer, 0, length);
 
             fixed (byte* data = _streamBuffer)
             {
diff --git a/UoFiddler.Plugin.Compare/Classes/SecondTexture.cs b/UoFiddler.Plugin.Compare/Classes/SecondTexture.cs
@@ -83,7 +83,7 @@ private static unsafe Bitmap LoadTexture(Stream stream, int extra)
                 _streamBuffer = new byte[max];
             }
 
-            stream.Read(_streamBuffer, 0, max);
+            stream.ReadExactly(_streamBuffer, 0, max);
 
             fixed (byte* data = _streamBuffer)
             {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public static unsafe void Initialize()`
`87`	`87`	`using (var reader = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))`
`88`	`88`	`{`
`89`	`89`	`var buffer = new byte[(int)reader.Length];`
`90`		`- reader.Read(buffer, 0, (int)reader.Length);`
	`90`	`+ reader.ReadExactly(buffer, 0, (int)reader.Length);`
`91`	`91`	`fixed (byte* bin = buffer)`
`92`	`92`	`{`
`93`	`93`	`byte* read = bin;`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public static bool IsValidStatic(int index)`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`stream.Seek(4, SeekOrigin.Current);`
`184`		`- stream.Read(_validBuffer, 0, 4);`
	`184`	`+ stream.ReadExactly(_validBuffer, 0, 4);`
`185`	`185`
`186`	`186`	`short width = (short)(_validBuffer[0] \| (_validBuffer[1] << 8));`
`187`	`187`	`short height = (short)(_validBuffer[2] \| (_validBuffer[3] << 8));`
`@@ -272,7 +272,7 @@ public static byte[] GetRawLand(int index)`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`var buffer = new byte[length];`
`275`		`- stream.Read(buffer, 0, length);`
	`275`	`+ stream.ReadExactly(buffer, 0, length);`
`276`	`276`	`stream.Close();`
`277`	`277`	`return buffer;`
`278`	`278`	`}`
`@@ -344,7 +344,7 @@ public static byte[] GetRawStatic(int index)`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`var buffer = new byte[length];`
`347`		`- stream.Read(buffer, 0, length);`
	`347`	`+ stream.ReadExactly(buffer, 0, length);`
`348`	`348`	`stream.Close();`
`349`	`349`	`return buffer;`
`350`	`350`	`}`
`@@ -429,7 +429,7 @@ private static unsafe Bitmap LoadStatic(Stream stream, int length)`
`429`	`429`	`_streamBuffer = new byte[length];`
`430`	`430`	`}`
`431`	`431`
`432`		`- stream.Read(_streamBuffer, 0, length);`
	`432`	`+ stream.ReadExactly(_streamBuffer, 0, length);`
`433`	`433`	`stream.Close();`
`434`	`434`
`435`	`435`	`Bitmap bmp;`
`@@ -504,7 +504,7 @@ private static unsafe Bitmap LoadLand(Stream stream, int length)`
`504`	`504`	`_streamBuffer = new byte[length];`
`505`	`505`	`}`
`506`	`506`
`507`		`- stream.Read(_streamBuffer, 0, length);`
	`507`	`+ stream.ReadExactly(_streamBuffer, 0, length);`
`508`	`508`	`stream.Close();`
`509`	`509`	`fixed (byte* binData = _streamBuffer)`
`510`	`510`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static int Read(ProcessStream pc, int bytes)`
`90`	`90`	`{`
`91`	`91`	`var buffer = new byte[bytes];`
`92`	`92`
`93`		`- pc.Read(buffer, 0, bytes);`
	`93`	`+ pc.ReadExactly(buffer, 0, bytes);`
`94`	`94`
`95`	`95`	`switch (bytes)`
`96`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public static byte[] GetRawGump(int index, out int width, out int height)`
`157`	`157`	`_streamBuffer = new byte[entry.Length];`
`158`	`158`	`}`
`159`	`159`
`160`		`- stream.Read(_streamBuffer, 0, entry.Length);`
	`160`	`+ stream.ReadExactly(_streamBuffer, 0, entry.Length);`
`161`	`161`
`162`	`162`	`var result = UopUtils.Decompress(_streamBuffer);`
`163`	`163`	`if (result.success is false)`
`@@ -272,7 +272,7 @@ public static unsafe Bitmap GetGump(int index, Hue hue, bool onlyHueGrayPixels,`
`272`	`272`	`_colorTable = colorTable = new byte[128];`
`273`	`273`	`}`
`274`	`274`
`275`		`- stream.Read(streamBuffer, 0, length);`
	`275`	`+ stream.ReadExactly(streamBuffer, 0, length);`
`276`	`276`
`277`	`277`	`fixed (ushort* psHueColors = hue.Colors)`
`278`	`278`	`{`
`@@ -445,7 +445,7 @@ public static unsafe Bitmap GetGump(int index, out bool patched)`
`445`	`445`	`_streamBuffer = new byte[length];`
`446`	`446`	`}`
`447`	`447`
`448`		`- stream.Read(_streamBuffer, 0, length);`
	`448`	`+ stream.ReadExactly(_streamBuffer, 0, length);`
`449`	`449`
`450`	`450`	`uint width = (uint)entry.Extra1;`
`451`	`451`	`uint height = (uint)entry.Extra2;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void Initialize()`
`47`	`47`	`GCHandle gc = GCHandle.Alloc(buffer, GCHandleType.Pinned);`
`48`	`48`	`try`
`49`	`49`	`{`
`50`		`- fs.Read(buffer, 0, buffer.Length);`
	`50`	`+ fs.ReadExactly(buffer, 0, buffer.Length);`
`51`	`51`	`long currentPos = 0;`
`52`	`52`
`53`	`53`	`for (int i = 0; i < blockCount; ++i)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static void Initialize()`
`44`	`44`	`Colors = new ushort[fs.Length / 2];`
`45`	`45`	`GCHandle gc = GCHandle.Alloc(Colors, GCHandleType.Pinned);`
`46`	`46`	`var buffer = new byte[(int)fs.Length];`
`47`		`- fs.Read(buffer, 0, (int)fs.Length);`
	`47`	`+ fs.ReadExactly(buffer, 0, (int)fs.Length);`
`48`	`48`	`Marshal.Copy(buffer, 0, gc.AddrOfPinnedObject(), (int)fs.Length);`
`49`	`49`	`gc.Free();`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public static unsafe Bitmap GetTexture(int index, out bool patched)`
`140`	`140`
`141`	`141`	`byte[] streamBuffer = new byte[max];`
`142`	`142`
`143`		`- stream.Read(streamBuffer, 0, max);`
	`143`	`+ stream.ReadExactly(streamBuffer, 0, max);`
`144`	`144`
`145`	`145`	`fixed (byte* data = streamBuffer)`
`146`	`146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1321,7 +1321,7 @@ public static unsafe void Initialize()`
`1321`	`1321`	`long currentPos = 0;`
`1322`	`1322`	`try`
`1323`	`1323`	`{`
`1324`		`- fs.Read(buffer, 0, buffer.Length);`
	`1324`	`+ fs.ReadExactly(buffer, 0, buffer.Length);`
`1325`	`1325`	`for (int i = 0; i < 0x4000; i += 32)`
`1326`	`1326`	`{`
`1327`	`1327`	`var ptrHeader = new IntPtr(gc.AddrOfPinnedObject() + currentPos);`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private void InitStatics()`
`241`	`241`
`242`	`242`	`GCHandle gc = GCHandle.Alloc(_staticIndex, GCHandleType.Pinned);`
`243`	`243`	`var buffer = new byte[index.Length];`
`244`		`- index.Read(buffer, 0, (int)index.Length);`
	`244`	`+ index.ReadExactly(buffer, 0, (int)index.Length);`
`245`	`245`	`Marshal.Copy(buffer, 0, gc.AddrOfPinnedObject(), (int)Math.Min(index.Length, BlockHeight * BlockWidth * 12));`
`246`	`246`	`gc.Free();`
`247`	`247`	`for (var i = (int)Math.Min(index.Length, BlockHeight * BlockWidth); i < BlockHeight * BlockWidth; ++i)`
`@@ -297,7 +297,7 @@ private unsafe HuedTile[][][] ReadStaticBlock(int x, int y)`
`297`	`297`	`GCHandle gc = GCHandle.Alloc(_buffer, GCHandleType.Pinned);`
`298`	`298`	`try`
`299`	`299`	`{`
`300`		`- _statics.Read(_buffer, 0, length);`
	`300`	`+ _statics.ReadExactly(_buffer, 0, length);`
`301`	`301`
`302`	`302`	`if (_lists == null)`
`303`	`303`	`{`
`@@ -496,7 +496,7 @@ private Tile[] ReadLandBlock(int x, int y)`
`496`	`496`	`_buffer = new byte[192];`
`497`	`497`	`}`
`498`	`498`
`499`		`- _map.Read(_buffer, 0, 192);`
	`499`	`+ _map.ReadExactly(_buffer, 0, 192);`
`500`	`500`
`501`	`501`	`Marshal.Copy(_buffer, 0, gc.AddrOfPinnedObject(), 192);`
`502`	`502`	`}`