Code Quality: Replace Vanara with CsWin32

src/Files.App.CsWin32/NativeMethods.txt

@@ -156,3 +156,4 @@ IApplicationDestinations
 ApplicationDestinations
 IApplicationDocumentLists
 ApplicationDocumentLists
+IApplicationActivationManager

src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs

@@ -9,10 +9,8 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
-using Vanara.PInvoke;
 using Windows.System;
 using Windows.UI.Core;
-using static Vanara.PInvoke.Kernel32;
 
 namespace Files.App.Helpers
 {
@@ -55,7 +53,7 @@ bool filterMenuItemsImpl(string menuItem) => !string.IsNullOrEmpty(menuItem)
 			}
 
 			var contextMenu = await ContextMenu.GetContextMenuForFiles(filePaths,
-				shiftPressed ? Shell32.CMF.CMF_EXTENDEDVERBS : Shell32.CMF.CMF_NORMAL, FilterMenuItems(showOpenMenu));
+				shiftPressed ? CMF.CMF_EXTENDEDVERBS : CMF.CMF_NORMAL, FilterMenuItems(showOpenMenu));
 
 			if (contextMenu is not null)
 				LoadMenuFlyoutItem(menuItemsList, contextMenu, contextMenu.Items, cancellationToken, true);

src/Files.App/Data/Items/ContextMenu.cs

@@ -32,6 +32,27 @@ public enum HBITMAP_HMENU : long
 		HBMMENU_SYSTEM = 1
 	}
 
+	// Same definition of Vanara.PInvoke.Shell32.CMF
+	public enum CMF : uint
+	{
+		CMF_NORMAL = 0x00000000,
+		CMF_DEFAULTONLY = 0x00000001,
+		CMF_VERBSONLY = 0x00000002,
+		CMF_EXPLORE = 0x00000004,
+		CMF_NOVERBS = 0x00000008,
+		CMF_CANRENAME = 0x00000010,
+		CMF_NODEFAULT = 0x00000020,
+		CMF_EXTENDEDVERBS = 0x00000100,
+		CMF_INCLUDESTATIC = 0x00000040,
+		CMF_ITEMMENU = 0x00000080,
+		CMF_DISABLEDVERBS = 0x00000200,
+		CMF_ASYNCVERBSTATE = 0x00000400,
+		CMF_OPTIMIZEFORINVOKE = 0x00000800,
+		CMF_SYNCCASCADEMENU = 0x00001000,
+		CMF_DONOTPICKDEFAULT = 0x00002000,
+		CMF_RESERVED = 0xffff0000,
+	}
+
 	public class Win32ContextMenu
 	{
 		public List<Win32ContextMenuItem> Items { get; set; }

src/Files.App/UserControls/FilePreviews/ShellPreview.xaml.cs

@@ -1,7 +1,6 @@
 using Files.App.ViewModels.Previews;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Vanara.PInvoke;
 using Windows.Foundation;
 
 namespace Files.App.UserControls.FilePreviews
@@ -32,17 +31,17 @@ private void PreviewHost_SizeChanged(object sender, SizeChangedEventArgs e)
 			ViewModel.SizeChanged(GetPreviewSize());
 		}
 
-		private RECT GetPreviewSize()
+		private Rect GetPreviewSize()
 		{
 			var source = contentPresenter.TransformToVisual(XamlRoot.Content);
 			var physicalSize = contentPresenter.RenderSize;
 			var physicalPos = source.TransformPoint(new Point(0, 0));
 			var scale = XamlRoot.RasterizationScale;
-			var result = new RECT();
-			result.Left = (int)(physicalPos.X * scale + 0.5);
-			result.Top = (int)(physicalPos.Y * scale + 0.5);
-			result.Width = (int)(physicalSize.Width * scale + 0.5);
-			result.Height = (int)(physicalSize.Height * scale + 0.5);
+			var result = new Rect();
+			result.X = physicalPos.X * scale + 0.5;
+			result.Y = physicalPos.Y * scale + 0.5;
+			result.Width = physicalSize.Width * scale + 0.5;
+			result.Height = physicalSize.Height * scale + 0.5;
 			return result;
 		}
 

src/Files.App/Utils/Shell/ContextMenu.cs

@@ -43,7 +43,7 @@ private ContextMenu(Shell32.IContextMenu cMenu, User32.SafeHMENU hMenu, IEnumera
 
 		public async static Task<bool> InvokeVerb(string verb, params string[] filePaths)
 		{
-			using var cMenu = await GetContextMenuForFiles(filePaths, Shell32.CMF.CMF_DEFAULTONLY);
+			using var cMenu = await GetContextMenuForFiles(filePaths, CMF.CMF_DEFAULTONLY);
 
 			return cMenu is not null && await cMenu.InvokeVerb(verb);
 		}
@@ -112,7 +112,7 @@ public async Task<bool> InvokeItem(int itemID)
 			return false;
 		}
 
-		public async static Task<ContextMenu?> GetContextMenuForFiles(string[] filePathList, Shell32.CMF flags, Func<string, bool>? itemFilter = null)
+		public async static Task<ContextMenu?> GetContextMenuForFiles(string[] filePathList, CMF flags, Func<string, bool>? itemFilter = null)
 		{
 			var owningThread = new ThreadWithMessageQueue();
 
@@ -140,14 +140,14 @@ public async Task<bool> InvokeItem(int itemID)
 			});
 		}
 
-		public async static Task<ContextMenu?> GetContextMenuForFiles(ShellItem[] shellItems, Shell32.CMF flags, Func<string, bool>? itemFilter = null)
+		public async static Task<ContextMenu?> GetContextMenuForFiles(ShellItem[] shellItems, CMF flags, Func<string, bool>? itemFilter = null)
 		{
 			var owningThread = new ThreadWithMessageQueue();
 
 			return await owningThread.PostMethod<ContextMenu>(() => GetContextMenuForFiles(shellItems, flags, owningThread, itemFilter));
 		}
 
-		private static ContextMenu? GetContextMenuForFiles(ShellItem[] shellItems, Shell32.CMF flags, ThreadWithMessageQueue owningThread, Func<string, bool>? itemFilter = null)
+		private static ContextMenu? GetContextMenuForFiles(ShellItem[] shellItems, CMF flags, ThreadWithMessageQueue owningThread, Func<string, bool>? itemFilter = null)
 		{
 			if (!shellItems.Any())
 				return null;
@@ -159,7 +159,7 @@ public async Task<bool> InvokeItem(int itemID)
 
 				Shell32.IContextMenu menu = sf.GetChildrenUIObjects<Shell32.IContextMenu>(default, shellItems);
 				var hMenu = User32.CreatePopupMenu();
-				menu.QueryContextMenu(hMenu, 0, 1, 0x7FFF, flags);
+				menu.QueryContextMenu(hMenu, 0, 1, 0x7FFF, (Shell32.CMF)flags);
 				var contextMenu = new ContextMenu(menu, hMenu, shellItems.Select(x => x.ParsingName), owningThread, itemFilter);
 				contextMenu.EnumMenuItems(hMenu, contextMenu.Items);
 
@@ -174,7 +174,7 @@ public async Task<bool> InvokeItem(int itemID)
 
 		public static async Task WarmUpQueryContextMenuAsync()
 		{
-			using var cMenu = await GetContextMenuForFiles(new string[] { $@"{Constants.UserEnvironmentPaths.SystemDrivePath}\" }, Shell32.CMF.CMF_NORMAL);
+			using var cMenu = await GetContextMenuForFiles(new string[] { $@"{Constants.UserEnvironmentPaths.SystemDrivePath}\" }, CMF.CMF_NORMAL);
 		}
 
 		private void EnumMenuItems(HMENU hMenu, List<Win32ContextMenuItem> menuItemsResult, bool loadSubenus = false)

src/Files.App/Utils/Shell/LaunchHelper.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
+using Windows.Win32.UI.Shell;
 
 namespace Files.App.Utils.Shell
 {
@@ -16,12 +17,12 @@ public static class LaunchHelper
 	{
 		public static void LaunchSettings(string page)
 		{
-			var appActiveManager = new Shell32.IApplicationActivationManager();
+			var appActiveManager = new IApplicationActivationManager();
 
 			appActiveManager.ActivateApplication(
 				"windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel",
 				page,
-				Shell32.ACTIVATEOPTIONS.AO_NONE,
+				ACTIVATEOPTIONS.AO_NONE,
 				out _);
 		}
 
@@ -160,7 +161,7 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 									if (!group.Any())
 										continue;
 
-									using var cMenu = await ContextMenu.GetContextMenuForFiles(group.ToArray(), Shell32.CMF.CMF_DEFAULTONLY);
+									using var cMenu = await ContextMenu.GetContextMenuForFiles(group.ToArray(), CMF.CMF_DEFAULTONLY);
 
 									if (cMenu is not null)
 										await cMenu.InvokeVerb(Shell32.CMDSTR_OPEN);
@@ -176,7 +177,7 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 							{
 								opened = await Win32Helper.StartSTATask(async () =>
 								{
-									using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, Shell32.CMF.CMF_DEFAULTONLY);
+									using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, CMF.CMF_DEFAULTONLY);
 
 									if (cMenu is not null)
 										await cMenu.InvokeItem(cMenu.Items.FirstOrDefault()?.ID ?? -1);

src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs

@@ -4,7 +4,6 @@
 using Files.App.Services.SizeProvider;
 using Files.Shared.Helpers;
 using System.IO;
-using Vanara.PInvoke;
 using Windows.Storage;
 using static Files.App.Helpers.Win32Helper;
 using FileAttributes = System.IO.FileAttributes;

src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs

@@ -3,7 +3,6 @@
 
 using System.IO;
 using System.Windows.Input;
-using Vanara.PInvoke;
 using Windows.Storage;
 
 namespace Files.App.ViewModels.Dialogs

src/Files.App/ViewModels/Settings/AdvancedViewModel.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Text;
 using System.Windows.Input;
-using Vanara.PInvoke;
 using Windows.ApplicationModel;
 using Windows.Storage;
 using Windows.Storage.Pickers;

src/Files.App/ViewModels/Settings/GeneralViewModel.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Specialized;
 using System.Globalization;
-using Vanara.PInvoke;
 using Windows.Globalization;
 using Windows.Storage;
 using Windows.Storage.Pickers;

src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs

@@ -77,15 +77,18 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 			}
 		}
 
-		public void SizeChanged(RECT size)
+		public void SizeChanged(Windows.Foundation.Rect size)
 		{
+			var width = (int)size.Width;
+			var height = (int)size.Height;
+
 			if (hwnd != HWND.NULL)
-				SetWindowPos(hwnd, HWND.HWND_TOP, size.Left, size.Top, size.Width, size.Height, SetWindowPosFlags.SWP_NOACTIVATE);
+				SetWindowPos(hwnd, HWND.HWND_TOP, (int)size.Left, (int)size.Top, width, height, SetWindowPosFlags.SWP_NOACTIVATE);
 
-			currentHandler?.ResetBounds(new(0, 0, size.Width, size.Height));
+			currentHandler?.ResetBounds(new(0, 0, width, height));
 
 			if (outputLink is not null)
-				outputLink.PlacementVisual.Size = new(size.Width, size.Height);
+				outputLink.PlacementVisual.Size = new(width, height);
 		}
 
 		private nint WndProc(HWND hwnd, uint msg, nint wParam, nint lParam)