Update

Author: 0x5bfa

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

@@ -6,6 +6,7 @@
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.System.Com;
+using Windows.Win32.System.WinRT;
 
 namespace Windows.Win32
 {
@@ -16,8 +17,13 @@ public unsafe struct ComPtr<T> : IDisposable where T : unmanaged, IComIID
 	{
 		private T* _ptr;
 
-		public bool IsNull
-			=> _ptr == null;
+		public readonly bool IsNull
+		{
+			[MethodImpl(MethodImplOptions.AggressiveInlining)]
+			get => _ptr is null;
+		}
+
+		// Constructors
 
 		public ComPtr(T* ptr)
 		{
@@ -27,6 +33,9 @@ public ComPtr(T* ptr)
 				((IUnknown*)ptr)->AddRef();
 		}
 
+		// Methods
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public void Attach(T* other)
 		{
 			if (_ptr is not null)
@@ -35,6 +44,14 @@ public void Attach(T* other)
 			_ptr = other;
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public T* Detach()
+		{
+			T* ptr = _ptr;
+			_ptr = null;
+			return ptr;
+		}
+
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public readonly T* Get()
 		{
@@ -48,19 +65,62 @@ public void Attach(T* other)
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		[Obsolete("Use `HRESULT As<U>(U** other)` instead.")]
 		public readonly ComPtr<U> As<U>() where U : unmanaged, IComIID
 		{
 			ComPtr<U> ptr = default;
 			((IUnknown*)_ptr)->QueryInterface((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in U.Guid)), (void**)ptr.GetAddressOf());
 			return ptr;
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public readonly HRESULT As<U>(U** other) where U : unmanaged, IComIID
+		{
+			return ((IUnknown*)_ptr)->QueryInterface((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in U.Guid)), (void**)other);
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public readonly HRESULT As<U>(Guid* riid, IUnknown** other) where U : unmanaged, IComIID
+		{
+			return ((IUnknown*)_ptr)->QueryInterface(riid, (void**)other);
+		}
+
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public readonly HRESULT CoCreateInstance(Guid* rclsid, IUnknown* pUnkOuter = null, CLSCTX dwClsContext = CLSCTX.CLSCTX_LOCAL_SERVER)
 		{
 			return PInvoke.CoCreateInstance(rclsid, pUnkOuter, dwClsContext, (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in T.Guid)), (void**)this.GetAddressOf());
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public readonly HRESULT GetAgileReference(ref ComPtr<IAgileReference> pAgileReference)
+		{
+			return PInvoke.RoGetAgileReference(AgileReferenceOptions.AGILEREFERENCE_DEFAULT, (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in T.Guid)), (IUnknown*)_ptr, pAgileReference.GetAddressOf());
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public readonly HRESULT ResolveAgileReference(ref ComPtr<IAgileReference> pAgileReference, ref ComPtr<T> other)
+		{
+			return pAgileReference.Get()->Resolve((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in T.Guid)), (void**)other.GetAddressOf());
+		}
+
+		// Conversion operators
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static implicit operator ComPtr<T>(T* other)
+		{
+			ComPtr<T> ptr = default;
+			ptr.Attach(other);
+			return ptr;
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static implicit operator T*(ComPtr<T> other)
+		{
+			return other._ptr;
+		}
+
+		// Disposer
+
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public void Dispose()
 		{

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

@@ -26,7 +26,7 @@ public sealed partial class WidgetFolderCardItem : WidgetCardItem, IWidgetCardIt
 
 		public WidgetFolderCardItem(IWindowsStorable item, string text, bool isPinned)
 		{
-			AutomationProperties = Text;
+			AutomationProperties = text;
 			Item = item;
 			Text = text;
 			IsPinned = isPinned;

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

@@ -191,11 +191,7 @@ public override async Task ExecutePinToSidebarCommand(WidgetCardItem? item)
 
 			unsafe
 			{
-				hr = PInvoke.RoGetAgileReference(
-					AgileReferenceOptions.AGILEREFERENCE_DEFAULT,
-					IID.IID_IShellItem,
-					(IUnknown*)folderCardItem.Item.ThisPtr.Get(),
-					pAgileReference.GetAddressOf());
+				hr = PInvoke.RoGetAgileReference(AgileReferenceOptions.AGILEREFERENCE_DEFAULT, IID.IID_IShellItem, (IUnknown*)folderCardItem.Item.ThisPtr.Get(), pAgileReference.GetAddressOf());
 			}
 
 			// Pin to Quick Access on Windows
@@ -214,19 +210,20 @@ public override async Task ExecutePinToSidebarCommand(WidgetCardItem? item)
 			if (hr.ThrowIfFailedOnDebug().Failed)
 				return;
 
-			// Remove it from the collection
-			Items.Remove(folderCardItem);
-
 			// Add this to right before the last pinned item
-			var theLastPinnedItem = Items.LastOrDefault(x => x.IsPinned);
-			Items.Insert(theLastPinnedItem is not null ? Items.IndexOf(theLastPinnedItem) : 0, folderCardItem);
+			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)
+				Items.Move(currentPinnedItemIndex, lastPinnedItemIndex + 1);
 		}
 
 		public override async Task ExecuteUnpinFromSidebarCommand(WidgetCardItem? item)
 		{
 			if (item is not WidgetFolderCardItem folderCardItem || item.Path is null)
 				return;
 
+			// Undocumented verb, which calls an undocumented COM class, windows.storage.dll!CPinToFrequentExecute CRemoveFromFrequentPlacesExecute CRemoveFromRecentPlacesExecute
+
 			// Unpin from Quick Access on Windows
 			HRESULT hr = await STATask.Run(() => folderCardItem.Item.TryInvokeContextMenuVerbs(["unpinfromhome", "remove"], true));
 			if (hr.ThrowIfFailedOnDebug().Failed)