Use ThrowIfFailedOnDebug

Author: 0x5bfa

src/Files.App.CsWin32/HRESULT.Extensions.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using System.Runtime.InteropServices;
+using Windows.Win32.Foundation;
+
+namespace Windows.Win32
+{
+	public static class HRESULTExtensions
+	{
+		/// <summary>
+		/// Throws an exception if the <see cref="HRESULT"/> indicates a failure in debug mode. Otherwise, it returns the original <see cref="HRESULT"/>.
+		/// </summary>
+		/// <param name="hr">Represents the result of an operation, indicating success or failure.</param>
+		/// <returns>Returns the original <see cref="HRESULT"/> value regardless of the operation's success.</returns>
+		public static HRESULT ThrowIfFailedOnDebug(this HRESULT hr)
+		{
+#if DEBUG
+			if (hr.Failed)
+				Marshal.ThrowExceptionForHR(hr.Value);
+#endif
+
+			return hr;
+		}
+	}
+}

src/Files.App/Utils/Storage/Helpers/SyncRootHelpers.cs

@@ -4,6 +4,7 @@
 using Microsoft.Win32;
 using System.Runtime.CompilerServices;
 using Windows.Win32;
+using Windows.Win32.Foundation;
 using Windows.Win32.System.Com;
 using Windows.Win32.System.WinRT;
 using WinRT;
@@ -19,30 +20,30 @@ private static unsafe (bool Success, ulong Capacity, ulong Used) GetSyncRootQuot
 				!Guid.TryParse(factoryClsidString, out var factoryClsid))
 				return (false, 0, 0);
 
+			HRESULT hr = default;
 			ulong ulTotalSize = 0ul, ulUsedSize = 0ul;
 			using ComPtr<IStorageProviderStatusUISourceFactory> pStorageProviderStatusUISourceFactory = default;
 			using ComPtr<IStorageProviderStatusUISource> pStorageProviderStatusUISource = default;
 			using ComPtr<IStorageProviderStatusUI> pStorageProviderStatusUI = default;
 			using ComPtr<IStorageProviderQuotaUI> pStorageProviderQuotaUI = default;
 
-			var hr = PInvoke.CoCreateInstance(
+			if (PInvoke.CoCreateInstance(
 				&factoryClsid,
 				null,
 				CLSCTX.CLSCTX_LOCAL_SERVER,
 				(Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IStorageProviderStatusUISourceFactory.Guid)),
-				(void**)pStorageProviderStatusUISourceFactory.GetAddressOf());
-			if (hr.Failed)
+				(void**)pStorageProviderStatusUISourceFactory.GetAddressOf()).ThrowIfFailedOnDebug().Failed)
 				return (false, 0, 0);
 
 			var syncRootIdHString = new MarshalString.Pinnable(syncRootId);
 			fixed (char* pSyncRootIdHString = syncRootIdHString)
 			{
-				hr = pStorageProviderStatusUISourceFactory.Get()->GetStatusUISource(syncRootIdHString.GetAbi(), pStorageProviderStatusUISource.GetAddressOf()).ThrowOnFailure();
-				hr = pStorageProviderStatusUISource.Get()->GetStatusUI(pStorageProviderStatusUI.GetAddressOf()).ThrowOnFailure();
-				hr = pStorageProviderStatusUI.Get()->GetQuotaUI(pStorageProviderQuotaUI.GetAddressOf()).ThrowOnFailure();
-
-				hr = pStorageProviderQuotaUI.Get()->GetQuotaTotalInBytes(&ulTotalSize);
-				hr = pStorageProviderQuotaUI.Get()->GetQuotaUsedInBytes(&ulUsedSize);
+				if (pStorageProviderStatusUISourceFactory.Get()->GetStatusUISource(syncRootIdHString.GetAbi(), pStorageProviderStatusUISource.GetAddressOf()).ThrowIfFailedOnDebug().Failed ||
+					pStorageProviderStatusUISource.Get()->GetStatusUI(pStorageProviderStatusUI.GetAddressOf()).ThrowIfFailedOnDebug().Failed ||
+					pStorageProviderStatusUI.Get()->GetQuotaUI(pStorageProviderQuotaUI.GetAddressOf()).ThrowIfFailedOnDebug().Failed ||
+					pStorageProviderQuotaUI.Get()->GetQuotaTotalInBytes(&ulTotalSize).ThrowIfFailedOnDebug().Failed ||
+					pStorageProviderQuotaUI.Get()->GetQuotaUsedInBytes(&ulUsedSize).ThrowIfFailedOnDebug().Failed)
+					return (false, 0, 0);
 			}
 
 			return (true, ulTotalSize, ulUsedSize);