Moved Terminal under Utils

Author: gave92

src/Files.App/UserControls/TerminalView.xaml.cs

@@ -1,6 +1,7 @@
 using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Helpers;
-using Files.App.Terminal;
+using Files.App.Utils.Terminal;
+using Files.App.Utils.Terminal.ConPTY;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
@@ -114,7 +115,7 @@ private async Task ResizeTask()
 
 		public WebView2 WebView => WebViewControl;
 
-		private Terminal.Terminal _terminal;
+		private Terminal _terminal;
 		private BufferedReader _reader;
 
 		public TerminalView()
@@ -130,7 +131,7 @@ private async void WebViewControl_LoadedAsync(object sender, Microsoft.UI.Xaml.R
 			WebViewControl.NavigationStarting += WebViewControl_NavigationStarting;
 			WebViewControl.CoreWebView2.SetVirtualHostNameToFolderMapping(
 				"terminal.files",
-				Path.Combine(Package.Current.InstalledLocation.Path, "Files.App", "Terminal", "UI"),
+				Path.Combine(Package.Current.InstalledLocation.Path, "Files.App", "Utils", "Terminal", "UI"),
 				CoreWebView2HostResourceAccessKind.DenyCors);
 			WebViewControl.Source = new Uri("http://terminal.files/index.html");
 
@@ -350,7 +351,7 @@ private void StartShellProcess(TerminalSize size, ShellProfile profile)
 				? $"\"{profile.Location}\" {profile.Arguments}"
 				: profile.Arguments;
 
-			_terminal = new Terminal.Terminal();
+			_terminal = new Terminal();
 			_terminal.OutputReady += (s, e) =>
 			{
 				_reader = new BufferedReader(_terminal.ConsoleOutStream, OutputReceivedCallback, true);

src/Files.App/Terminal/BufferedReader.cs renamed to src/Files.App/Utils/Terminal/BufferedReader.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Files.App.Terminal
+namespace Files.App.Utils.Terminal
 {
 	/// <summary>
 	/// Code modified from https://github.com/felixse/FluentTerminal

src/Files.App/Terminal/ConPTY/Native/ConsoleApi.cs renamed to src/Files.App/Utils/Terminal/ConPTY/Native/ConsoleApi.cs

@@ -1,7 +1,7 @@
 using Microsoft.Win32.SafeHandles;
 using System.Runtime.InteropServices;
 
-namespace Files.App.Terminal.Native
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// PInvoke signatures for win32 console api
@@ -16,7 +16,7 @@ static class ConsoleApi
 		internal static extern bool AllocConsole();
 
 		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern IntPtr GetConsoleWindow();
+		internal static extern nint GetConsoleWindow();
 
 		[DllImport("kernel32.dll", SetLastError = true)]
 		internal static extern SafeFileHandle GetStdHandle(int nStdHandle);

src/Files.App/Terminal/ConPTY/Native/ProcessApi.cs renamed to src/Files.App/Utils/Terminal/ConPTY/Native/ProcessApi.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Files.App.Terminal.Native
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// PInvoke signatures for win32 process api
@@ -14,37 +14,37 @@ static class ProcessApi
 		internal struct STARTUPINFOEX
 		{
 			public STARTUPINFO StartupInfo;
-			public IntPtr lpAttributeList;
+			public nint lpAttributeList;
 		}
 
 		[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 		internal struct STARTUPINFO
 		{
-			public Int32 cb;
+			public int cb;
 			public string lpReserved;
 			public string lpDesktop;
 			public string lpTitle;
-			public Int32 dwX;
-			public Int32 dwY;
-			public Int32 dwXSize;
-			public Int32 dwYSize;
-			public Int32 dwXCountChars;
-			public Int32 dwYCountChars;
-			public Int32 dwFillAttribute;
-			public Int32 dwFlags;
-			public Int16 wShowWindow;
-			public Int16 cbReserved2;
-			public IntPtr lpReserved2;
-			public IntPtr hStdInput;
-			public IntPtr hStdOutput;
-			public IntPtr hStdError;
+			public int dwX;
+			public int dwY;
+			public int dwXSize;
+			public int dwYSize;
+			public int dwXCountChars;
+			public int dwYCountChars;
+			public int dwFillAttribute;
+			public int dwFlags;
+			public short wShowWindow;
+			public short cbReserved2;
+			public nint lpReserved2;
+			public nint hStdInput;
+			public nint hStdOutput;
+			public nint hStdError;
 		}
 
 		[StructLayout(LayoutKind.Sequential)]
 		internal struct PROCESS_INFORMATION
 		{
-			public IntPtr hProcess;
-			public IntPtr hThread;
+			public nint hProcess;
+			public nint hThread;
 			public int dwProcessId;
 			public int dwThreadId;
 		}
@@ -53,34 +53,34 @@ internal struct PROCESS_INFORMATION
 		internal struct SECURITY_ATTRIBUTES
 		{
 			public int nLength;
-			public IntPtr lpSecurityDescriptor;
+			public nint lpSecurityDescriptor;
 			public int bInheritHandle;
 		}
 
 		[DllImport("kernel32.dll", SetLastError = true)]
 		[return: MarshalAs(UnmanagedType.Bool)]
 		internal static extern bool InitializeProcThreadAttributeList(
-			IntPtr lpAttributeList, int dwAttributeCount, int dwFlags, ref IntPtr lpSize);
+			nint lpAttributeList, int dwAttributeCount, int dwFlags, ref nint lpSize);
 
 		[DllImport("kernel32.dll", SetLastError = true)]
 		[return: MarshalAs(UnmanagedType.Bool)]
 		internal static extern bool UpdateProcThreadAttribute(
-			IntPtr lpAttributeList, uint dwFlags, IntPtr attribute, IntPtr lpValue,
-			IntPtr cbSize, IntPtr lpPreviousValue, IntPtr lpReturnSize);
+			nint lpAttributeList, uint dwFlags, nint attribute, nint lpValue,
+			nint cbSize, nint lpPreviousValue, nint lpReturnSize);
 
 		[DllImport("kernel32.dll")]
 		[return: MarshalAs(UnmanagedType.Bool)]
 		internal static extern bool CreateProcess(
 			string lpApplicationName, string lpCommandLine, ref SECURITY_ATTRIBUTES lpProcessAttributes,
 			ref SECURITY_ATTRIBUTES lpThreadAttributes, bool bInheritHandles, uint dwCreationFlags,
-			IntPtr lpEnvironment, string lpCurrentDirectory, [In] ref STARTUPINFOEX lpStartupInfo,
+			nint lpEnvironment, string lpCurrentDirectory, [In] ref STARTUPINFOEX lpStartupInfo,
 			out PROCESS_INFORMATION lpProcessInformation);
 
 		[DllImport("kernel32.dll", SetLastError = true)]
 		[return: MarshalAs(UnmanagedType.Bool)]
-		internal static extern bool DeleteProcThreadAttributeList(IntPtr lpAttributeList);
+		internal static extern bool DeleteProcThreadAttributeList(nint lpAttributeList);
 
 		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern bool CloseHandle(IntPtr hObject);
+		internal static extern bool CloseHandle(nint hObject);
 	}
 }

src/Files.App/Terminal/ConPTY/Native/PseudoConsoleApi.cs renamed to src/Files.App/Utils/Terminal/ConPTY/Native/PseudoConsoleApi.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Files.App.Terminal.Native
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// PInvoke signatures for win32 pseudo console api
@@ -19,15 +19,15 @@ internal struct COORD
 		}
 
 		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern int CreatePseudoConsole(COORD size, SafeFileHandle hInput, SafeFileHandle hOutput, uint dwFlags, out IntPtr phPC);
+		internal static extern int CreatePseudoConsole(COORD size, SafeFileHandle hInput, SafeFileHandle hOutput, uint dwFlags, out nint phPC);
 
 		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern int ResizePseudoConsole(IntPtr hPC, COORD size);
+		internal static extern int ResizePseudoConsole(nint hPC, COORD size);
 
 		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern int ClosePseudoConsole(IntPtr hPC);
+		internal static extern int ClosePseudoConsole(nint hPC);
 
 		[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-		internal static extern bool CreatePipe(out SafeFileHandle hReadPipe, out SafeFileHandle hWritePipe, IntPtr lpPipeAttributes, int nSize);
+		internal static extern bool CreatePipe(out SafeFileHandle hReadPipe, out SafeFileHandle hWritePipe, nint lpPipeAttributes, int nSize);
 	}
 }

src/Files.App/Terminal/ConPTY/Processes/Process.cs renamed to src/Files.App/Utils/Terminal/ConPTY/Processes/Process.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
-using static Files.App.Terminal.Native.ProcessApi;
+using static Files.App.Utils.Terminal.ConPTY.ProcessApi;
 
-namespace Files.App.Terminal
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// Represents an instance of a process.
@@ -34,18 +34,18 @@ void Dispose(bool disposing)
 				// dispose unmanaged state
 
 				// Free the attribute list
-				if (StartupInfo.lpAttributeList != IntPtr.Zero)
+				if (StartupInfo.lpAttributeList != nint.Zero)
 				{
 					DeleteProcThreadAttributeList(StartupInfo.lpAttributeList);
 					Marshal.FreeHGlobal(StartupInfo.lpAttributeList);
 				}
 
 				// Close process and thread handles
-				if (ProcessInfo.hProcess != IntPtr.Zero)
+				if (ProcessInfo.hProcess != nint.Zero)
 				{
 					CloseHandle(ProcessInfo.hProcess);
 				}
-				if (ProcessInfo.hThread != IntPtr.Zero)
+				if (ProcessInfo.hThread != nint.Zero)
 				{
 					CloseHandle(ProcessInfo.hThread);
 				}

src/Files.App/Terminal/ConPTY/Processes/ProcessFactory.cs renamed to src/Files.App/Utils/Terminal/ConPTY/Processes/ProcessFactory.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
-using static Files.App.Terminal.Native.ProcessApi;
+using static Files.App.Utils.Terminal.ConPTY.ProcessApi;
 
-namespace Files.App.Terminal
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// Support for starting and configuring processes.
@@ -15,25 +15,25 @@ static class ProcessFactory
 		/// <summary>
 		/// Start and configure a process. The return value represents the process and should be disposed.
 		/// </summary>
-		internal static Process Start(string command, string directory, IntPtr attributes, IntPtr hPC)
+		internal static Process Start(string command, string directory, nint attributes, nint hPC)
 		{
 			var startupInfo = ConfigureProcessThread(hPC, attributes);
 			var processInfo = RunProcess(ref startupInfo, command, directory);
 			return new Process(startupInfo, processInfo);
 		}
 
-		private static STARTUPINFOEX ConfigureProcessThread(IntPtr hPC, IntPtr attributes)
+		private static STARTUPINFOEX ConfigureProcessThread(nint hPC, nint attributes)
 		{
 			// this method implements the behavior described in https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session#preparing-for-creation-of-the-child-process
 
-			var lpSize = IntPtr.Zero;
+			var lpSize = nint.Zero;
 			var success = InitializeProcThreadAttributeList(
-				lpAttributeList: IntPtr.Zero,
+				lpAttributeList: nint.Zero,
 				dwAttributeCount: 1,
 				dwFlags: 0,
 				lpSize: ref lpSize
 			);
-			if (success || lpSize == IntPtr.Zero) // we're not expecting `success` here, we just want to get the calculated lpSize
+			if (success || lpSize == nint.Zero) // we're not expecting `success` here, we just want to get the calculated lpSize
 			{
 				throw new InvalidOperationException("Could not calculate the number of bytes for the attribute list. " + Marshal.GetLastWin32Error());
 			}
@@ -58,9 +58,9 @@ private static STARTUPINFOEX ConfigureProcessThread(IntPtr hPC, IntPtr attribute
 				dwFlags: 0,
 				attribute: attributes,
 				lpValue: hPC,
-				cbSize: (IntPtr)IntPtr.Size,
-				lpPreviousValue: IntPtr.Zero,
-				lpReturnSize: IntPtr.Zero
+				cbSize: nint.Size,
+				lpPreviousValue: nint.Zero,
+				lpReturnSize: nint.Zero
 			);
 			if (!success)
 			{
@@ -82,7 +82,7 @@ private static PROCESS_INFORMATION RunProcess(ref STARTUPINFOEX sInfoEx, string
 				lpThreadAttributes: ref tSec,
 				bInheritHandles: false,
 				dwCreationFlags: EXTENDED_STARTUPINFO_PRESENT,
-				lpEnvironment: IntPtr.Zero,
+				lpEnvironment: nint.Zero,
 				lpCurrentDirectory: directory,
 				lpStartupInfo: ref sInfoEx,
 				lpProcessInformation: out PROCESS_INFORMATION pInfo

src/Files.App/Terminal/ConPTY/PseudoConsole.cs renamed to src/Files.App/Utils/Terminal/ConPTY/PseudoConsole.cs

@@ -1,30 +1,30 @@
 using Microsoft.Win32.SafeHandles;
 using System;
-using static Files.App.Terminal.Native.PseudoConsoleApi;
+using static Files.App.Utils.Terminal.ConPTY.PseudoConsoleApi;
 
-namespace Files.App.Terminal
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// Utility functions around the new Pseudo Console APIs
 	/// </summary>
 	internal sealed class PseudoConsole : IDisposable
 	{
-		public static readonly IntPtr PseudoConsoleThreadAttribute = (IntPtr)PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE;
+		public static readonly nint PseudoConsoleThreadAttribute = (nint)PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE;
 
-		public IntPtr Handle { get; }
+		public nint Handle { get; }
 
-		private PseudoConsole(IntPtr handle)
+		private PseudoConsole(nint handle)
 		{
-			this.Handle = handle;
+			Handle = handle;
 		}
 
 		internal static PseudoConsole Create(SafeFileHandle inputReadSide, SafeFileHandle outputWriteSide, int width, int height)
 		{
 			var createResult = CreatePseudoConsole(
 				new COORD { X = (short)width, Y = (short)height },
 				inputReadSide, outputWriteSide,
-				0, out IntPtr hPC);
-			if(createResult != 0)
+				0, out nint hPC);
+			if (createResult != 0)
 			{
 				throw new InvalidOperationException("Could not create pseudo console. Error Code " + createResult);
 			}

src/Files.App/Terminal/ConPTY/PseudoConsolePipe.cs renamed to src/Files.App/Utils/Terminal/ConPTY/PseudoConsolePipe.cs

@@ -1,8 +1,8 @@
 using Microsoft.Win32.SafeHandles;
 using System;
-using static Files.App.Terminal.Native.PseudoConsoleApi;
+using static Files.App.Utils.Terminal.ConPTY.PseudoConsoleApi;
 
-namespace Files.App.Terminal
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// A pipe used to talk to the pseudoconsole, as described in:
@@ -18,7 +18,7 @@ internal sealed class PseudoConsolePipe : IDisposable
 
 		public PseudoConsolePipe()
 		{
-			if (!CreatePipe(out ReadSide, out WriteSide, IntPtr.Zero, 0))
+			if (!CreatePipe(out ReadSide, out WriteSide, nint.Zero, 0))
 			{
 				throw new InvalidOperationException("failed to create pipe");
 			}

src/Files.App/Terminal/ConPTY/Terminal.cs renamed to src/Files.App/Utils/Terminal/ConPTY/Terminal.cs

@@ -2,9 +2,9 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Vanara.PInvoke;
-using static Files.App.Terminal.Native.ConsoleApi;
+using static Files.App.Utils.Terminal.ConPTY.ConsoleApi;
 
-namespace Files.App.Terminal
+namespace Files.App.Utils.Terminal.ConPTY
 {
 	/// <summary>
 	/// The UI of the terminal. It's just a normal console window, but we're managing the input/output.
@@ -34,7 +34,7 @@ public Terminal()
 		{
 			// By default, UI applications don't have a console associated with them.
 			// So first, we check to see if this process has a console.
-			if (GetConsoleWindow() == IntPtr.Zero)
+			if (GetConsoleWindow() == nint.Zero)
 			{
 				// If it doesn't ask Windows to allocate one to it for us.
 				bool createConsoleSuccess = AllocConsole();
@@ -141,9 +141,9 @@ private static SafeFileHandle GetConsoleScreenBuffer()
 				null,
 				FileMode.Open,
 				FileFlagsAndAttributes.FILE_ATTRIBUTE_NORMAL,
-				IntPtr.Zero);
+				nint.Zero);
 
-			if (file == new IntPtr(-1))
+			if (file == new nint(-1))
 			{
 				throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not get console screen buffer.");
 			}