Update

Author: 0x5bfa

src/Files.App.CsWin32/ComPtr`1.cs

@@ -56,10 +56,9 @@ public readonly ComPtr<U> As<U>() where U : unmanaged, IComIID
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public readonly HRESULT CoCreateInstance<U>(CLSCTX dwClsContext = CLSCTX.CLSCTX_LOCAL_SERVER)
+		public readonly HRESULT CoCreateInstance(Guid* rclsid, IUnknown* pUnkOuter = null, CLSCTX dwClsContext = CLSCTX.CLSCTX_LOCAL_SERVER)
 		{
-			Guid iid = typeof(T).GUID, clsid = typeof(U).GUID;
-			return PInvoke.CoCreateInstance(&clsid, null, dwClsContext, &iid, (void**)this.GetAddressOf());
+			return PInvoke.CoCreateInstance(rclsid, pUnkOuter, dwClsContext, (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in T.Guid)), (void**)this.GetAddressOf());
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Files.App.CsWin32/ManualGuid.cs

@@ -21,12 +21,36 @@ public static unsafe partial class IID
 
 		[GuidRVAGen.Guid("947AAB5F-0A5C-4C13-B4D6-4BF7836FC9F8")]
 		public static partial Guid* IID_IFileOperation { get; }
+
+		[GuidRVAGen.Guid("D57C7288-D4AD-4768-BE02-9D969532D960")]
+		public static partial Guid* IID_IFileOpenDialog { get; }
+
+		[GuidRVAGen.Guid("84BCCD23-5FDE-4CDB-AEA4-AF64B83D78AB")]
+		public static partial Guid* IID_IFileSaveDialog { get; }
+
+		[GuidRVAGen.Guid("B92B56A9-8B55-4E14-9A89-0199BBB6F93B")]
+		public static partial Guid* IID_IDesktopWallpaper { get; }
+
+		[GuidRVAGen.Guid("2E941141-7F97-4756-BA1D-9DECDE894A3D")]
+		public static partial Guid* IID_IApplicationActivationManager { get; }
 	}
 
 	public static unsafe partial class CLSID
 	{
 		[GuidRVAGen.Guid("3AD05575-8857-4850-9277-11B85BDB8E09")]
 		public static partial Guid* CLSID_FileOperation { get; }
+
+		[GuidRVAGen.Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")]
+		public static partial Guid* CLSID_FileOpenDialog { get; }
+
+		[GuidRVAGen.Guid("C0B4E2F3-BA21-4773-8DBA-335EC946EB8B")]
+		public static partial Guid* CLSID_FileSaveDialog { get; }
+
+		[GuidRVAGen.Guid("C2CF3110-460E-4FC1-B9D0-8A1C0C9CC4BD")]
+		public static partial Guid* CLSID_DesktopWallpaper { get; }
+
+		[GuidRVAGen.Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")]
+		public static partial Guid* CLSID_ApplicationActivationManager { get; }
 	}
 
 	public static unsafe partial class BHID

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

@@ -23,7 +23,7 @@ public unsafe bool Open_FileOpenDialog(nint hWnd, bool pickFoldersOnly, string[]
 			try
 			{
 				using ComPtr<IFileOpenDialog> pDialog = default;
-				HRESULT hr = pDialog.CoCreateInstance<FileOpenDialog>(CLSCTX.CLSCTX_INPROC_SERVER);
+				HRESULT hr = pDialog.CoCreateInstance(CLSID.CLSID_FileOpenDialog, null, CLSCTX.CLSCTX_INPROC_SERVER);
 
 				if (filters.Length is not 0 && filters.Length % 2 is 0)
 				{
@@ -93,7 +93,7 @@ public unsafe bool Open_FileSaveDialog(nint hWnd, bool pickFoldersOnly, string[]
 			try
 			{
 				using ComPtr<IFileSaveDialog> pDialog = default;
-				HRESULT hr = pDialog.CoCreateInstance<FileSaveDialog>(CLSCTX.CLSCTX_INPROC_SERVER);
+				HRESULT hr = pDialog.CoCreateInstance(CLSID.CLSID_FileSaveDialog, null, CLSCTX.CLSCTX_INPROC_SERVER);
 
 				if (filters.Length is not 0 && filters.Length % 2 is 0)
 				{

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

@@ -19,7 +19,7 @@ public unsafe void SetDesktopWallpaper(string szPath)
 		{
 			// Instantiate IDesktopWallpaper
 			using ComPtr<IDesktopWallpaper> pDesktopWallpaper = default;
-			HRESULT hr = pDesktopWallpaper.CoCreateInstance<DesktopWallpaper>().ThrowOnFailure();
+			HRESULT hr = pDesktopWallpaper.CoCreateInstance(CLSID.CLSID_DesktopWallpaper);
 
 			// Get total count of all available monitors
 			hr = pDesktopWallpaper.Get()->GetMonitorDevicePathCount(out var dwMonitorCount).ThrowOnFailure();
@@ -45,7 +45,7 @@ public unsafe void SetDesktopSlideshow(string[] aszPaths)
 		{
 			// Instantiate IDesktopWallpaper
 			using ComPtr<IDesktopWallpaper> pDesktopWallpaper = default;
-			HRESULT hr = pDesktopWallpaper.CoCreateInstance<DesktopWallpaper>().ThrowOnFailure();
+			HRESULT hr = pDesktopWallpaper.CoCreateInstance(CLSID.CLSID_DesktopWallpaper);
 
 			uint dwCount = (uint)aszPaths.Length;
 			ITEMIDLIST** ppItemIdList = stackalloc ITEMIDLIST*[aszPaths.Length];

src/Files.App/Utils/Shell/LaunchHelper.cs

@@ -19,7 +19,7 @@ public static class LaunchHelper
 		public unsafe static void LaunchSettings(string page)
 		{
 			using ComPtr<IApplicationActivationManager> pApplicationActivationManager = default;
-			pApplicationActivationManager.CoCreateInstance<Shell32.ApplicationActivationManager>();
+			pApplicationActivationManager.CoCreateInstance(CLSID.CLSID_ApplicationActivationManager);
 
 			pApplicationActivationManager.Get()->ActivateApplication(
 				"windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel",