Req

Author: 0x5bfa

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

@@ -55,14 +55,14 @@ public void Attach(T* ptr)
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public bool Allocate(nuint cch)
 		{
-			_ptr = (T*)NativeMemory.Alloc(cch); // malloc()
+			_ptr = (T*)NativeMemory.Alloc(cch * (nuint)sizeof(T)); // malloc()
 			return _ptr is not null;
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public bool Reallocate(nuint cch)
 		{
-			T* ptr = (T*)NativeMemory.Realloc(_ptr, cch); // realloc()
+			T* ptr = (T*)NativeMemory.Realloc(_ptr, cch * (nuint)sizeof(T)); // realloc()
 			if (ptr is null) return false;
 			_ptr = ptr;
 			return true;

src/Files.App.Storage/Windows/Helpers/WindowsStorageHelpers.System.cs

@@ -16,7 +16,7 @@ public static partial class WindowsStorableHelpers
 			bool fRes = pszBuffer.Allocate(1024U);
 			if (!fRes) return null;
 
-			uint cchBuffer = PInvoke.GetEnvironmentVariable((PCWSTR)Unsafe.AsPointer(ref Unsafe.AsRef(in name.GetPinnableReference())), pszBuffer.Get(), (uint)name.Length + 1);
+			uint cchBuffer = PInvoke.GetEnvironmentVariable((PCWSTR)Unsafe.AsPointer(ref Unsafe.AsRef(in name.GetPinnableReference())), pszBuffer.Get(), 1024U);
 			return cchBuffer is 0U ? null : new(pszBuffer.Get());
 		}
 

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

@@ -23,6 +23,8 @@ namespace Files.App.Storage
 	/// </remarks>
 	public unsafe class JumpListManager : IDisposable
 	{
+		private static readonly Lock _updateJumpListLock = new();
+
 		private string _aumid = null!;
 		private string _exeAlias = null!;
 		private string _recentCategoryName = null!;
@@ -36,14 +38,14 @@ public unsafe class JumpListManager : IDisposable
 
 		private JumpListManager() { }
 
-		public static JumpListManager? Create(string amuid, string exeAlias)
+		public static JumpListManager? Create(string aumid, string exeAlias)
 		{
 			var categoryName = WindowsStorableHelpers.ResolveIndirectString($"@{{{WindowsStorableHelpers.GetEnvironmentVariable("SystemRoot")}\\SystemResources\\Windows.UI.ShellCommon\\Windows.UI.ShellCommon.pri? ms-resource://Windows.UI.ShellCommon/JumpViewUI/JumpViewCategoryType_Recent}}");
 			if (categoryName is null) return null;
 
 			return new JumpListManager()
 			{
-				_aumid = amuid,
+				_aumid = aumid,
 				_exeAlias = exeAlias,
 				_recentCategoryName = categoryName,
 			};
@@ -111,12 +113,12 @@ public HRESULT PullJumpListFromExplorer(int maxCount = 200)
 					if (FAILED(hr)) continue;
 
 					// Get an instance of IShellLinkW from the IShellItem instance
-					IShellLinkW* psl = default;
-					hr = CreateLinkFromItem(psi.Get(), &psl);
+					using ComPtr<IShellLinkW> psl = default;
+					hr = CreateLinkFromItem(psi.Get(), psl.GetAddressOf());
 					if (FAILED(hr)) continue;
 
 					// Pin it to the Files' Automatic Destinations
-					hr = pFilesADL.Get()->PinItem((IUnknown*)psl, pinIndex);
+					hr = pFilesADL.Get()->PinItem((IUnknown*)psl.Get(), pinIndex);
 					if (FAILED(hr)) continue;
 				}
 
@@ -147,12 +149,12 @@ public HRESULT PullJumpListFromExplorer(int maxCount = 200)
 					if (SUCCEEDED(hr)) continue; // If not pinned, HRESULT is E_NOT_SET
 
 					// Get an instance of IShellLinkW from the IShellItem instance
-					IShellLinkW* psl = default;
-					hr = CreateLinkFromItem(psi.Get(), &psl);
+					using ComPtr<IShellLinkW> psl = default;
+					hr = CreateLinkFromItem(psi.Get(), psl.GetAddressOf());
 					if (FAILED(hr)) continue;
 
 					// Add it to the Files' Custom Destinations
-					hr = pNewObjectCollection.Get()->AddObject((IUnknown*)psl);
+					hr = pNewObjectCollection.Get()->AddObject((IUnknown*)psl.Get());
 					if (FAILED(hr)) continue;
 				}
 
@@ -224,7 +226,8 @@ public HRESULT PushJumpListToExplorer(int maxCount = 200)
 
 				// Get the count of categories in the Files' Custom Destinations
 				uint count = 0U;
-				pFilesICDL.Get()->GetCategoryCount(&count);
+				hr = pFilesICDL.Get()->GetCategoryCount(&count);
+				if (FAILED(hr)) return hr;
 
 				// Find the "Recent" category index
 				uint indexOfRecentCategory = 0U;
@@ -254,6 +257,7 @@ category.Type is not APPDESTCATEGORYTYPE.CUSTOM ||
 				// Get the items in the "Recent" category
 				using ComPtr<IObjectCollection> poc = default;
 				hr = pFilesICDL.Get()->EnumerateCategoryDestinations(indexOfRecentCategory, IID.IID_IObjectCollection, (void**)poc.GetAddressOf());
+				if (FAILED(hr)) return hr;
 
 				// Get the count of items in the "Recent" category
 				uint countOfItems = 0U;
@@ -274,6 +278,7 @@ category.Type is not APPDESTCATEGORYTYPE.CUSTOM ||
 					using ComHeapPtr<char> pszParseablePath = default;
 					pszParseablePath.Allocate(PInvoke.MAX_PATH);
 					hr = psl.Get()->GetArguments(pszParseablePath.Get(), (int)PInvoke.MAX_PATH);
+					if (FAILED(hr)) continue;
 
 					using ComHeapPtr<IShellItem> psi = default;
 					hr = PInvoke.SHCreateItemFromParsingName(pszParseablePath.Get(), null, IID.IID_IShellItem, (void**)psi.GetAddressOf());
@@ -308,6 +313,7 @@ category.Type is not APPDESTCATEGORYTYPE.CUSTOM ||
 					using ComHeapPtr<char> pszParseablePath = default;
 					pszParseablePath.Allocate(PInvoke.MAX_PATH);
 					hr = psl.Get()->GetArguments(pszParseablePath.Get(), (int)PInvoke.MAX_PATH);
+					if (FAILED(hr)) continue;
 
 					using ComHeapPtr<IShellItem> psi = default;
 					hr = PInvoke.SHCreateItemFromParsingName(pszParseablePath.Get(), null, IID.IID_IShellItem, (void**)psi.GetAddressOf());
@@ -491,33 +497,42 @@ private HRESULT GetFolderIconLocation(IShellItem* psi, PWSTR* pIconFilePath, uin
 
 		private void ExplorerJumpListWatcher_Changed(object sender, FileSystemEventArgs e)
 		{
-			ExplorerJumpListChanged?.Invoke(this, EventArgs.Empty);
-			PullJumpListFromExplorer();
+			lock (_updateJumpListLock)
+			{
+				ExplorerJumpListChanged?.Invoke(this, EventArgs.Empty);
+				PullJumpListFromExplorer();
+			}
 		}
 
 		private void FilesJumpListWatcher_Changed(object sender, FileSystemEventArgs e)
 		{
-			FilesJumpListChanged?.Invoke(this, EventArgs.Empty);
-			PushJumpListToExplorer();
+			lock (_updateJumpListLock)
+			{
+				FilesJumpListChanged?.Invoke(this, EventArgs.Empty);
+				PushJumpListToExplorer();
+			}
 		}
 
 		public void Dispose()
 		{
 			if (_explorerADLStoreFileWatcher is not null)
 			{
 				_explorerADLStoreFileWatcher.EnableRaisingEvents = false;
+				_explorerADLStoreFileWatcher.Changed -= ExplorerJumpListWatcher_Changed;
 				_explorerADLStoreFileWatcher.Dispose();
 			}
 
 			if (_filesADLStoreFileWatcher is not null)
 			{
 				_filesADLStoreFileWatcher.EnableRaisingEvents = false;
+				_filesADLStoreFileWatcher.Changed -= FilesJumpListWatcher_Changed;
 				_filesADLStoreFileWatcher.Dispose();
 			}
 
 			if (_filesCDLStoreFileWatcher is not null)
 			{
 				_filesCDLStoreFileWatcher.EnableRaisingEvents = false;
+				_filesCDLStoreFileWatcher.Changed -= FilesJumpListWatcher_Changed;
 				_filesCDLStoreFileWatcher.Dispose();
 			}
 		}

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

@@ -167,7 +167,7 @@ await Task.WhenAll(
 				if (JumpListManager is not null)
 				{
 					HRESULT hr = JumpListManager.PullJumpListFromExplorer();
-					if (hr.Failed) App.Logger.LogWarning("Failed to synchronizing jump list unexpectedly.");
+					if (hr.Failed) App.Logger.LogWarning("Failed to synchronize jump list unexpectedly.");
 
 					bool result = JumpListManager.WatchJumpListChanges(AppUserModelIdCrcHash);
 					if (!result) App.Logger.LogWarning("Failed to watch jump list unexpectedly.");

src/Files.App/ViewModels/ShellViewModel.cs

@@ -228,7 +228,13 @@ public async Task SetWorkingDirectoryAsync(string? value)
 			if (value == "Home" || value == "ReleaseNotes" || value == "Settings")
 				currentStorageFolder = null;
 			else
-				AppLifecycleHelper.JumpListManager?.AddFolderToRecentCategory(value);
+			{
+				_ = STATask.Run(() =>
+				{
+					AppLifecycleHelper.JumpListManager?.AddFolderToRecentCategory(value);
+				},
+				App.Logger);
+			}
 
 			WorkingDirectory = value;