Leave the input/output/error handles unset when they are not redirected (#20853)

daxian-dbw · web-flow · commit 6a90fd04928a · 2023-12-08T12:20:34.000-08:00
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -2421,45 +2421,40 @@ private static byte[] ConvertEnvVarsToByteArray(StringDictionary sd)
 
         private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods.STARTUPINFO lpStartupInfo, ref int creationFlags)
         {
+            bool hasRedirection = false;
             // RedirectionStandardInput
             if (_redirectstandardinput != null)
             {
+                hasRedirection = true;
                 startinfo.RedirectStandardInput = true;
                 _redirectstandardinput = ResolveFilePath(_redirectstandardinput);
                 lpStartupInfo.hStdInput = GetSafeFileHandleForRedirection(_redirectstandardinput, FileMode.Open);
             }
-            else
-            {
-                lpStartupInfo.hStdInput = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-10), false);
-            }
 
             // RedirectionStandardOutput
             if (_redirectstandardoutput != null)
             {
+                hasRedirection = true;
                 startinfo.RedirectStandardOutput = true;
                 _redirectstandardoutput = ResolveFilePath(_redirectstandardoutput);
                 lpStartupInfo.hStdOutput = GetSafeFileHandleForRedirection(_redirectstandardoutput, FileMode.Create);
             }
-            else
-            {
-                lpStartupInfo.hStdOutput = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-11), false);
-            }
 
             // RedirectionStandardError
             if (_redirectstandarderror != null)
             {
+                hasRedirection = true;
                 startinfo.RedirectStandardError = true;
                 _redirectstandarderror = ResolveFilePath(_redirectstandarderror);
                 lpStartupInfo.hStdError = GetSafeFileHandleForRedirection(_redirectstandarderror, FileMode.Create);
             }
-            else
+
+            if (hasRedirection)
             {
-                lpStartupInfo.hStdError = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-12), false);
+                // Set STARTF_USESTDHANDLES only if there is redirection.
+                lpStartupInfo.dwFlags = 0x100;
             }
 
-            // STARTF_USESTDHANDLES
-            lpStartupInfo.dwFlags = 0x100;
-
             if (startinfo.CreateNoWindow)
             {
                 // No new window: Inherit the parent process's console window
@@ -2805,9 +2800,6 @@ internal struct JOBOBJECT_BASIC_PROCESS_ID_LIST
 
     internal static class ProcessNativeMethods
     {
-        [DllImport(PinvokeDllNames.GetStdHandleDllName, SetLastError = true)]
-        public static extern IntPtr GetStdHandle(int whichHandle);
-
         [DllImport(PinvokeDllNames.CreateProcessWithLogonWDllName, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool CreateProcessWithLogonW(string userName,
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
@@ -33,13 +33,12 @@ internal static void CreateRunAsAdministratorJumpList()
             {
                 try
                 {
-                    TaskbarJumpList.CreateElevatedEntry(ConsoleHostStrings.RunAsAdministrator);
+                    CreateElevatedEntry(ConsoleHostStrings.RunAsAdministrator);
                 }
-                catch (Exception exception)
+                catch (Exception)
                 {
                     // Due to COM threading complexity there might still be sporadic failures but they can be
                     // ignored as creating the JumpList is not critical and persists after its first creation.
-                    Debug.Fail($"Creating 'Run as Administrator' JumpList failed. {exception}");
                 }
             });
 
@@ -48,7 +47,7 @@ internal static void CreateRunAsAdministratorJumpList()
                 thread.SetApartmentState(ApartmentState.STA);
                 thread.Start();
             }
-            catch (System.Threading.ThreadStartException)
+            catch (ThreadStartException)
             {
                 // STA may not be supported on some platforms
             }
@@ -117,7 +116,6 @@ private static void CreateElevatedEntry(string title)
                     var CLSID_EnumerableObjectCollection = new Guid(@"2d3468c1-36a7-43b6-ac24-d3f02fd9607a");
                     const uint CLSCTX_INPROC_HANDLER = 2;
                     const uint CLSCTX_INPROC = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER;
-                    var ComSvrInterface_GUID = new Guid(@"555E2D2B-EE00-47AA-AB2B-39F953F6B339");
                     hResult = CoCreateInstance(ref CLSID_EnumerableObjectCollection, null, CLSCTX_INPROC, ref IID_IUnknown, out object instance);
                     if (hResult < 0)
                     {

Original file line number	Diff line number	Diff line change
`@@ -2421,45 +2421,40 @@ private static byte[] ConvertEnvVarsToByteArray(StringDictionary sd)`
`2421`	`2421`
`2422`	`2422`	`private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods.STARTUPINFO lpStartupInfo, ref int creationFlags)`
`2423`	`2423`	`{`
	`2424`	`+ bool hasRedirection = false;`
`2424`	`2425`	`// RedirectionStandardInput`
`2425`	`2426`	`if (_redirectstandardinput != null)`
`2426`	`2427`	`{`
	`2428`	`+ hasRedirection = true;`
`2427`	`2429`	`startinfo.RedirectStandardInput = true;`
`2428`	`2430`	`_redirectstandardinput = ResolveFilePath(_redirectstandardinput);`
`2429`	`2431`	`lpStartupInfo.hStdInput = GetSafeFileHandleForRedirection(_redirectstandardinput, FileMode.Open);`
`2430`	`2432`	`}`
`2431`		`- else`
`2432`		`- {`
`2433`		`- lpStartupInfo.hStdInput = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-10), false);`
`2434`		`- }`
`2435`	`2433`
`2436`	`2434`	`// RedirectionStandardOutput`
`2437`	`2435`	`if (_redirectstandardoutput != null)`
`2438`	`2436`	`{`
	`2437`	`+ hasRedirection = true;`
`2439`	`2438`	`startinfo.RedirectStandardOutput = true;`
`2440`	`2439`	`_redirectstandardoutput = ResolveFilePath(_redirectstandardoutput);`
`2441`	`2440`	`lpStartupInfo.hStdOutput = GetSafeFileHandleForRedirection(_redirectstandardoutput, FileMode.Create);`
`2442`	`2441`	`}`
`2443`		`- else`
`2444`		`- {`
`2445`		`- lpStartupInfo.hStdOutput = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-11), false);`
`2446`		`- }`
`2447`	`2442`
`2448`	`2443`	`// RedirectionStandardError`
`2449`	`2444`	`if (_redirectstandarderror != null)`
`2450`	`2445`	`{`
	`2446`	`+ hasRedirection = true;`
`2451`	`2447`	`startinfo.RedirectStandardError = true;`
`2452`	`2448`	`_redirectstandarderror = ResolveFilePath(_redirectstandarderror);`
`2453`	`2449`	`lpStartupInfo.hStdError = GetSafeFileHandleForRedirection(_redirectstandarderror, FileMode.Create);`
`2454`	`2450`	`}`
`2455`		`- else`
	`2451`	`+`
	`2452`	`+ if (hasRedirection)`
`2456`	`2453`	`{`
`2457`		`- lpStartupInfo.hStdError = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-12), false);`
	`2454`	`+ // Set STARTF_USESTDHANDLES only if there is redirection.`
	`2455`	`+ lpStartupInfo.dwFlags = 0x100;`
`2458`	`2456`	`}`
`2459`	`2457`
`2460`		`- // STARTF_USESTDHANDLES`
`2461`		`- lpStartupInfo.dwFlags = 0x100;`
`2462`		`-`
`2463`	`2458`	`if (startinfo.CreateNoWindow)`
`2464`	`2459`	`{`
`2465`	`2460`	`// No new window: Inherit the parent process's console window`
`@@ -2805,9 +2800,6 @@ internal struct JOBOBJECT_BASIC_PROCESS_ID_LIST`
`2805`	`2800`
`2806`	`2801`	`internal static class ProcessNativeMethods`
`2807`	`2802`	`{`
`2808`		`- [DllImport(PinvokeDllNames.GetStdHandleDllName, SetLastError = true)]`
`2809`		`- public static extern IntPtr GetStdHandle(int whichHandle);`
`2810`		`-`
`2811`	`2803`	`[DllImport(PinvokeDllNames.CreateProcessWithLogonWDllName, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)]`
`2812`	`2804`	`[return: MarshalAs(UnmanagedType.Bool)]`
`2813`	`2805`	`internal static extern bool CreateProcessWithLogonW(string userName,`
Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,12 @@ internal static void CreateRunAsAdministratorJumpList()`
`33`	`33`	`{`
`34`	`34`	`try`
`35`	`35`	`{`
`36`		`- TaskbarJumpList.CreateElevatedEntry(ConsoleHostStrings.RunAsAdministrator);`
	`36`	`+ CreateElevatedEntry(ConsoleHostStrings.RunAsAdministrator);`
`37`	`37`	`}`
`38`		`- catch (Exception exception)`
	`38`	`+ catch (Exception)`
`39`	`39`	`{`
`40`	`40`	`// Due to COM threading complexity there might still be sporadic failures but they can be`
`41`	`41`	`// ignored as creating the JumpList is not critical and persists after its first creation.`
`42`		`- Debug.Fail($"Creating 'Run as Administrator' JumpList failed. {exception}");`
`43`	`42`	`}`
`44`	`43`	`});`
`45`	`44`
`@@ -48,7 +47,7 @@ internal static void CreateRunAsAdministratorJumpList()`
`48`	`47`	`thread.SetApartmentState(ApartmentState.STA);`
`49`	`48`	`thread.Start();`
`50`	`49`	`}`
`51`		`- catch (System.Threading.ThreadStartException)`
	`50`	`+ catch (ThreadStartException)`
`52`	`51`	`{`
`53`	`52`	`// STA may not be supported on some platforms`
`54`	`53`	`}`
`@@ -117,7 +116,6 @@ private static void CreateElevatedEntry(string title)`
`117`	`116`	`var CLSID_EnumerableObjectCollection = new Guid(@"2d3468c1-36a7-43b6-ac24-d3f02fd9607a");`
`118`	`117`	`const uint CLSCTX_INPROC_HANDLER = 2;`
`119`	`118`	`const uint CLSCTX_INPROC = CLSCTX_INPROC_SERVER \| CLSCTX_INPROC_HANDLER;`
`120`		`- var ComSvrInterface_GUID = new Guid(@"555E2D2B-EE00-47AA-AB2B-39F953F6B339");`
`121`	`119`	`hResult = CoCreateInstance(ref CLSID_EnumerableObjectCollection, null, CLSCTX_INPROC, ref IID_IUnknown, out object instance);`
`122`	`120`	`if (hResult < 0)`
`123`	`121`	`{`