From b2cc426dc38a48322b947582bb57c90ecbea8bc0 Mon Sep 17 00:00:00 2001
From: dahall <dahall@byu.net>
Date: Tue, 28 Jun 2022 15:21:57 -0600
Subject: [PATCH] Fixed bug in EnumFileStreams

---
 PInvoke/Kernel32/WinBase.File.cs | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/PInvoke/Kernel32/WinBase.File.cs b/PInvoke/Kernel32/WinBase.File.cs
index 2ac8df8b..ce0189ba 100644
--- a/PInvoke/Kernel32/WinBase.File.cs
+++ b/PInvoke/Kernel32/WinBase.File.cs
@@ -1193,17 +1193,14 @@ namespace Vanara.PInvoke
 			var h = FindFirstStream(fileName, STREAM_INFO_LEVELS.FindStreamInfoStandard, out var data);
 			if (h.IsInvalid)
 			{
-				var err = Win32Error.GetLastError();
-				if (err == Win32Error.ERROR_HANDLE_EOF)
-					yield break;
-				else
-					err.ThrowIfFailed();
+				Win32Error.ThrowLastErrorUnless(Win32Error.ERROR_HANDLE_EOF);
+				yield break;
 			}
-			while (FindNextStream(h, out data))
+			do
+			{
 				yield return data;
-			var err2 = Win32Error.GetLastError();
-			if (err2 != Win32Error.ERROR_HANDLE_EOF)
-				err2.ThrowIfFailed();
+			} while (FindNextStream(h, out data));
+			Win32Error.ThrowLastErrorUnless(Win32Error.ERROR_HANDLE_EOF);
 		}
 
 		/// <summary>Creates an enumeration of all the hard links to the specified file.</summary>
@@ -3318,7 +3315,7 @@ namespace Vanara.PInvoke
 			public IntPtr pvCallbackContext;
 
 			/// <summary>Provides a default instance with size field set.</summary>
-			public static readonly COPYFILE2_EXTENDED_PARAMETERS Default = new COPYFILE2_EXTENDED_PARAMETERS { dwSize = (uint)Marshal.SizeOf(typeof(COPYFILE2_EXTENDED_PARAMETERS)) };
+			public static readonly COPYFILE2_EXTENDED_PARAMETERS Default = new() { dwSize = (uint)Marshal.SizeOf(typeof(COPYFILE2_EXTENDED_PARAMETERS)) };
 		}
 
 		/// <summary>
@@ -3967,8 +3964,8 @@ namespace Vanara.PInvoke
 		[StructLayout(LayoutKind.Sequential)]
 		public struct FILE_ID_128
 		{
-			private ulong id0;
-			private ulong id1;
+			private readonly ulong id0;
+			private readonly ulong id1;
 
 			/// <summary>
 			/// <para>A byte array containing the 128 bit identifier.</para>
@@ -3977,13 +3974,13 @@ namespace Vanara.PInvoke
 			{
 				get
 				{
-					using (var pin = new PinnedObject(id0))
-						return ((IntPtr)pin).ToArray<byte>(16);
+					using PinnedObject pin = new(id0);
+					return ((IntPtr)pin).ToArray<byte>(16);
 				}
 				set
 				{
-					using (var pin = new PinnedObject(id0))
-						Marshal.Copy(value, 0, pin, 16);
+					using PinnedObject pin = new(id0);
+					Marshal.Copy(value, 0, pin, 16);
 				}
 			}
 		}
@@ -4192,7 +4189,7 @@ namespace Vanara.PInvoke
 			}
 
 			/// <summary>Provides a default instance with size field set.</summary>
-			public static readonly FILE_ID_DESCRIPTOR Default = new FILE_ID_DESCRIPTOR { dwSize = (uint)Marshal.SizeOf(typeof(FILE_ID_DESCRIPTOR)) };
+			public static readonly FILE_ID_DESCRIPTOR Default = new() { dwSize = (uint)Marshal.SizeOf(typeof(FILE_ID_DESCRIPTOR)) };
 		}
 
 		/// <summary>
@@ -4853,7 +4850,7 @@ namespace Vanara.PInvoke
 			}
 
 			/// <summary>The default instance with size and version set.</summary>
-			public static readonly FILE_REMOTE_PROTOCOL_INFO Default = new FILE_REMOTE_PROTOCOL_INFO { StructureSize = (ushort)Marshal.SizeOf(typeof(FILE_REMOTE_PROTOCOL_INFO)), StructureVersion = 2 };
+			public static readonly FILE_REMOTE_PROTOCOL_INFO Default = new() { StructureSize = (ushort)Marshal.SizeOf(typeof(FILE_REMOTE_PROTOCOL_INFO)), StructureVersion = 2 };
 		}
 
 		/// <summary>