Use IContextMenu

Author: 0x5bfa

src/Files.App/Services/Windows/WindowsRecentItemsService.cs

@@ -5,10 +5,10 @@
 using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 using System.Text;
-using Vanara.Windows.Shell;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.System.Com;
+using Windows.Win32.System.SystemServices;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
 
@@ -115,7 +115,6 @@ public unsafe bool Remove(RecentItem item)
 		{
 			try
 			{
-				/*
 				var bhid = PInvoke.BHID_SFUIObject;
 				var contextMenuIid = typeof(IContextMenu).GUID;
 				using ComPtr<IContextMenu> pContextMenu = default;
@@ -127,32 +126,16 @@ public unsafe bool Remove(RecentItem item)
 				CMINVOKECOMMANDINFO cmi = default;
 				cmi.cbSize = (uint)sizeof(CMINVOKECOMMANDINFO);
 				cmi.nShow = (int)SHOW_WINDOW_CMD.SW_HIDE;
-				fixed (byte* pVerb = Encoding.ASCII.GetBytes("remove"))
-					cmi.lpVerb = new(pVerb);
 
-				// Invoke the verb
+				// Try unpin first for pinned files
+				fixed (byte* pVerb = Encoding.ASCII.GetBytes("unpinfromhome"))
+					cmi.lpVerb = new(pVerb);
 				hr = pContextMenu.Get()->InvokeCommand(cmi);
-				if (hr.Value < 0)
-					throw new COMException("Failed to remove the recent item from Recent.", hr.Value);
-				*/
-
-				using ComPtr<IApplicationDestinations> pApplicationDestinations = default;
-				var applicationDestinationsIid = typeof(IApplicationDestinations).GUID;
-				var applicationDestinationsInstanceIid = typeof(ApplicationDestinations).GUID;
 
-				PInvoke.CoCreateInstance(
-					&applicationDestinationsInstanceIid,
-					null,
-					CLSCTX.CLSCTX_LOCAL_SERVER,
-					&applicationDestinationsIid,
-					(void**)pApplicationDestinations.GetAddressOf())
-				.ThrowOnFailure();
-
-				// Set App ID
-				fixed (char* pszAppId = "Microsoft.Windows.Explorer")
-					pApplicationDestinations.Get()->SetAppID(pszAppId);
-
-				pApplicationDestinations.Get()->RemoveDestination((IUnknown*)item.ShellItem.Get());
+				// Remove recent files
+				fixed (byte* pVerb = Encoding.ASCII.GetBytes("remove"))
+					cmi.lpVerb = new(pVerb);
+				hr = pContextMenu.Get()->InvokeCommand(cmi);
 
 				return true;
 			}
@@ -168,25 +151,7 @@ public unsafe bool Clear()
 		{
 			try
 			{
-				//PInvoke.SHAddToRecentDocs((uint)SHARD.SHARD_PIDL, null);
-
-				using ComPtr<IApplicationDestinations> pApplicationDestinations = default;
-				var applicationDestinationsIid = typeof(IApplicationDestinations).GUID;
-				var applicationDestinationsInstanceIid = typeof(ApplicationDestinations).GUID;
-
-				PInvoke.CoCreateInstance(
-					&applicationDestinationsInstanceIid,
-					null,
-					CLSCTX.CLSCTX_LOCAL_SERVER,
-					&applicationDestinationsIid,
-					(void**)pApplicationDestinations.GetAddressOf())
-				.ThrowOnFailure();
-
-				// Set App ID
-				fixed (char* pszAppId = "Microsoft.Windows.Explorer")
-					pApplicationDestinations.Get()->SetAppID(pszAppId);
-
-				pApplicationDestinations.Get()->RemoveAllDestinations();
+				PInvoke.SHAddToRecentDocs((uint)SHARD.SHARD_PIDL, null);
 
 				return true;
 			}
@@ -230,6 +195,20 @@ private unsafe bool UpdateRecentItems(bool isFolder)
 					if (index is 20)
 						break;
 
+					// Exclude folders
+					if (pShellItem.Get()->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var attribute) == HRESULT.S_OK &&
+						(attribute & SFGAO_FLAGS.SFGAO_FOLDER) == SFGAO_FLAGS.SFGAO_FOLDER)
+						continue;
+
+					// Exclude favorite files
+					using ComPtr<IShellItem2> pShellItem2 = default;
+					var shellItem2Iid = typeof(IShellItem2).GUID;
+					hr = pShellItem.Get()->QueryInterface(&shellItem2Iid, (void**)pShellItem2.GetAddressOf());
+					hr = PInvoke.PSGetPropertyKeyFromName("System.Home.IsPinned", out var propertyKey);
+					hr = pShellItem2.Get()->GetString(propertyKey, out var szPropertyValue);
+					if (bool.TryParse(szPropertyValue.ToString(), out var isPinned) && isPinned)
+						continue;
+
 					// Get the target path
 					pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_DESKTOPABSOLUTEEDITING, out var szDisplayName);
 					var targetPath = szDisplayName.ToString();
@@ -241,21 +220,14 @@ private unsafe bool UpdateRecentItems(bool isFolder)
 					PInvoke.CoTaskMemFree(szDisplayName.Value);
 
 					// Strip the file extension except when the file name only contains extension (e.g. ".gitignore")
-					if (!FoldersSettingsService.ShowFileExtensions)
-					{
-						string strippedExtension = SystemIO.Path.GetFileNameWithoutExtension(fileName);
-						fileName = string.IsNullOrEmpty(strippedExtension) ? SystemIO.Path.GetFileName(fileName) : strippedExtension;
-					}
-
-					// Get the PIDL
-					PInvoke.SHGetIDListFromObject((IUnknown*)pShellItem.Get(), out var pidl);
+					if (!FoldersSettingsService.ShowFileExtensions &&
+						SystemIO.Path.GetFileNameWithoutExtension(fileName) is string fileNameWithoutExtension)
+						fileName = string.IsNullOrEmpty(fileNameWithoutExtension) ? SystemIO.Path.GetFileName(fileName) : fileNameWithoutExtension;
 
 					// Get the date last modified
-					using ComPtr<IShellItem2> pShellItem2 = default;
-					var shellItem2Iid = typeof(IShellItem2).GUID;
 					hr = pShellItem.Get()->QueryInterface(&shellItem2Iid, (void**)pShellItem2.GetAddressOf());
-					hr = PInvoke.PSGetPropertyKeyFromName("System.DateCreated", out var propertyKey);
-					hr = pShellItem2.Get()->GetString(propertyKey, out var szPropertyValue);
+					hr = PInvoke.PSGetPropertyKeyFromName("System.DateModified", out propertyKey);
+					hr = pShellItem2.Get()->GetString(propertyKey, out szPropertyValue);
 					if (DateTime.TryParse(szPropertyValue.ToString(), out var lastModified))
 						lastModified = DateTime.MinValue;
 

src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs

@@ -286,13 +286,10 @@ await Task.Run(() =>
 		private async Task ExecuteClearRecentItemsCommand()
 		{
 			await _refreshRecentFilesSemaphore.WaitAsync();
+
 			try
 			{
-				Items.Clear();
-				bool success = WindowsRecentItemsService.Clear();
-
-				if (success)
-					IsEmptyRecentFilesTextVisible = true;
+				WindowsRecentItemsService.Clear();
 			}
 			finally
 			{