admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert IsWinPEHost changes

Browse Source
This commit is contained in:
Andrew Schwartzmeyer
2016-07-14 17:34:12 -07:00
parent a9484e45e9
commit 89508ae99d
1 changed files with 16 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/Utils.cs
+16 -50
View File
@@ -62,15 +62,6 @@ namespace System.Management.Automation
return CombineHashCodes(CombineHashCodes(h1, h2, h3, h4), CombineHashCodes(h5, h6, h7, h8));
}
/// <summary>
/// IsWinPEHost indicates if the machine on which PowerShell is hosted is WinPE or not.
/// This is a helper variable used to kep track if the IsWinPE() helper method has
/// already checked for the WinPE specific registry key or not.
/// If the WinPE specific registry key has not yet been checked even
/// once then this variable will point to null.
/// </summary>
internal static bool? isWinPEHost = null;
/// <summary>
/// The existence of the following registry confirms that the host machine is a WinPE
/// HKLM\System\CurrentControlSet\Control\MiniNT
@@ -368,55 +359,30 @@ namespace System.Management.Automation
/// </summary>
internal static bool IsWinPEHost()
{
#if LINUX
return false;
#else
return WinIsWinPEHost();
#endif
}
internal static bool WinIsWinPEHost()
{
RegistryKey winPEKey = null;
if (!isWinPEHost.HasValue)
try
{
try
{
// The existence of the following registry confirms that the host machine is a WinPE
// HKLM\System\CurrentControlSet\Control\MiniNT
winPEKey = Registry.LocalMachine.OpenSubKey(WinPEIdentificationRegKey);
// The existence of the following registry confirms that the host machine is a WinPE
// HKLM\System\CurrentControlSet\Control\MiniNT
winPEKey = Registry.LocalMachine.OpenSubKey(WinPEIdentificationRegKey);
if (null != winPEKey)
{
isWinPEHost = true;
}
else
{
isWinPEHost = false;
}
}
catch (ArgumentException) { }
catch (SecurityException) { }
catch (ObjectDisposedException) { }
finally
return winPEKey != null;
}
catch (ArgumentException) { }
catch (SecurityException) { }
catch (ObjectDisposedException) { }
finally
{
if (winPEKey != null)
{
if (winPEKey != null)
{
winPEKey.Dispose();
}
winPEKey.Dispose();
}
}
if (isWinPEHost.HasValue)
{
return (bool)isWinPEHost;
}
else
{
return false;
}
}
return false;
}
#region Versioning related methods