Fix: Fixed crash that would occur when switching between Network and Recycle Bin (#10728)

Author: QuaintMako

src/Files.App/Filesystem/RecentItem.cs

@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using Files.App.Filesystem.StorageItems;
 using Files.App.Helpers;
 using Files.Shared;
 using Microsoft.UI.Xaml.Media.Imaging;
@@ -63,8 +64,8 @@ public RecentItem(ShellLinkItem linkItem) : base()
 		/// <param name="fileItem">The shell file item</param>
 		public RecentItem(ShellFileItem fileItem) : base()
 		{
-			LinkPath = fileItem.FilePath;   // intentionally the same
-			RecentPath = fileItem.FilePath; // intentionally the same
+			LinkPath = ShellStorageFolder.IsShellPath(fileItem.FilePath) ? fileItem.RecyclePath : fileItem.FilePath; // use true path on disk for shell items
+			RecentPath = LinkPath; // intentionally the same
 			Name = NameOrPathWithoutExtension(fileItem.FileName);
 			Type = fileItem.IsFolder ? StorageItemTypes.Folder : StorageItemTypes.File;
 			FolderImg = fileItem.IsFolder;

src/Files.App/Filesystem/StorageItems/ShellStorageFile.cs

@@ -1,5 +1,6 @@
 using Files.App.Shell;
 using Files.Shared;
+using Files.Shared.Extensions;
 using System;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
@@ -85,10 +86,18 @@ public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
 			return Task.FromResult<BaseStorageFile>(null).AsAsyncOperation();
 		}
 
-		private static ShellFileItem GetFile(string path)
+		private static ShellFileItem? GetFile(string path)
 		{
-			using var shellItem = ShellFolderExtensions.GetShellItemFromPathOrPidl(path);
-			return ShellFolderExtensions.GetShellFileItem(shellItem);
+			try
+			{
+				using var shellItem = ShellFolderExtensions.GetShellItemFromPathOrPidl(path);
+				return ShellFolderExtensions.GetShellFileItem(shellItem);
+			}
+			catch
+			{
+				// Can happen when dealing with recent items or when browsing shell:::{679f85cb-0220-4080-b29b-5540cc05aab6}
+				return default;
+			}
 		}
 
 		public override bool IsEqual(IStorageItem item) => item?.Path == Path;

src/Files.App/Shell/ShellFolderExtensions.cs

@@ -53,7 +53,8 @@ public static ShellFileItem GetShellFileItem(ShellItem folderItem)
 					"::{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}" => "Shell:NetworkPlacesFolder",
 					"::{208D2C60-3AEA-1069-A2D7-08002B30309D}" => "Shell:NetworkPlacesFolder",
 					// Use PIDL as path
-					_ => $@"\\SHELL\{string.Join("\\", folderItem.PIDL.Select(x => x.GetBytes()).Select(x => Convert.ToBase64String(x, 0, x.Length)))}"
+					// Replace "/" with "_" to avoid confusion with path separator
+					_ => $@"\\SHELL\{string.Join("\\", folderItem.PIDL.Select(x => x.GetBytes()).Select(x => Convert.ToBase64String(x, 0, x.Length).Replace("/", "_")))}"
 				};
 			}
 			var fileName = folderItem.Properties.TryGetProperty<string>(Ole32.PROPERTYKEY.System.ItemNameDisplay);
@@ -122,8 +123,9 @@ public static bool GetStringAsPidl(string pathOrPidl, out Shell32.PIDL pidl)
 			if (pathOrPidl.StartsWith(@"\\SHELL\", StringComparison.Ordinal))
 			{
 				pidl = pathOrPidl.Replace(@"\\SHELL\", "", StringComparison.Ordinal)
+					.Replace("_", "/") // Avoid confusion with path separator
 					.Split('\\', StringSplitOptions.RemoveEmptyEntries)
-					.Select(pathSegment => new Shell32.PIDL(pathSegment))
+					.Select(pathSegment => new Shell32.PIDL(Convert.FromBase64String(pathSegment)))
 					.Aggregate((x, y) => Shell32.PIDL.Combine(x, y));
 				return true;
 			}