Code Quality: Replaced Files.App.Data.Items.MenuItemType with Windows.Win32.UI.WindowsAndMessaging.MENU_ITEM_TYPE

Author: Jack251970

src/Files.App.CsWin32/NativeMethods.txt

@@ -159,3 +159,4 @@ ApplicationDestinations
 IApplicationDocumentLists
 ApplicationDocumentLists
 IApplicationActivationManager
+MENU_ITEM_TYPE

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

@@ -12,6 +12,7 @@
 using Windows.System;
 using Windows.UI.Core;
 using Windows.Win32;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Helpers
 {
@@ -77,10 +78,10 @@ private static void LoadMenuFlyoutItem(
 				return;
 
 			var itemsCount = 0; // Separators do not count for reaching the overflow threshold
-			var menuItems = menuFlyoutItems.TakeWhile(x => x.Type == MenuItemType.MFT_SEPARATOR || ++itemsCount <= itemsBeforeOverflow).ToList();
+			var menuItems = menuFlyoutItems.TakeWhile(x => x.Type == MENU_ITEM_TYPE.MFT_SEPARATOR || ++itemsCount <= itemsBeforeOverflow).ToList();
 			var overflowItems = menuFlyoutItems.Except(menuItems).ToList();
 
-			if (overflowItems.Any(x => x.Type != MenuItemType.MFT_SEPARATOR))
+			if (overflowItems.Any(x => x.Type != MENU_ITEM_TYPE.MFT_SEPARATOR))
 			{
 				var moreItem = menuItemsListLocal.FirstOrDefault(x => x.ID == "ItemOverflow");
 				if (moreItem is null)
@@ -100,15 +101,15 @@ private static void LoadMenuFlyoutItem(
 			}
 
 			foreach (var menuFlyoutItem in menuItems
-				.SkipWhile(x => x.Type == MenuItemType.MFT_SEPARATOR) // Remove leading separators
+				.SkipWhile(x => x.Type == MENU_ITEM_TYPE.MFT_SEPARATOR) // Remove leading separators
 				.Reverse()
-				.SkipWhile(x => x.Type == MenuItemType.MFT_SEPARATOR)) // Remove trailing separators
+				.SkipWhile(x => x.Type == MENU_ITEM_TYPE.MFT_SEPARATOR)) // Remove trailing separators
 			{
 				if (cancellationToken.IsCancellationRequested)
 					break;
 
 				// Avoid duplicate separators
-				if ((menuFlyoutItem.Type == MenuItemType.MFT_SEPARATOR) && (menuItemsListLocal.FirstOrDefault()?.ItemType == ContextMenuFlyoutItemType.Separator))
+				if ((menuFlyoutItem.Type == MENU_ITEM_TYPE.MFT_SEPARATOR) && (menuItemsListLocal.FirstOrDefault()?.ItemType == ContextMenuFlyoutItemType.Separator))
 					continue;
 
 				BitmapImage? image = null;
@@ -119,7 +120,7 @@ private static void LoadMenuFlyoutItem(
 					image.SetSourceAsync(ms.AsRandomAccessStream()).AsTask().Wait(10);
 				}
 
-				if (menuFlyoutItem.Type is MenuItemType.MFT_SEPARATOR)
+				if (menuFlyoutItem.Type is MENU_ITEM_TYPE.MFT_SEPARATOR)
 				{
 					var menuLayoutItem = new ContextMenuFlyoutItemViewModel()
 					{

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

@@ -1,22 +1,10 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Windows.Win32.UI.WindowsAndMessaging;
+
 namespace Files.App.Data.Items
 {
-	// Same definition of Vanara.PInvoke.User32.MenuItemType
-	public enum MenuItemType : uint
-	{
-		MFT_STRING = 0,
-		MFT_BITMAP = 4,
-		MFT_MENUBARBREAK = 32,
-		MFT_MENUBREAK = 64,
-		MFT_OWNERDRAW = 256,
-		MFT_RADIOCHECK = 512,
-		MFT_SEPARATOR = 2048,
-		MFT_RIGHTORDER = 8192,
-		MFT_RIGHTJUSTIFY = 16384
-	}
-
 	public enum HBITMAP_HMENU : long
 	{
 		HBMMENU_CALLBACK = -1,
@@ -43,7 +31,7 @@ public class Win32ContextMenuItem
 		public int ID { get; set; } // Valid only in current menu to invoke item
 		public string Label { get; set; }
 		public string CommandString { get; set; }
-		public MenuItemType Type { get; set; }
+		public MENU_ITEM_TYPE Type { get; set; }
 		public List<Win32ContextMenuItem> SubItems { get; set; }
 	}
 }

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

@@ -7,6 +7,7 @@
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
 using Windows.Win32;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Utils.Shell
 {
@@ -178,7 +179,7 @@ public static async Task WarmUpQueryContextMenuAsync()
 			using var cMenu = await GetContextMenuForFiles(new string[] { $@"{Constants.UserEnvironmentPaths.SystemDrivePath}\" }, PInvoke.CMF_NORMAL);
 		}
 
-		private void EnumMenuItems(HMENU hMenu, List<Win32ContextMenuItem> menuItemsResult, bool loadSubenus = false)
+		private void EnumMenuItems(Vanara.PInvoke.HMENU hMenu, List<Win32ContextMenuItem> menuItemsResult, bool loadSubenus = false)
 		{
 			var itemCount = User32.GetMenuItemCount(hMenu);
 
@@ -212,12 +213,12 @@ private void EnumMenuItems(HMENU hMenu, List<Win32ContextMenuItem> menuItemsResu
 					continue;
 				}
 
-				menuItem.Type = (MenuItemType)menuItemInfo.fType;
+				menuItem.Type = (MENU_ITEM_TYPE)menuItemInfo.fType;
 
 				// wID - idCmdFirst
 				menuItem.ID = (int)(menuItemInfo.wID - 1);
 
-				if (menuItem.Type == MenuItemType.MFT_STRING)
+				if (menuItem.Type == MENU_ITEM_TYPE.MFT_STRING)
 				{
 					Debug.WriteLine("Item {0} ({1}): {2}", index, menuItemInfo.wID, menuItemInfo.dwTypeData);
 
@@ -245,7 +246,7 @@ private void EnumMenuItems(HMENU hMenu, List<Win32ContextMenuItem> menuItemsResu
 						}
 					}
 
-					if (menuItemInfo.hSubMenu != HMENU.NULL)
+					if (menuItemInfo.hSubMenu != Vanara.PInvoke.HMENU.NULL)
 					{
 						Debug.WriteLine("Item {0}: has submenu", index);
 						var subItems = new List<Win32ContextMenuItem>();