Requested changes

Author: yaira2

src/Files.App.CsWin32/NativeMethods.txt

@@ -167,3 +167,7 @@ ApplicationDocumentLists
 IApplicationActivationManager
 MENU_ITEM_TYPE
 COMPRESSION_FORMAT
+FSCTL_SET_COMPRESSION
+FSCTL_DISMOUNT_VOLUME
+FSCTL_LOCK_VOLUME
+FILE_FILE_COMPRESSION

src/Files.App/Data/Models/RemovableDevice.cs

@@ -1,9 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
+using Windows.Win32;
 using Windows.Win32.Storage.FileSystem;
 using static Files.App.Helpers.Win32PInvoke;
 
@@ -53,7 +51,7 @@ private async Task<bool> LockVolumeAsync()
 
 			for (int i = 0; i < 5; i++)
 			{
-				if (DeviceIoControl(handle, FSCTL_LOCK_VOLUME, nint.Zero, 0, nint.Zero, 0, out _, nint.Zero))
+				if (DeviceIoControl(handle, PInvoke.FSCTL_LOCK_VOLUME, nint.Zero, 0, nint.Zero, 0, out _, nint.Zero))
 				{
 					Debug.WriteLine("Lock successful!");
 					result = true;
@@ -73,7 +71,7 @@ private async Task<bool> LockVolumeAsync()
 
 		private bool DismountVolume()
 		{
-			return DeviceIoControl(handle, FSCTL_DISMOUNT_VOLUME, nint.Zero, 0, nint.Zero, 0, out _, nint.Zero);
+			return DeviceIoControl(handle, PInvoke.FSCTL_DISMOUNT_VOLUME, nint.Zero, 0, nint.Zero, 0, out _, nint.Zero);
 		}
 
 		private bool PreventRemovalOfVolume(bool prevent)

src/Files.App/Helpers/Win32/Win32Helper.Storage.cs

@@ -11,15 +11,11 @@
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using System.Windows.Forms;
-using Vanara;
 using Vanara.PInvoke;
 using Windows.System;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Storage.FileSystem;
-using static Files.App.Constants.Widgets;
-using static Vanara.PInvoke.Kernel32;
-using COMPRESSION_FORMAT = Windows.Win32.Storage.FileSystem.COMPRESSION_FORMAT;
 using HRESULT = Vanara.PInvoke.HRESULT;
 using HWND = Vanara.PInvoke.HWND;
 
@@ -333,7 +329,7 @@ public static string ExtractStringFromDLL(string file, int number)
 				}
 
 				if (iconData is not null || iconOptions.HasFlag(IconOptions.ReturnThumbnailOnly))
-					return iconData;			
+					return iconData;
 				else
 				{
 					var shfi = new Shell32.SHFILEINFO();
@@ -342,7 +338,7 @@ public static string ExtractStringFromDLL(string file, int number)
 					// Cannot access file, use file attributes
 					var useFileAttibutes = iconData is null;
 
-					var ret = Shell32.SHGetFileInfo(path, isFolder ? FileAttributes.Directory : 0, ref shfi, Shell32.SHFILEINFO.Size, flags);					
+					var ret = Shell32.SHGetFileInfo(path, isFolder ? FileAttributes.Directory : 0, ref shfi, Shell32.SHFILEINFO.Size, flags);
 					if (ret == IntPtr.Zero)
 						return iconData;
 
@@ -970,7 +966,7 @@ public static unsafe bool CanCompressContent(string path)
 				return false;
 
 			// 0x00000010 FILE_FILE_COMPRESSION
-			return (fileSystemFlags & 0x00000010) != 0;
+			return (fileSystemFlags & PInvoke.FILE_FILE_COMPRESSION) != 0;
 		}
 
 		public static unsafe bool SetCompressionAttributeIoctl(string lpFileName, bool isCompressed)
@@ -996,7 +992,7 @@ public static unsafe bool SetCompressionAttributeIoctl(string lpFileName, bool i
 
 			var result = PInvoke.DeviceIoControl(
 				new(hFile.DangerousGetHandle()),
-				Win32PInvoke.FSCTL_SET_COMPRESSION,
+				PInvoke.FSCTL_SET_COMPRESSION,
 				&compressionFormat,
 				sizeof(ushort),
 				null,

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

@@ -42,14 +42,6 @@ public static partial class Win32PInvoke
 
 		// FSCTL
 		public const int FSCTL_GET_REPARSE_POINT = 0x000900A8;
-		public const int FSCTL_LOCK_VOLUME = 0x00090018;
-		public const int FSCTL_DISMOUNT_VOLUME = 0x00090020;
-		public const uint FSCTL_SET_COMPRESSION = 0x9C040u;
-
-		// Compression
-		public const ushort COMPRESSION_FORMAT_NONE = 0x0000;
-		public const ushort COMPRESSION_FORMAT_DEFAULT = 0x0001;
-
 
 		public const int MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16 * 1024;
 		public const uint IO_REPARSE_TAG_MOUNT_POINT = 0xA0000003;