Init

Author: 0x5bfa

src/Files.App.Storage/Storables/WindowsStorage/STATask.cs

@@ -147,57 +147,43 @@ public static Task Run(Func<Task> func)
 			return tcs.Task;
 		}
 
-		public static Task<T?> RunAsSync<T>(Func<Task<T>> func)
+		public unsafe static Task RunAsSync(Action action)
 		{
-			HANDLE hEventHandle = default;
+			Debug.Assert(Thread.CurrentThread.GetApartmentState() is ApartmentState.STA);
 
-			unsafe
-			{
-				hEventHandle = PInvoke.CreateEvent((SECURITY_ATTRIBUTES*)null, true, false, default);
-			}
+			HANDLE hEventHandle = PInvoke.CreateEvent((SECURITY_ATTRIBUTES*)null, true, false, default);
 
-			var tcs = new TaskCompletionSource<T?>();
+			var tcs = new TaskCompletionSource();
 
-			Thread thread =
-				new(async () =>
+			Task.Run(() =>
+			{
+				try
 				{
-					PInvoke.OleInitialize();
-
-					try
-					{
-						tcs.SetResult(await func());
-					}
-					catch (Exception ex)
-					{
-						tcs.SetException(ex);
-					}
-					finally
-					{
-						PInvoke.SetEvent(hEventHandle);
-						PInvoke.OleUninitialize();
-					}
-				})
+					action();
+					tcs.SetResult();
+				}
+				catch (Exception ex)
 				{
-					IsBackground = true,
-					Priority = ThreadPriority.Normal
-				};
-
-			thread.SetApartmentState(ApartmentState.STA);
-			thread.Start();
-
-			unsafe
-			{
-				HANDLE* pEventHandles = stackalloc HANDLE[1];
-				pEventHandles[0] = hEventHandle;
-				uint dwIndex = 0u;
-
-				PInvoke.CoWaitForMultipleObjects(
-					(uint)CWMO_FLAGS.CWMO_DEFAULT,
-					PInvoke.INFINITE,
-					1u,
-					pEventHandles,
-					&dwIndex);
-			}
+					tcs.SetException(ex);
+				}
+				finally
+				{
+					PInvoke.SetEvent(hEventHandle);
+				}
+			});
+
+			HANDLE* pEventHandles = stackalloc HANDLE[1];
+			pEventHandles[0] = hEventHandle;
+			uint dwIndex = 0u;
+
+			PInvoke.CoWaitForMultipleObjects(
+				(uint)CWMO_FLAGS.CWMO_DEFAULT,
+				PInvoke.INFINITE,
+				1u,
+				pEventHandles,
+				&dwIndex);
+
+			PInvoke.CloseHandle(hEventHandle);
 
 			return tcs.Task;
 		}

src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs

@@ -69,15 +69,6 @@ public static extern bool SetEvent(
 			IntPtr hEvent
 		);
 
-		[DllImport("ole32.dll")]
-		public static extern uint CoWaitForMultipleObjects(
-			uint dwFlags,
-			uint dwMilliseconds,
-			ulong nHandles,
-			IntPtr[] pHandles,
-			out uint dwIndex
-		);
-
 		[DllImport("shell32.dll")]
 		public static extern IntPtr SHBrowseForFolder(
 			ref BROWSEINFO lpbi

src/Files.App/Program.cs

@@ -9,7 +9,6 @@
 using System.Text;
 using Windows.ApplicationModel.Activation;
 using Windows.Storage;
-using static Files.App.Helpers.Win32PInvoke;
 
 namespace Files.App
 {
@@ -21,9 +20,6 @@ namespace Files.App
 	/// </remarks>
 	internal sealed class Program
 	{
-		private const uint CWMO_DEFAULT = 0;
-		private const uint INFINITE = 0xFFFFFFFF;
-
 		public static Semaphore? Pool { get; set; }
 
 		static Program()
@@ -250,20 +246,10 @@ private static async void OnActivated(object? sender, AppActivationArguments arg
 		/// </remarks>
 		public static void RedirectActivationTo(AppInstance keyInstance, AppActivationArguments args)
 		{
-			IntPtr eventHandle = CreateEvent(IntPtr.Zero, true, false, null);
-
-			Task.Run(() =>
+			STATask.RunAsSync(() =>
 			{
 				keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
-				SetEvent(eventHandle);
 			});
-
-			_ = CoWaitForMultipleObjects(
-				CWMO_DEFAULT,
-				INFINITE,
-				1,
-				[eventHandle],
-				out uint handleIndex);
 		}
 
 		public static void OpenShellCommandInExplorer(string shellCommand, int pid)
@@ -273,20 +259,10 @@ public static void OpenShellCommandInExplorer(string shellCommand, int pid)
 
 		public static void OpenFileFromTile(string filePath)
 		{
-			IntPtr eventHandle = CreateEvent(IntPtr.Zero, true, false, null);
-
-			Task.Run(() =>
+			STATask.RunAsSync(() =>
 			{
 				LaunchHelper.LaunchAppAsync(filePath, null, null).Wait();
-				SetEvent(eventHandle);
 			});
-
-			_ = CoWaitForMultipleObjects(
-				CWMO_DEFAULT,
-				INFINITE,
-				1,
-				[eventHandle],
-				out uint handleIndex);
 		}
 	}
 }