Code Quality: Migrated CopyFileFromApp and MoveFileFromApp to CsWin32 (#15131)

Author: gumbarros

src/Files.App/Helpers/Interop/NativeFileOperationsHelper.cs

@@ -142,23 +142,6 @@ public static extern bool CreateDirectoryFromApp(
 			IntPtr SecurityAttributes
 		);
 
-		[DllImport("api-ms-win-core-file-fromapp-l1-1-0.dll", CharSet = CharSet.Auto,
-		CallingConvention = CallingConvention.StdCall,
-		SetLastError = true)]
-		public static extern bool MoveFileFromApp(
-			string lpExistingFileName,
-			string lpNewFileName
-		);
-
-		[DllImport("api-ms-win-core-file-fromapp-l1-1-0.dll", CharSet = CharSet.Auto,
-		CallingConvention = CallingConvention.StdCall,
-		SetLastError = true)]
-		public static extern bool CopyFileFromApp(
-			string lpExistingFileName,
-			string lpNewFileName,
-			bool bFailIfExists
-		);
-
 		[DllImport("api-ms-win-core-file-fromapp-l1-1-0.dll", CharSet = CharSet.Auto,
 		CallingConvention = CallingConvention.StdCall,
 		SetLastError = true)]

src/Files.App/NativeMethods.txt

@@ -39,3 +39,5 @@ AttachThreadInput
 SetWindowPos
 SetFocus
 SetActiveWindow
+CopyFileFromApp
+MoveFileFromApp

src/Files.App/Utils/Storage/Helpers/FilesystemResult.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Windows.Win32.Foundation;
+
 namespace Files.App.Utils.Storage
 {
 	public class FilesystemResult
@@ -12,8 +14,12 @@ public class FilesystemResult
 		public static implicit operator FileSystemStatusCode(FilesystemResult res) => res.ErrorCode;
 		public static implicit operator FilesystemResult(FileSystemStatusCode res) => new(res);
 
-		public static implicit operator bool(FilesystemResult res) => res is not null && res.ErrorCode is FileSystemStatusCode.Success;
+		public static implicit operator bool(FilesystemResult res) => res?.ErrorCode is FileSystemStatusCode.Success;
 		public static explicit operator FilesystemResult(bool res) => new(res ? FileSystemStatusCode.Success : FileSystemStatusCode.Generic);
+		
+		
+		public static implicit operator BOOL(FilesystemResult res) => res?.ErrorCode is FileSystemStatusCode.Success;
+		public static explicit operator FilesystemResult(BOOL res) => new(res ? FileSystemStatusCode.Success : FileSystemStatusCode.Generic);
 	}
 
 	public sealed class FilesystemResult<T> : FilesystemResult

src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs

@@ -7,6 +7,7 @@
 using System.Text;
 using Windows.Foundation.Metadata;
 using Windows.Storage;
+using Windows.Win32;
 
 namespace Files.App.Utils.Storage
 {
@@ -210,7 +211,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 			}
 			else if (source.ItemType == FilesystemItemType.File)
 			{
-				var fsResult = (FilesystemResult)await Task.Run(() => NativeFileOperationsHelper.CopyFileFromApp(source.Path, destination, true));
+				var fsResult = (FilesystemResult)await Task.Run(() => PInvoke.CopyFileFromApp(source.Path, destination, true));
 
 				if (!fsResult)
 				{
@@ -363,7 +364,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				}
 				else
 				{
-					var fsResult = (FilesystemResult)await Task.Run(() => NativeFileOperationsHelper.MoveFileFromApp(source.Path, destination));
+					var fsResult = (FilesystemResult)await Task.Run(() => PInvoke.MoveFileFromApp(source.Path, destination));
 
 					if (!fsResult)
 					{
@@ -423,7 +424,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 			}
 			else if (source.ItemType == FilesystemItemType.File)
 			{
-				var fsResult = (FilesystemResult)await Task.Run(() => NativeFileOperationsHelper.MoveFileFromApp(source.Path, destination));
+				var fsResult = (FilesystemResult)await Task.Run(() => PInvoke.MoveFileFromApp(source.Path, destination));
 
 				if (!fsResult)
 				{
@@ -620,7 +621,7 @@ public async Task<IStorageHistory> RenameAsync(
 				{
 					// Try again with MoveFileFromApp
 					var destination = Path.Combine(Path.GetDirectoryName(source.Path), newName);
-					if (NativeFileOperationsHelper.MoveFileFromApp(source.Path, destination))
+					if (PInvoke.MoveFileFromApp(source.Path, destination))
 					{
 						fsProgress.ReportStatus(FileSystemStatusCode.Success);
 
@@ -729,7 +730,7 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so
 
 			FilesystemResult fsResult = FileSystemStatusCode.InProgress;
 
-			fsResult = (FilesystemResult)await Task.Run(() => NativeFileOperationsHelper.MoveFileFromApp(source.Path, destination));
+			fsResult = (FilesystemResult)await Task.Run(() => PInvoke.MoveFileFromApp(source.Path, destination));
 
 			if (!fsResult)
 			{

src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs

@@ -9,6 +9,7 @@
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.Storage.Streams;
+using Windows.Win32;
 using IO = System.IO;
 
 namespace Files.App.Utils.Storage
@@ -74,7 +75,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 				var destFile = new NativeStorageFile(destination, desiredNewName, DateTime.Now);
 				if (!IsAlternateStream)
 				{
-					if (!await Task.Run(() => NativeFileOperationsHelper.CopyFileFromApp(Path, destination, option != NameCollisionOption.ReplaceExisting)))
+					if (!await Task.Run(() => PInvoke.CopyFileFromApp(Path, destination, option != NameCollisionOption.ReplaceExisting)))
 					{
 						throw new Win32Exception(Marshal.GetLastWin32Error());
 					}
@@ -185,7 +186,7 @@ public override IAsyncAction MoveAsync(IStorageFolder destinationFolder, string
 				var destination = IO.Path.Combine(destinationFolder.Path, desiredNewName);
 				if (!IsAlternateStream)
 				{
-					if (!await Task.Run(() => NativeFileOperationsHelper.MoveFileFromApp(Path, destination)))
+					if (!await Task.Run(() => PInvoke.MoveFileFromApp(Path, destination)))
 					{
 						throw new Win32Exception(Marshal.GetLastWin32Error());
 					}
@@ -237,7 +238,7 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 				var destFile = new NativeStorageFile(destination, desiredName, DateTime.Now);
 				if (!IsAlternateStream)
 				{
-					if (!await Task.Run(() => NativeFileOperationsHelper.MoveFileFromApp(Path, destination)))
+					if (!await Task.Run(() => PInvoke.MoveFileFromApp(Path, destination)))
 					{
 						throw new Win32Exception(Marshal.GetLastWin32Error());
 					}

src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs

@@ -9,6 +9,7 @@
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.Storage.Streams;
+using Windows.Win32;
 using IO = System.IO;
 
 namespace Files.App.Utils.Storage
@@ -310,7 +311,7 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					else
 					{
 						var fileName = IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName);
-						NativeFileOperationsHelper.MoveFileFromApp(Path, fileName);
+						PInvoke.MoveFileFromApp(Path, fileName);
 					}
 				}
 				else

src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs

@@ -11,6 +11,7 @@
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.Storage.Search;
+using Windows.Win32;
 using IO = System.IO;
 
 namespace Files.App.Utils.Storage
@@ -350,7 +351,7 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					else
 					{
 						var fileName = IO.Path.Combine(IO.Path.GetDirectoryName(Path), desiredName);
-						NativeFileOperationsHelper.MoveFileFromApp(Path, fileName);
+						PInvoke.MoveFileFromApp(Path, fileName);
 					}
 				}
 				else