X Tutup
Skip to content

Added minor readability and refactoring fixes to Process.cs #19123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 6 commits into from
Feb 9, 2023
Merged

Added minor readability and refactoring fixes to Process.cs #19123

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1aa6868
Add minor fixes
ArmaanMcleod Feb 9, 2023
de309a4
Remove unused namespaces
ArmaanMcleod Feb 9, 2023
d273a9b
Update src/Microsoft.PowerShell.Commands.Management/commands/manageme…
ArmaanMcleod Feb 9, 2023
0e8efb3
Add switch expression
ArmaanMcleod Feb 9, 2023
e809131
Update assertion with condition and better message
ArmaanMcleod Feb 9, 2023
03e8926
Update src/Microsoft.PowerShell.Commands.Management/commands/manageme…
ArmaanMcleod Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 45 additions & 30 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
using Microsoft.Management.Infrastructure;
using Microsoft.PowerShell.Commands.Internal;
using Microsoft.Win32.SafeHandles;
using DWORD = System.UInt32;
using FileNakedHandle = System.IntPtr;

namespace Microsoft.PowerShell.Commands
{
Expand Down Expand Up @@ -519,14 +517,7 @@ public override Process[] InputObject
[Parameter(ParameterSetName = NameWithUserNameParameterSet, Mandatory = true)]
[Parameter(ParameterSetName = IdWithUserNameParameterSet, Mandatory = true)]
[Parameter(ParameterSetName = InputObjectWithUserNameParameterSet, Mandatory = true)]
public SwitchParameter IncludeUserName
{
get { return _includeUserName; }

set { _includeUserName = value; }
}

private bool _includeUserName = false;
public SwitchParameter IncludeUserName { get; set; }

/// <summary>
/// To display the modules of a process.
Expand Down Expand Up @@ -744,7 +735,10 @@ private static string RetrieveProcessUserName(Process process)
try
{
int error;
if (!Win32Native.OpenProcessToken(process.Handle, TOKEN_QUERY, out processTokenHandler)) { return null; }
if (!Win32Native.OpenProcessToken(process.Handle, TOKEN_QUERY, out processTokenHandler))
{
return null;
}

// Set the default length to be 256, so it will be sufficient for most cases.
int tokenInfoLength = 256;
Expand All @@ -757,7 +751,10 @@ private static string RetrieveProcessUserName(Process process)
Marshal.FreeHGlobal(tokenUserInfo);
tokenUserInfo = Marshal.AllocHGlobal(tokenInfoLength);

if (!Win32Native.GetTokenInformation(processTokenHandler, Win32Native.TOKEN_INFORMATION_CLASS.TokenUser, tokenUserInfo, tokenInfoLength, out tokenInfoLength)) { return null; }
if (!Win32Native.GetTokenInformation(processTokenHandler, Win32Native.TOKEN_INFORMATION_CLASS.TokenUser, tokenUserInfo, tokenInfoLength, out tokenInfoLength))
{
return null;
}
}
else
{
Expand Down Expand Up @@ -1165,7 +1162,10 @@ protected override void ProcessRecord()
SafeGetProcessName(process),
SafeGetProcessId(process));

if (!ShouldProcess(targetString)) { continue; }
if (!ShouldProcess(targetString))
{
continue;
}

try
{
Expand Down Expand Up @@ -1323,7 +1323,10 @@ private bool IsProcessOwnedByCurrentUser(Process process)
}
finally
{
if (ph != IntPtr.Zero) { Win32Native.CloseHandle(ph); }
if (ph != IntPtr.Zero)
{
Win32Native.CloseHandle(ph);
}
}

return false;
Expand Down Expand Up @@ -1483,7 +1486,10 @@ protected override void ProcessRecord()
SafeGetProcessName(process),
SafeGetProcessId(process));

if (!ShouldProcess(targetMessage)) { continue; }
if (!ShouldProcess(targetMessage))
{
continue;
}

// Sometimes Idle process has processid zero,so handle that because we cannot attach debugger to it.
if (process.Id == 0)
Expand All @@ -1498,7 +1504,10 @@ protected override void ProcessRecord()
{
// If the process has exited, we skip it. If the process is from a remote
// machine, then we generate a non-terminating error.
if (process.HasExited) { continue; }
if (process.HasExited)
{
continue;
}
}
catch (NotSupportedException ex)
{
Expand Down Expand Up @@ -1549,8 +1558,7 @@ private void AttachDebuggerToProcess(Process process)
}
catch (CimException e)
{
string message = e.Message;
if (!string.IsNullOrEmpty(message)) { message = message.Trim(); }
string message = e.Message?.Trim();

var errorRecord = new ErrorRecord(
new InvalidOperationException(StringUtil.Format(ProcessResources.DebuggerError, message)),
Expand All @@ -1566,16 +1574,17 @@ private void AttachDebuggerToProcess(Process process)
/// </summary>
private static string MapReturnCodeToErrorMessage(int returnCode)
{
string errorMessage = string.Empty;
switch (returnCode)
string errorMessage = returnCode switch
{
case 2: errorMessage = ProcessResources.AttachDebuggerReturnCode2; break;
case 3: errorMessage = ProcessResources.AttachDebuggerReturnCode3; break;
case 8: errorMessage = ProcessResources.AttachDebuggerReturnCode8; break;
case 9: errorMessage = ProcessResources.AttachDebuggerReturnCode9; break;
case 21: errorMessage = ProcessResources.AttachDebuggerReturnCode21; break;
default: Diagnostics.Assert(false, "Unreachable code."); break;
}
2 => ProcessResources.AttachDebuggerReturnCode2,
3 => ProcessResources.AttachDebuggerReturnCode3,
8 => ProcessResources.AttachDebuggerReturnCode8,
9 => ProcessResources.AttachDebuggerReturnCode9,
21 => ProcessResources.AttachDebuggerReturnCode21,
_ => string.Empty
};

Diagnostics.Assert(!string.IsNullOrEmpty(errorMessage), "Error message should not be null or empty.");

return errorMessage;
}
Expand Down Expand Up @@ -2006,13 +2015,19 @@ protected override void BeginProcessing()
}
else if (ParameterSetName.Equals("UseShellExecute"))
{
if (Verb != null) { startInfo.Verb = Verb; }
if (Verb != null)
{
startInfo.Verb = Verb;
}

startInfo.WindowStyle = _windowstyle;
}

string targetMessage = StringUtil.Format(ProcessResources.StartProcessTarget, startInfo.FileName, startInfo.Arguments.Trim());
if (!ShouldProcess(targetMessage)) { return; }
if (!ShouldProcess(targetMessage))
{
return;
}

Process process = Start(startInfo);

Expand Down Expand Up @@ -2971,7 +2986,7 @@ public override void GetObjectData(
base.GetObjectData(info, context);

ArgumentNullException.ThrowIfNull(info);

info.AddValue("ProcessName", _processName);
}
#endregion Serialization
Expand Down
X Tutup