Init

Author: Lamparter

src/Files.App.CsWin32/NativeMethods.txt

@@ -226,3 +226,4 @@ _SICHINTF
 RoGetAgileReference
 IQueryInfo
 QITIPF_FLAGS
+CancelIoEx

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

@@ -115,17 +115,6 @@ public static extern bool GetOverlappedResult(
 			bool bWait
 		);
 
-		[DllImport("api-ms-win-core-io-l1-1-1.dll")]
-		public static extern bool CancelIo(
-			IntPtr hFile
-		);
-
-		[DllImport("api-ms-win-core-io-l1-1-1.dll")]
-		public static extern bool CancelIoEx(
-			IntPtr hFile,
-			IntPtr lpOverlapped
-		);
-
 		[DllImport("api-ms-win-core-synch-l1-2-0.dll")]
 		public static extern uint WaitForMultipleObjectsEx(
 			uint nCount,

src/Files.App/ViewModels/ShellViewModel.cs

@@ -14,6 +14,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Vanara.Windows.Shell;
+using Windows.Win32;
+using Windows.Win32.Foundation;
 using Windows.Foundation;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
@@ -2101,7 +2103,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			});
 		}
 
-		private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStatus)
+		private unsafe void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStatus)
 		{
 			Debug.WriteLine($"WatchForDirectoryChanges: {path}");
 			var hWatchDir = Win32PInvoke.CreateFileFromApp(path, 1, 1 | 2 | 4,
@@ -2206,12 +2208,12 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 					Debug.WriteLine("watcher canceled");
 				}
 
-				CancelIoEx(hWatchDir, IntPtr.Zero);
-				CloseHandle(hWatchDir);
+				PInvoke.CancelIoEx((HANDLE)hWatchDir);
+				PInvoke.CloseHandle((HANDLE)hWatchDir);
 			});
 		}
 
-		private void WatchForGitChanges()
+		private unsafe void WatchForGitChanges()
 		{
 			var hWatchDir = Win32PInvoke.CreateFileFromApp(
 				GitDirectory!,
@@ -2294,7 +2296,7 @@ private void WatchForGitChanges()
 					gitWatcherAction = null;
 				}
 
-				CancelIoEx(hWatchDir, IntPtr.Zero);
+				PInvoke.CancelIoEx((HANDLE)hWatchDir);
 				CloseHandle(hWatchDir);
 			});
 		}