Test code

Author: 0x5bfa

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

@@ -45,7 +45,7 @@ public unsafe WindowsBulkOperations(HWND owner = default, FILEOPERATION_FLAGS fl
 			var clsid = typeof(FileOperation).GUID;
 			var iid = typeof(IFileOperation).GUID;
 
-			PInvoke.CoCreateInstance(
+			HRESULT hr = PInvoke.CoCreateInstance(
 				&clsid,
 				null,
 				CLSCTX.CLSCTX_LOCAL_SERVER,
@@ -54,112 +54,59 @@ public unsafe WindowsBulkOperations(HWND owner = default, FILEOPERATION_FLAGS fl
 
 			_owner = owner;
 			if (owner != default)
-				_pFileOperation.Get()->SetOwnerWindow(owner);
+				hr = _pFileOperation.Get()->SetOwnerWindow(owner);
 			_operationFlags = flags;
 
 			_pProgressSink.Attach((IFileOperationProgressSink*)WindowsBulkOperationsSink.Create(this));
-
-			// Test code
-			_pProgressSink.Get()->PostDeleteItem(0, null, default, null);
-
-			_pFileOperation.Get()->Advise(_pProgressSink.Get(), out var progressSinkCookie);
+			hr = _pFileOperation.Get()->Advise(_pProgressSink.Get(), out var progressSinkCookie);
 			_progressSinkCookie = progressSinkCookie;
 		}
 
 		public unsafe HRESULT QueueCopyItem(ComPtr<IShellItem> psiItem, ComPtr<IShellItem> psiDestinationFolder, PCWSTR pszCopyName)
 		{
 			HRESULT hr = default;
 
-			try
-			{
-				hr = _pFileOperation.Get()->CopyItem(psiItem.Get(), psiDestinationFolder.Get(), pszCopyName, _pProgressSink.Get());
-				hr.ThrowOnFailure();
-			}
-			finally
-			{
-
-			}
-
+			hr = _pFileOperation.Get()->CopyItem(psiItem.Get(), psiDestinationFolder.Get(), pszCopyName, _pProgressSink.Get());
 			return hr;
 		}
 
 		public unsafe HRESULT QueueDeleteItem(ComPtr<IShellItem> psiItem)
 		{
 			HRESULT hr = default;
 
-			try
-			{
-				hr = _pFileOperation.Get()->DeleteItem(psiItem.Get(), _pProgressSink.Get());
-				hr.ThrowOnFailure();
-			}
-			finally
-			{
-			}
-
+			hr = _pFileOperation.Get()->DeleteItem(psiItem.Get(), _pProgressSink.Get());
 			return hr;
 		}
 
 		public unsafe HRESULT QueueMoveItem(ComPtr<IShellItem> psiItem, ComPtr<IShellItem> psiDestinationFolder, PCWSTR pszNewName)
 		{
 			HRESULT hr = default;
 
-			try
-			{
-				hr = _pFileOperation.Get()->MoveItem(psiItem.Get(), psiDestinationFolder.Get(), pszNewName, null);
-				hr.ThrowOnFailure();
-			}
-			finally
-			{
-			}
-
+			hr = _pFileOperation.Get()->MoveItem(psiItem.Get(), psiDestinationFolder.Get(), pszNewName, null);
 			return hr;
 		}
 
 		public unsafe HRESULT QueueNewItem(ComPtr<IShellItem> psiDestinationFolder, uint dwFileAttributes, PCWSTR pszName, PCWSTR pszTemplateName)
 		{
 			HRESULT hr = default;
 
-			try
-			{
-				hr = _pFileOperation.Get()->NewItem(psiDestinationFolder.Get(), dwFileAttributes, pszName, pszTemplateName, _pProgressSink.Get());
-				hr.ThrowOnFailure();
-			}
-			finally
-			{
-			}
-
+			hr = _pFileOperation.Get()->NewItem(psiDestinationFolder.Get(), dwFileAttributes, pszName, pszTemplateName, _pProgressSink.Get());
 			return hr;
 		}
 
 		public unsafe HRESULT QueueRenameItem(ComPtr<IShellItem> psiItem, PCWSTR pszNewName)
 		{
 			HRESULT hr = default;
 
-			try
-			{
-				hr = _pFileOperation.Get()->RenameItem(psiItem.Get(), pszNewName, _pProgressSink.Get());
-				hr.ThrowOnFailure();
-			}
-			finally
-			{
-			}
-
+			hr = _pFileOperation.Get()->RenameItem(psiItem.Get(), pszNewName, _pProgressSink.Get());
 			return hr;
 		}
 
 		public unsafe HRESULT PerformOperations()
 		{
 			HRESULT hr = default;
 
-			try
-			{
-				hr = _pFileOperation.Get()->PerformOperations();
-				hr.ThrowOnFailure();
-			}
-			finally
-			{
-			}
-
+			hr = _pFileOperation.Get()->PerformOperations();
 			return hr;
 		}
 

src/Files.App.Storage/Storables/WindowsStorage/WindowsBulkOperationsSink.Methods.cs

@@ -37,7 +37,7 @@ public unsafe HRESULT PreMoveItem(uint dwFlags, IShellItem* psiItem, IShellItem*
 			{
 				if (_operationsHandle.Target is WindowsBulkOperations operations)
 				{
-					operations.PreMoveItem?.Invoke(this, new());
+					operations.PreMoveItem?.Invoke(operations, new());
 					return HRESULT.S_OK;
 				}
 
@@ -48,7 +48,7 @@ public unsafe HRESULT PostMoveItem(uint dwFlags, IShellItem* psiItem, IShellItem
 			{
 				if (_operationsHandle.Target is WindowsBulkOperations operations)
 				{
-					operations.PostMoveItem?.Invoke(this, new());
+					operations.PostMoveItem?.Invoke(operations, new());
 					return HRESULT.S_OK;
 				}
 

src/Files.App.Storage/Storables/WindowsStorage/WindowsBulkOperationsSink.VTable.cs

@@ -25,7 +25,7 @@ private unsafe partial struct WindowsBulkOperationsSink
 			{
 				WindowsBulkOperationsSink* operationsSink = (WindowsBulkOperationsSink*)NativeMemory.Alloc((nuint)sizeof(WindowsBulkOperationsSink));
 				operationsSink->_lpVtbl = Vtbl;
-				operationsSink->_refCount = 0;
+				operationsSink->_refCount = 1;
 				operationsSink->_operationsHandle = GCHandle.Alloc(operations);
 
 				return operationsSink;
@@ -83,7 +83,7 @@ public static int AddRef(WindowsBulkOperationsSink* @this)
 				public static int Release(WindowsBulkOperationsSink* @this)
 				{
 					int newRefCount = Interlocked.Decrement(ref @this->_refCount);
-					if (newRefCount is 1)
+					if (newRefCount is 0)
 					{
 						if (@this->_operationsHandle.IsAllocated)
 							@this->_operationsHandle.Free();

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

@@ -133,6 +133,11 @@ private unsafe bool RestoreAllTrashesInternal()
 				hr = bulkOperations.QueueMoveItem(pShellItem, pOriginalPathShellItem, default);
 			}
 
+			bulkOperations.PostMoveItem += (s, e) =>
+			{
+				Debug.WriteLine("An item was moved.");
+			};
+
 			// Perform
 			hr = bulkOperations.PerformOperations();