Update

Author: 0x5bfa

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Microsoft.UI.Xaml.Controls;
-using Vanara.PInvoke;
 using Windows.Foundation.Metadata;
 
 namespace Files.App.Actions
@@ -55,19 +54,12 @@ await confirmationDialog.TryShowAsync() is ContentDialogResult.Primary)
 			{
 				var banner = StatusCenterHelper.AddCard_EmptyRecycleBin(ReturnResult.InProgress);
 
-				bool bResult = await Task.Run(() =>
-					Shell32.SHEmptyRecycleBin(
-						IntPtr.Zero,
-						null,
-						Shell32.SHERB.SHERB_NOCONFIRMATION | Shell32.SHERB.SHERB_NOPROGRESSUI)
-					.Succeeded);
+				bool bResult = await WindowsRecycleBinService.DeleteAllAsync();
 
 				StatusCenterViewModel.RemoveItem(banner);
 
-				if (bResult)
-					StatusCenterHelper.AddCard_EmptyRecycleBin(ReturnResult.Success);
-				else
-					StatusCenterHelper.AddCard_EmptyRecycleBin(ReturnResult.Failed);
+				// Post a status based on the result
+				StatusCenterHelper.AddCard_EmptyRecycleBin(bResult ? ReturnResult.Success : ReturnResult.Failed);
 			}
 		}
 

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Microsoft.UI.Xaml.Controls;
-using Vanara.Windows.Shell;
 using Windows.Foundation.Metadata;
 
 namespace Files.App.Actions
@@ -42,9 +41,20 @@ public async Task ExecuteAsync(object? parameter = null)
 			if (await confirmationDialog.TryShowAsync() is not ContentDialogResult.Primary)
 				return;
 
+			//using var sop = new ShellFileOperations { Options = GetDeleteOpFlags(hideUI) };
+			//HRESULT hr = HRESULT.S_OK;
+
 			try
 			{
-				RecycleBin.RestoreAll();
+				//foreach (var item in deletedItems)
+				//{
+				//	if (item.Parent != ShellFolderInstance) throw new InvalidOperationException("Unable to restore a ShellItem that is not in the Recycle Bin.");
+				//	// Manually create a ShellFolder instance to the original location.
+				//	using var sf = new ShellFolder(Path.GetDirectoryName(item.Name)!);
+				//	sop.QueueMoveOperation(item, sf, Path.GetFileName(item.Name));
+				//}
+				//sop.PerformOperations();
+				//hr.ThrowIfFailed();
 			}
 			catch (Exception)
 			{
@@ -59,6 +69,17 @@ public async Task ExecuteAsync(object? parameter = null)
 
 				await errorDialog.TryShowAsync();
 			}
+			finally
+			{
+				try
+				{
+					// Call the undocumented function to reset the icon.
+					//SHUpdateRecycleBinIcon();
+				}
+				catch
+				{
+				}
+			}
 		}
 	}
 }

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

@@ -15,7 +15,7 @@ public interface IWindowsRecycleBinService : ITrashWatcher
 
 		bool HasItems();
 
-		bool DeleteAll();
+		Task<bool> DeleteAllAsync();
 
 		bool RestoreAll();
 	}

src/Files.App/NativeMethods.txt

@@ -70,3 +70,4 @@ D3D11CreateDevice
 IDXGIDevice
 DCompositionCreateDevice
 IDCompositionDevice
+SHEmptyRecycleBin

src/Files.App/Services/Windows/WindowsRecycleBinService.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using System.Security.Principal;
+using Windows.Win32;
 
 namespace Files.App.Services
 {
@@ -74,9 +75,16 @@ public bool HasItems()
 		}
 
 		/// <inheritdoc/>
-		public bool DeleteAll()
+		public async Task<bool> DeleteAllAsync()
 		{
-			return true;
+			bool fRes = await Task.Run(() =>
+				PInvoke.SHEmptyRecycleBin(
+					new(),
+					string.Empty,
+					0x00000001 | 0x00000002 /*SHERB_NOCONFIRMATION | SHERB_NOPROGRESSUI*/)
+				.Succeeded);
+
+			return fRes;
 		}
 
 		/// <inheritdoc/>