Code Quality: Improved WindowsStorables

[0x5bfa]

Resolved / Related Issues

• Code Quality: Replace Vanara with CsWin32 #15000

Steps used to test these changes

• Launch the app
• Load Home page

[0x5bfa]

@dongle-the-gadget Could you review for real quick? I unwrapped the ptr-s where they are passed to constructors of WindowsFile or WindowsFolder, which means they shouldnt be disposed outside the block where defined.

[0x5bfa]

I just wanna make sure pointer managements around windows storables are done appropriately.

[dongle-the-gadget]

Do you have some code where the storables are used? In general you shouldn't call Release on the pointers you pass to the constructor as it looks like those objects take ownership.

[0x5bfa]

I've ensured all of the instantiation is done witout releasing.

// Instead of:

ComPtr<IShellItem> pShellItem = ...;
var folder = new WindowsFolder(pShellItem.Get());

// Did this. because no reason to use ComPtr.

IShellItem* pShellItem = ...;
var folder = new WindowsFolder(pShellItem);

Files/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorable.cs

Lines 36 to 55 in acac1a3

	public static WindowsStorable? TryParse(string szPath)
	{
	HRESULT hr = default;
	IShellItem* pShellItem = null;
	fixed (char* pszPath = szPath)
	hr = PInvoke.SHCreateItemFromParsingName(pszPath, null, IID.IID_IShellItem, (void**)&pShellItem);
	if (pShellItem is null)
	return null;
	return TryParse(pShellItem);
	}
	public static WindowsStorable? TryParse(IShellItem* pShellItem)
	{
	bool isFolder = pShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded && returnedAttributes == SFGAO_FLAGS.SFGAO_FOLDER;
	return isFolder ? new WindowsFolder(pShellItem) : new WindowsFile(pShellItem);
	}

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

Lines 235 to 253 in acac1a3

	unsafe
	{
	hr = PInvoke.RoGetAgileReference(AgileReferenceOptions.AGILEREFERENCE_DEFAULT, IID.IID_IShellItem, (IUnknown*)folderCardItem.Item.ThisPtr, pAgileReference.GetAddressOf());
	}
	// Unpin from Quick Access on Windows
	hr = await STATask.Run(() =>
	{
	unsafe
	{
	IShellItem* pShellItem = null;
	hr = pAgileReference.Get()->Resolve(IID.IID_IShellItem, (void**)&pShellItem);
	using 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);
	}
	});

[dongle-the-gadget]

Is everything then disposed?

[dongle-the-gadget]

Is everything then disposed?

[yaira2]

Steps used to test these changes