Code Quality: Replaced Files.App.Data.Items.CMF with CsWin32

Author: Jack251970

src/Files.App.CsWin32/NativeMethods.txt

@@ -152,6 +152,8 @@ BHID_SFUIObject
 IContextMenu
 CMF_NORMAL
 CMF_OPTIMIZEFORINVOKE
+CMF_EXTENDEDVERBS
+CMF_DEFAULTONLY
 IApplicationDestinations
 ApplicationDestinations
 IApplicationDocumentLists

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

@@ -11,6 +11,7 @@
 using System.IO;
 using Windows.System;
 using Windows.UI.Core;
+using Windows.Win32;
 
 namespace Files.App.Helpers
 {
@@ -53,7 +54,7 @@ bool filterMenuItemsImpl(string menuItem) => !string.IsNullOrEmpty(menuItem)
 			}
 
 			var contextMenu = await ContextMenu.GetContextMenuForFiles(filePaths,
-				shiftPressed ? CMF.CMF_EXTENDEDVERBS : CMF.CMF_NORMAL, FilterMenuItems(showOpenMenu));
+				shiftPressed ? PInvoke.CMF_EXTENDEDVERBS : PInvoke.CMF_NORMAL, FilterMenuItems(showOpenMenu));
 
 			if (contextMenu is not null)
 				LoadMenuFlyoutItem(menuItemsList, contextMenu, contextMenu.Items, cancellationToken, true);

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

@@ -32,27 +32,6 @@ 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/Utils/Shell/ContextMenu.cs

@@ -6,6 +6,7 @@
 using Vanara.InteropServices;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
+using Windows.Win32;
 
 namespace Files.App.Utils.Shell
 {
@@ -43,7 +44,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, CMF.CMF_DEFAULTONLY);
+			using var cMenu = await GetContextMenuForFiles(filePaths, PInvoke.CMF_DEFAULTONLY);
 
 			return cMenu is not null && await cMenu.InvokeVerb(verb);
 		}
@@ -112,7 +113,7 @@ public async Task<bool> InvokeItem(int itemID)
 			return false;
 		}
 
-		public async static Task<ContextMenu?> GetContextMenuForFiles(string[] filePathList, CMF flags, Func<string, bool>? itemFilter = null)
+		public async static Task<ContextMenu?> GetContextMenuForFiles(string[] filePathList, uint flags, Func<string, bool>? itemFilter = null)
 		{
 			var owningThread = new ThreadWithMessageQueue();
 
@@ -140,14 +141,14 @@ public async Task<bool> InvokeItem(int itemID)
 			});
 		}
 
-		public async static Task<ContextMenu?> GetContextMenuForFiles(ShellItem[] shellItems, CMF flags, Func<string, bool>? itemFilter = null)
+		public async static Task<ContextMenu?> GetContextMenuForFiles(ShellItem[] shellItems, uint 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, CMF flags, ThreadWithMessageQueue owningThread, Func<string, bool>? itemFilter = null)
+		private static ContextMenu? GetContextMenuForFiles(ShellItem[] shellItems, uint flags, ThreadWithMessageQueue owningThread, Func<string, bool>? itemFilter = null)
 		{
 			if (!shellItems.Any())
 				return null;
@@ -174,7 +175,7 @@ public async Task<bool> InvokeItem(int itemID)
 
 		public static async Task WarmUpQueryContextMenuAsync()
 		{
-			using var cMenu = await GetContextMenuForFiles(new string[] { $@"{Constants.UserEnvironmentPaths.SystemDrivePath}\" }, CMF.CMF_NORMAL);
+			using var cMenu = await GetContextMenuForFiles(new string[] { $@"{Constants.UserEnvironmentPaths.SystemDrivePath}\" }, PInvoke.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;
 using Windows.Win32.UI.Shell;
 
 namespace Files.App.Utils.Shell
@@ -161,7 +162,7 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 									if (!group.Any())
 										continue;
 
-									using var cMenu = await ContextMenu.GetContextMenuForFiles(group.ToArray(), CMF.CMF_DEFAULTONLY);
+									using var cMenu = await ContextMenu.GetContextMenuForFiles(group.ToArray(), PInvoke.CMF_DEFAULTONLY);
 
 									if (cMenu is not null)
 										await cMenu.InvokeVerb(Shell32.CMDSTR_OPEN);
@@ -177,7 +178,7 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 							{
 								opened = await Win32Helper.StartSTATask(async () =>
 								{
-									using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, CMF.CMF_DEFAULTONLY);
+									using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, PInvoke.CMF_DEFAULTONLY);
 
 									if (cMenu is not null)
 										await cMenu.InvokeItem(cMenu.Items.FirstOrDefault()?.ID ?? -1);