Revert changes to the recycle bin service

Author: 0x5bfa

src/Files.App.CsWin32/Extras.cs

@@ -38,7 +38,7 @@ public static unsafe nint SetWindowLongPtr(HWND hWnd, WINDOW_LONG_PTR_INDEX nInd
 				: _SetWindowLongPtr(hWnd, (int)nIndex, dwNewLong);
 		}
 
-		[DllImport("User32", EntryPoint = "SHUpdateRecycleBinIcon")]
+		[DllImport("shell32.dll", EntryPoint = "SHUpdateRecycleBinIcon", CharSet = CharSet.Unicode, SetLastError = true)]
 		public static extern void SHUpdateRecycleBinIcon();
 	}
 

src/Files.App/Actions/FileSystem/EmptyRecycleBinAction.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml.Controls;
+using Windows.Foundation.Metadata;
 
 namespace Files.App.Actions
 {
@@ -42,16 +43,18 @@ public async Task ExecuteAsync(object? parameter = null)
 				Content = Strings.ConfirmEmptyBinDialogContent.GetLocalizedResource(),
 				PrimaryButtonText = Strings.Yes.GetLocalizedResource(),
 				SecondaryButtonText = Strings.Cancel.GetLocalizedResource(),
-				DefaultButton = ContentDialogButton.Primary,
-				XamlRoot = MainWindow.Instance.Content.XamlRoot
+				DefaultButton = ContentDialogButton.Primary
 			};
 
+			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				confirmationDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
 			if (UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy is DeleteConfirmationPolicies.Never ||
 				await confirmationDialog.TryShowAsync() is ContentDialogResult.Primary)
 			{
 				var banner = StatusCenterHelper.AddCard_EmptyRecycleBin(ReturnResult.InProgress);
 
-				bool result = await StorageTrashBinService.EmptyTrashBin();
+				bool result = await Task.Run(StorageTrashBinService.EmptyTrashBin);
 
 				StatusCenterViewModel.RemoveItem(banner);
 

src/Files.App/Data/Contracts/IStorageTrashBinService.cs

@@ -56,7 +56,7 @@ public interface IStorageTrashBinService
 		/// Deletes files and folders in Recycle Bin permanently.
 		/// </summary>
 		/// <returns>True if succeeded; otherwise, false</returns>
-		Task<bool> EmptyTrashBin();
+		bool EmptyTrashBin();
 
 		/// <summary>
 		/// Restores files and folders in Recycle Bin to original paths.

src/Files.App/Services/Storage/StorageTrashBinService.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Microsoft.Extensions.Logging;
 using System.Runtime.InteropServices;
 using Windows.Win32;
 using Windows.Win32.Foundation;
+using Windows.Win32.System.Com;
 using Windows.Win32.UI.Shell;
 
 namespace Files.App.Services
@@ -68,68 +68,76 @@ public async Task<bool> CanGoTrashBin(string? path)
 		}
 
 		/// <inheritdoc/>
-		public async Task<bool> EmptyTrashBin()
+		public bool EmptyTrashBin()
 		{
-			return await Win32Helper.StartSTATask(async () =>
+			// TODO: Use IFileOperation instead of its wrapper for the operation status to be reported.
+			var fRes = PInvoke.SHEmptyRecycleBin(
+				new(),
+				string.Empty,
+				0x00000001 | 0x00000002 /* SHERB_NOCONFIRMATION | SHERB_NOPROGRESSUI */)
+			.Succeeded;
+
+			return fRes;
+		}
+
+		/// <inheritdoc/>
+		public async Task<bool> RestoreAllTrashesAsync()
+		{
+			return await Win32Helper.StartSTATask(() =>
 			{
 				try
 				{
-					HRESULT hr = default;
-					IChildFolder recycleBinFolder = new WindowsFolder(PInvoke.FOLDERID_RecycleBinFolder);
-					using var bulkOperations = new WindowsBulkOperations(new(MainWindow.Instance.WindowHandle), FILEOPERATION_FLAGS.FOF_NO_UI);
-
-					await foreach (WindowsStorable item in recycleBinFolder.GetItemsAsync())
-						hr = bulkOperations.QueueDeleteOperation(item).ThrowIfFailedOnDebug();
-
-					// Perform the operations queued
-					hr = bulkOperations.PerformAllOperations().ThrowIfFailedOnDebug();
-
-					// Update the RecycleBin folder icon
-					PInvoke.SHUpdateRecycleBinIcon();
+					RestoreAllTrashesInternal();
 
 					return true;
 				}
-				catch (COMException ex)
+				catch
 				{
-					App.Logger.LogWarning(ex, ex.Message);
 					return false;
 				}
 			});
 		}
 
-		/// <inheritdoc/>
-		public async Task<bool> RestoreAllTrashesAsync()
+		private unsafe bool RestoreAllTrashesInternal()
 		{
-			return await Win32Helper.StartSTATask(async () =>
+			// Get IShellItem for Recycle Bin folder
+			using ComPtr<IShellItem> pRecycleBinFolderShellItem = default;
+			HRESULT hr = PInvoke.SHGetKnownFolderItem(FOLDERID.FOLDERID_RecycleBinFolder, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)pRecycleBinFolderShellItem.GetAddressOf());
+
+			// Get IEnumShellItems for Recycle Bin folder
+			using ComPtr<IEnumShellItems> pEnumShellItems = default;
+			hr = pRecycleBinFolderShellItem.Get()->BindToHandler(null, BHID.BHID_EnumItems, IID.IID_IEnumShellItems, (void**)pEnumShellItems.GetAddressOf());
+
+			// Initialize how to perform the operation
+			using ComPtr<IFileOperation> pFileOperation = default;
+			hr = PInvoke.CoCreateInstance(CLSID.CLSID_FileOperation, null, CLSCTX.CLSCTX_LOCAL_SERVER, IID.IID_IFileOperation, (void**)pFileOperation.GetAddressOf());
+			hr = pFileOperation.Get()->SetOperationFlags(FILEOPERATION_FLAGS.FOF_NO_UI);
+			hr = pFileOperation.Get()->SetOwnerWindow(new(MainWindow.Instance.WindowHandle));
+
+			using ComPtr<IShellItem> pShellItem = default;
+			while (pEnumShellItems.Get()->Next(1, pShellItem.GetAddressOf()) == HRESULT.S_OK)
 			{
-				try
-				{
-					HRESULT hr = default;
-					IChildFolder recycleBinFolder = new WindowsFolder(PInvoke.FOLDERID_RecycleBinFolder);
-					using var bulkOperations = new WindowsBulkOperations(new(MainWindow.Instance.WindowHandle), FILEOPERATION_FLAGS.FOF_NO_UI);
+				// Get the original path
+				using ComPtr<IShellItem2> pShellItem2 = default;
+				hr = pShellItem.Get()->QueryInterface(IID.IID_IShellItem2, (void**)pShellItem2.GetAddressOf());
+				hr = PInvoke.PSGetPropertyKeyFromName("System.Recycle.DeletedFrom", out var originalPathPropertyKey);
+				hr = pShellItem2.Get()->GetString(originalPathPropertyKey, out var szOriginalPath);
 
-					await foreach (WindowsStorable item in recycleBinFolder.GetItemsAsync())
-					{
-						item.GetPropertyValue("System.Recycle.DeletedFrom", out string originalLocationFolderPath);
+				// Get IShellItem of the original path
+				hr = PInvoke.SHCreateItemFromParsingName(szOriginalPath.ToString(), null, typeof(IShellItem).GUID, out var pOriginalPathShellItemPtr);
+				var pOriginalPathShellItem = (IShellItem*)pOriginalPathShellItemPtr;
 
-						if (WindowsStorable.TryParse(originalLocationFolderPath) is WindowsFolder originalLocationFolder)
-							hr = bulkOperations.QueueMoveOperation(item, originalLocationFolder, null).ThrowIfFailedOnDebug();
-					}
+				// Define the shell item to restore
+				hr = pFileOperation.Get()->MoveItem(pShellItem.Get(), pOriginalPathShellItem, default(PCWSTR), null);
+			}
 
-					// Perform the operations queued
-					hr = bulkOperations.PerformAllOperations().ThrowIfFailedOnDebug();
+			// Perform
+			hr = pFileOperation.Get()->PerformOperations();
 
-					// Update the RecycleBin folder icon
-					PInvoke.SHUpdateRecycleBinIcon();
+			// Reset the icon
+			PInvoke.SHUpdateRecycleBinIcon();
 
-					return true;
-				}
-				catch (COMException ex)
-				{
-					App.Logger.LogWarning(ex, ex.Message);
-					return false;
-				}
-			});
+			return true;
 		}
 	}
 }