Wrap up

Author: 0x5bfa

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

@@ -186,6 +186,11 @@ public override async Task ExecutePinToSidebarCommand(WidgetCardItem? item)
 			if (item is not WidgetFolderCardItem folderCardItem || folderCardItem.Path is null)
 				return;
 
+			var lastPinnedItemIndex = Items.LastOrDefault(x => x.IsPinned) is { } lastPinnedItem ? Items.IndexOf(lastPinnedItem) : 0;
+			var currentPinnedItemIndex = Items.IndexOf(folderCardItem);
+			if (currentPinnedItemIndex is -1)
+				return;
+
 			HRESULT hr = default;
 			using ComPtr<IAgileReference> pAgileReference = default;
 
@@ -203,6 +208,7 @@ public override async Task ExecutePinToSidebarCommand(WidgetCardItem? item)
 					hr = pAgileReference.Get()->Resolve(IID.IID_IShellItem, (void**)pShellItem.GetAddressOf());
 					var windowsFile = new WindowsFile(pShellItem);
 
+					// NOTE: "pintohome" is an undocumented verb, which calls an undocumented COM class, windows.storage.dll!CPinToFrequentExecute : public IExecuteCommand, ...
 					return windowsFile.TryInvokeContextMenuVerb("pintohome");
 				}
 			});
@@ -211,21 +217,39 @@ public override async Task ExecutePinToSidebarCommand(WidgetCardItem? item)
 				return;
 
 			// Add this to right before the last pinned item
-			var lastPinnedItemIndex = Items.LastOrDefault(x => x.IsPinned) is { } lastPinnedItem ? Items.IndexOf(lastPinnedItem) : 0;
-			var currentPinnedItemIndex = Items.IndexOf(folderCardItem);
-			if (lastPinnedItemIndex != currentPinnedItemIndex && currentPinnedItemIndex is not -1)
+			// NOTE: To be honest, this is not needed as the file watcher will take care of this
+			if (lastPinnedItemIndex + 1 != currentPinnedItemIndex)
 				Items.Move(currentPinnedItemIndex, lastPinnedItemIndex + 1);
 		}
 
 		public override async Task ExecuteUnpinFromSidebarCommand(WidgetCardItem? item)
 		{
-			if (item is not WidgetFolderCardItem folderCardItem || item.Path is null)
+			if (item is not WidgetFolderCardItem folderCardItem || folderCardItem.Path is null)
 				return;
 
-			// Undocumented verb, which calls an undocumented COM class, windows.storage.dll!CPinToFrequentExecute CRemoveFromFrequentPlacesExecute CRemoveFromRecentPlacesExecute
+			HRESULT hr = default;
+			using ComPtr<IAgileReference> pAgileReference = default;
+
+			unsafe
+			{
+				hr = PInvoke.RoGetAgileReference(AgileReferenceOptions.AGILEREFERENCE_DEFAULT, IID.IID_IShellItem, (IUnknown*)folderCardItem.Item.ThisPtr.Get(), pAgileReference.GetAddressOf());
+			}
 
 			// Unpin from Quick Access on Windows
-			HRESULT hr = await STATask.Run(() => folderCardItem.Item.TryInvokeContextMenuVerbs(["unpinfromhome", "remove"], true));
+			hr = await STATask.Run(() =>
+			{
+				unsafe
+				{
+					using ComPtr<IShellItem> pShellItem = default;
+					hr = pAgileReference.Get()->Resolve(IID.IID_IShellItem, (void**)pShellItem.GetAddressOf());
+					var windowsFile = new WindowsFile(pShellItem);
+
+					// NOTE: "unpinfromhome" is an undocumented verb, which calls an undocumented COM class, windows.storage.dll!CRemoveFromFrequentPlacesExecute : public IExecuteCommand, ...
+					// NOTE: "remove" is for some shell folders where the "unpinfromhome" may not work
+					return windowsFile.TryInvokeContextMenuVerbs(["unpinfromhome", "remove"], true);
+				}
+			});
+
 			if (hr.ThrowIfFailedOnDebug().Failed)
 				return;