Init

Author: Lamparter

src/Files.App.CsWin32/NativeMethods.txt

@@ -222,3 +222,7 @@ SetCurrentProcessExplicitAppUserModelID
 GdipCreateBitmapFromScan0
 BITMAP
 GetObject
+CreateEvent
+SetEvent
+ResetEvent
+CoWaitForMultipleObjects

src/Files.App/App.xaml.cs

@@ -5,6 +5,8 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.Win32.SafeHandles;
+using Windows.Win32;
 using Microsoft.Windows.AppLifecycle;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.DataTransfer;
@@ -223,9 +225,9 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 				var results = items.Select(x => x.ItemPath).ToList();
 				System.IO.File.WriteAllLines(OutputPath, results);
 
-				IntPtr eventHandle = Win32PInvoke.CreateEvent(IntPtr.Zero, false, false, "FILEDIALOG");
-				Win32PInvoke.SetEvent(eventHandle);
-				Win32PInvoke.CloseHandle(eventHandle);
+				SafeFileHandle eventHandle = PInvoke.CreateEvent(null, false, false, "FILEDIALOG");
+				PInvoke.SetEvent(eventHandle);
+				eventHandle.Close();
 			}
 
 			// Continue running the app on the background

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

@@ -63,19 +63,6 @@ public static extern bool SetPropW(
 			IntPtr hData
 		);
 
-		[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-		public static extern IntPtr CreateEvent(
-			IntPtr lpEventAttributes,
-			bool bManualReset,
-			bool bInitialState,
-			string lpName
-		);
-
-		[DllImport("kernel32.dll")]
-		public static extern bool SetEvent(
-			IntPtr hEvent
-		);
-
 		[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
 		public static extern int GetDpiForWindow(
 			IntPtr hwnd
@@ -135,11 +122,6 @@ public static extern uint WaitForMultipleObjectsEx(
 			bool bAlertable
 		);
 
-		[DllImport("api-ms-win-core-synch-l1-2-0.dll", SetLastError = true)]
-		public static extern bool ResetEvent(
-			IntPtr hEvent
-		);
-
 		[DllImport("api-ms-win-core-synch-l1-2-0.dll", SetLastError = true)]
 		public static extern uint WaitForSingleObjectEx(
 			IntPtr hHandle,

src/Files.App/Program.cs

@@ -5,11 +5,14 @@
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
+using Windows.Win32;
+using Windows.Win32.Foundation;
 using System.IO;
 using System.Text;
 using Windows.ApplicationModel.Activation;
 using Windows.Storage;
 using static Files.App.Helpers.Win32PInvoke;
+using Microsoft.Win32.SafeHandles;
 
 namespace Files.App
 {
@@ -250,19 +253,19 @@ 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);
+			SafeFileHandle eventHandle = PInvoke.CreateEvent(null, true, false, null);
 
 			Task.Run(() =>
 			{
 				keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
-				SetEvent(eventHandle);
+				PInvoke.SetEvent(eventHandle);
 			});
 
-			_ = CoWaitForMultipleObjects(
+			_ = Win32PInvoke.CoWaitForMultipleObjects(
 				CWMO_DEFAULT,
 				INFINITE,
 				1,
-				[eventHandle],
+				[eventHandle.DangerousGetHandle()],
 				out uint handleIndex);
 		}
 
@@ -273,19 +276,19 @@ public static void OpenShellCommandInExplorer(string shellCommand, int pid)
 
 		public static void OpenFileFromTile(string filePath)
 		{
-			IntPtr eventHandle = CreateEvent(IntPtr.Zero, true, false, null);
+			SafeFileHandle eventHandle = PInvoke.CreateEvent(null, true, false, null);
 
 			Task.Run(() =>
 			{
 				LaunchHelper.LaunchAppAsync(filePath, null, null).Wait();
-				SetEvent(eventHandle);
+				PInvoke.SetEvent(eventHandle);
 			});
 
 			_ = CoWaitForMultipleObjects(
 				CWMO_DEFAULT,
 				INFINITE,
 				1,
-				[eventHandle],
+				[eventHandle.DangerousGetHandle()],
 				out uint handleIndex);
 		}
 	}

src/Files.App/ViewModels/ShellViewModel.cs

@@ -14,6 +14,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Vanara.Windows.Shell;
+using Windows.Win32;
 using Windows.Foundation;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
@@ -2124,7 +2125,7 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 					notifyFilters |= FILE_NOTIFY_CHANGE_ATTRIBUTES;
 
 				var overlapped = new OVERLAPPED();
-				overlapped.hEvent = CreateEvent(IntPtr.Zero, false, false, null);
+				overlapped.hEvent = PInvoke.CreateEvent(null, false, false, null).DangerousGetHandle();
 				const uint INFINITE = 0xFFFFFFFF;
 
 				while (x.Status != AsyncStatus.Canceled)
@@ -2235,7 +2236,7 @@ private void WatchForGitChanges()
 				var notifyFilters = FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_CREATION;
 
 				var overlapped = new OVERLAPPED();
-				overlapped.hEvent = CreateEvent(IntPtr.Zero, false, false, null);
+				overlapped.hEvent = PInvoke.CreateEvent(null, false, false, null).DangerousGetHandle();
 				const uint INFINITE = 0xFFFFFFFF;
 
 				while (x.Status != AsyncStatus.Canceled)