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

Simplified GetEnvironmentStrings

pull/83/head
David Hall 2019-07-31 20:36:02 -06:00
parent 620d9dde7f
commit bbe5f6002c
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PInvoke/Kernel32/ProcessEnv.cs
View File

@ -119,9 +119,13 @@ namespace Vanara.PInvoke
/// <para>If the function fails, the return value is NULL.</para>
/// </returns>
// LPTCH WINAPI GetEnvironmentStrings(void); https://msdn.microsoft.com/en-us/library/windows/desktop/ms683187(v=vs.85).aspx
[DllImport(Lib.Kernel32, SetLastError = false, CharSet = CharSet.Auto)]
[PInvokeData("WinBase.h", MSDNShortId = "ms683187")]
public static extern EnvironmentStrings GetEnvironmentStrings();
public static string[] GetEnvironmentStrings()
{
var ptr = InternalGetEnvironmentStrings();
try { return ptr.ToStringEnum().ToArray(); }
finally { FreeEnvironmentStrings(ptr); }
}
/// <summary>Retrieves the contents of the specified variable from the environment block of the calling process.</summary>
/// <param name="lpName">The name of the environment variable.</param>
@ -358,29 +362,8 @@ namespace Vanara.PInvoke
[DllImport(Lib.Kernel32, SetLastError = false, EntryPoint = "GetCommandLine", CharSet = CharSet.Auto)]
private static extern IntPtr GetCommandLineInternal();
/// <summary>Represents a block of environment strings obtained by <see cref="GetEnvironmentStrings"/> and freed by <see cref="FreeEnvironmentStrings"/>.</summary>
/// <seealso cref="Vanara.InteropServices.GenericSafeHandle"/>
/// <seealso cref="System.Collections.Generic.IEnumerable{T}"/>
public sealed class EnvironmentStrings : GenericSafeHandle, IEnumerable<string>
{
/// <summary>Initializes a new instance of the <see cref="EnvironmentStrings"/> class.</summary>
public EnvironmentStrings() : this(IntPtr.Zero) { }
/// <summary>Initializes a new instance of the <see cref="EnvironmentStrings"/> class.</summary>
/// <param name="handle">The handle.</param>
public EnvironmentStrings(IntPtr handle) : base(handle, FreeEnvironmentStrings) { }
/// <summary>Gets the value.</summary>
/// <value>The value.</value>
public IEnumerable<string> Value => handle.ToStringEnum();
/// <summary>Returns an enumerator that iterates through the collection.</summary>
/// <returns>A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.</returns>
public IEnumerator<string> GetEnumerator() => Value.GetEnumerator();
/// <summary>Returns an enumerator that iterates through a collection.</summary>
/// <returns>An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.</returns>
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
}
[DllImport(Lib.Kernel32, SetLastError = false, EntryPoint = "GetEnvironmentStrings", CharSet = CharSet.Auto)]
[PInvokeData("WinBase.h", MSDNShortId = "ms683187")]
private static extern IntPtr InternalGetEnvironmentStrings();
}
}

6
UnitTests/PInvoke/Kernel32/ProcessEnvTests.cs
View File

@ -24,12 +24,12 @@ namespace Vanara.PInvoke.Tests
}
[Test]
public void GetEnvironmentStringsTest()
public void GetSetEnvironmentStringsTest()
{
var es = GetEnvironmentStrings();
Assert.That(es.IsInvalid, Is.False);
Assert.That(es.Value, Is.Not.Empty);
Assert.That(es, Is.Not.Empty);
TestContext.WriteLine(string.Join("\r\n", es));
Assert.That(SetEnvironmentStrings(es), ResultIs.Successful);
}
[Test]