sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug in EnumFileStreams

pull/303/head
dahall 2022-06-28 15:21:57 -06:00
parent eef1ca871e
commit b2cc426dc3
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
PInvoke/Kernel32/WinBase.File.cs
View File

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