Req

Author: 0x5bfa

src/Files.App.CsWin32/ComPtr`1.cs

@@ -50,6 +50,15 @@ public void Attach(T* other)
 			return ptr;
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public readonly HRESULT CopyTo(T** ptr)
+		{
+			InternalAddRef();
+			*ptr = _ptr;
+
+			return HRESULT.S_OK;
+		}
+
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public readonly T* Get()
 		{
@@ -80,6 +89,14 @@ public readonly HRESULT CoCreateInstance(Guid* rclsid, IUnknown* pUnkOuter = nul
 			return PInvoke.CoCreateInstance(rclsid, pUnkOuter, dwClsContext, (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in T.Guid)), (void**)this.GetAddressOf());
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		private readonly void InternalAddRef()
+		{
+			T* ptr = _ptr;
+			if (ptr != null)
+				_ = ((IUnknown*)ptr)->AddRef();
+		}
+
 		// Disposer
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Files.App.CsWin32/ManualGuids.cs

@@ -128,5 +128,8 @@ public static unsafe partial class FOLDERID
 	{
 		[GuidRVAGen.Guid("B7534046-3ECB-4C18-BE4E-64CD4CB7D6AC")]
 		public static partial Guid* FOLDERID_RecycleBinFolder { get; }
+
+		[GuidRVAGen.Guid("AE50C081-EBD2-438A-8655-8A092E34987A")]
+		public static partial Guid* FOLDERID_Recent { get; }
 	}
 }

src/Files.App.CsWin32/NativeMethods.txt

@@ -270,3 +270,10 @@ HCRYPTMSG
 CERT_QUERY_ENCODING_TYPE
 CertGetNameString
 IObjectCollection
+SHCNE_ID
+SHChangeNotifyRegister
+SHChangeNotifyDeregister
+HWND_MESSAGE
+SHChangeNotification_Lock
+SHChangeNotification_Unlock
+SHGetKnownFolderPath

src/Files.App.Storage/Windows/Managers/JumpListManager.cs

@@ -19,11 +19,14 @@ namespace Files.App.Storage
 	/// <remarks>
 	/// See <a href="https://github.com/0x5bfa/JumpListManager/blob/HEAD/JumpListManager/JumpList.cs" />
 	/// </remarks>
-	public unsafe static class JumpListManager
+	public unsafe class JumpListManager : IDisposable
 	{
+		private static readonly Lazy<JumpListManager> _default = new(() => new JumpListManager(), LazyThreadSafetyMode.ExecutionAndPublication);
+		public static JumpListManager Default => _default.Value;
+
 		private readonly static string _aumid = $"{Package.Current.Id.FamilyName}!App";
 
-		public static bool SyncWithExplorerJumpList(int maxCount)
+		public bool SyncWithExplorerJumpList(int maxCount = 30)
 		{
 			ClearAutomaticDestinations();
 			ClearCustomDestinations();
@@ -44,7 +47,15 @@ public static bool SyncWithExplorerJumpList(int maxCount)
 			return true;
 		}
 
-		private static bool ClearAutomaticDestinations()
+		public void WatchExplorerJumpListChanges()
+		{
+			// Get the path to the Explorer's automatic destinations file
+			using ComHeapPtr<char> pwszRecentFolderPath = default;
+			PInvoke.SHGetKnownFolderPath(FOLDERID.FOLDERID_Recent, KNOWN_FOLDER_FLAG.KF_FLAG_DONT_VERIFY | KNOWN_FOLDER_FLAG.KF_FLAG_NO_ALIAS, HANDLE.Null, (PWSTR*)pwszRecentFolderPath.GetAddressOf());
+			var path = $"{new(pwszRecentFolderPath.Get())}\\AutomaticDestinations";
+		}
+
+		private bool ClearAutomaticDestinations()
 		{
 			HRESULT hr = default;
 
@@ -66,7 +77,7 @@ private static bool ClearAutomaticDestinations()
 			return true;
 		}
 
-		private static bool ClearCustomDestinations()
+		private bool ClearCustomDestinations()
 		{
 			using ComPtr<IInternalCustomDestinationList> picdl = default;
 			HRESULT hr = PInvoke.CoCreateInstance(CLSID.CLSID_DestinationList, null, CLSCTX.CLSCTX_INPROC_SERVER, IID.IID_IInternalCustomDestinationList, (void**)picdl.GetAddressOf());
@@ -106,7 +117,7 @@ private static bool ClearCustomDestinations()
 			return false;
 		}
 
-		private static bool EnsureRecentCategoryIsVisible()
+		private bool EnsureRecentCategoryIsVisible()
 		{
 			HRESULT hr = default;
 
@@ -124,7 +135,7 @@ private static bool EnsureRecentCategoryIsVisible()
 			return true;
 		}
 
-		private static bool GetRecentItemsFromExplorer(int maxCount, IObjectCollection** ppoc)
+		private bool GetRecentItemsFromExplorer(int maxCount, IObjectCollection** ppoc)
 		{
 			HRESULT hr = default;
 
@@ -149,7 +160,7 @@ private static bool GetRecentItemsFromExplorer(int maxCount, IObjectCollection**
 			return true;
 		}
 
-		private static bool GetPinnedItemsFromExplorer(int maxCount, IObjectCollection** ppoc)
+		private bool GetPinnedItemsFromExplorer(int maxCount, IObjectCollection** ppoc)
 		{
 			HRESULT hr = default;
 
@@ -174,7 +185,7 @@ private static bool GetPinnedItemsFromExplorer(int maxCount, IObjectCollection**
 			return true;
 		}
 
-		private static bool CopyToFilesAutomaticDestinations(IObjectCollection* pRecentOC, IObjectCollection* pPinnedOC)
+		private bool CopyToFilesAutomaticDestinations(IObjectCollection* pRecentOC, IObjectCollection* pPinnedOC)
 		{
 			HRESULT hr = default;
 
@@ -223,5 +234,15 @@ private static bool CopyToFilesAutomaticDestinations(IObjectCollection* pRecentO
 
 			return true;
 		}
+
+		private void Watcher_FileChanged()
+		{
+			// Sync the jump list when the Explorer's automatic destinations file changes
+			SyncWithExplorerJumpList();
+		}
+
+		public void Dispose()
+		{
+		}
 	}
 }

src/Files.App/App.xaml.cs

@@ -318,5 +318,10 @@ private static void LastOpenedFlyout_Closed(object? sender, object e)
 			if (_LastOpenedFlyout == commandBarFlyout)
 				_LastOpenedFlyout = null;
 		}
+
+		~App()
+		{
+			JumpListManager.Default.Dispose();
+		}
 	}
 }

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

@@ -123,7 +123,11 @@ await Task.WhenAll(
 
 			FileTagsHelper.UpdateTagsDb();
 
-			_ = STATask.Run(() => { JumpListManager.SyncWithExplorerJumpList(50); });
+			_ = STATask.Run(() =>
+			{
+				JumpListManager.Default.SyncWithExplorerJumpList(50);
+				JumpListManager.Default.WatchExplorerJumpListChanges();
+			});
 
 			static Task OptionalTaskAsync(Task task, bool condition)
 			{

src/Files.App/Strings/en-US/Resources.resw

@@ -518,6 +518,9 @@
   <data name="PropertiesDriveFileSystem.Text" xml:space="preserve">
     <value>File system:</value>
   </data>
+  <data name="JumpListRecentGroupHeader" xml:space="preserve">
+    <value>Recent</value>
+  </data>
   <data name="TabStripDragAndDropUIOverrideCaption" xml:space="preserve">
     <value>Move tab here</value>
   </data>
@@ -4319,7 +4322,4 @@
   <data name="FailedToOpenLogFile" xml:space="preserve">
     <value>Unable to open the log file</value>
   </data>
-  <data name="Recent" xml:space="preserve">
-    <value>Recent</value>
-  </data>
 </root>

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

@@ -146,7 +146,7 @@ private void AddDateTimeOptions()
 
 		private void InitStartupSettingsRecentFoldersFlyout()
 		{
-			var recentsItem = new MenuFlyoutSubItemViewModel(Strings.Recent.GetLocalizedResource());
+			var recentsItem = new MenuFlyoutSubItemViewModel(Strings.JumpListRecentGroupHeader.GetLocalizedResource());
 			recentsItem.Items.Add(new MenuFlyoutItemViewModel(Strings.Home.GetLocalizedResource())
 			{
 				Command = AddPageCommand,