Improved STATask

0x5bfa · 0x5bfa · commit dd62ca48413d · 2025-06-27T19:26:44.000+09:00
diff --git a/src/Files.App.CsWin32/ManualGuid.cs b/src/Files.App.CsWin32/ManualGuid.cs
@@ -57,9 +57,6 @@ public static Guid* IID_IStorageProviderStatusUISourceFactory
 		[GuidRVAGen.Guid("1C9CD5BB-98E9-4491-A60F-31AACC72B83C")]
 		public static partial Guid* IID_IObjectWithSelection { get; }
 
-		[GuidRVAGen.Guid("BCC18B79-BA16-442F-80C4-8A59C30C463B")]
-		public static partial Guid* IID_IShellItemImageFactory { get; }
-
 		[GuidRVAGen.Guid("000214E8-0000-0000-C000-000000000046")]
 		public static partial Guid* IID_IShellExtInit { get; }
 
diff --git a/src/Files.App.Storage/Storables/WindowsStorage/IWindowsStorable.cs b/src/Files.App.Storage/Storables/WindowsStorage/IWindowsStorable.cs
@@ -7,8 +7,8 @@ namespace Files.App.Storage
 {
 	public unsafe interface IWindowsStorable : IStorableChild, IEquatable<IWindowsStorable>, IDisposable
 	{
-		IShellItem* ThisPtr { get; }
+		IShellItem* ThisPtr { get; set; }
 
-		IContextMenu* ContextMenu { get; }
+		IContextMenu* ContextMenu { get; set; }
 	}
 }
diff --git a/src/Files.App.Storage/Storables/WindowsStorage/STATask.cs b/src/Files.App.Storage/Storables/WindowsStorage/STATask.cs
@@ -1,16 +1,17 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Microsoft.Extensions.Logging;
 using Windows.Win32;
 
 namespace Files.App.Storage
 {
 	/// <summary>
-	/// Represents an asynchronous operation on STA.
+	/// Represents a synchronous/asynchronous operation on STA.
 	/// </summary>
 	public partial class STATask
 	{
-		public static Task Run(Action action)
+		public static Task Run(Action action, ILogger? logger = null)
 		{
 			var tcs = new TaskCompletionSource();
 
@@ -26,25 +27,24 @@ public static Task Run(Action action)
 					}
 					catch (Exception ex)
 					{
+						tcs.SetResult();
+						logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");
 						tcs.SetException(ex);
 					}
 					finally
 					{
 						PInvoke.OleUninitialize();
 					}
-				})
-				{
-					IsBackground = true,
-					Priority = ThreadPriority.Normal
-				};
+				});
 
+			thread.IsBackground = true;
 			thread.SetApartmentState(ApartmentState.STA);
 			thread.Start();
 
 			return tcs.Task;
 		}
 
-		public static Task<T> Run<T>(Func<T> func)
+		public static Task<T> Run<T>(Func<T> func, ILogger? logger = null)
 		{
 			var tcs = new TaskCompletionSource<T>();
 
@@ -59,25 +59,24 @@ public static Task<T> Run<T>(Func<T> func)
 					}
 					catch (Exception ex)
 					{
+						tcs.SetResult(default!);
+						logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");
 						tcs.SetException(ex);
 					}
 					finally
 					{
 						PInvoke.OleUninitialize();
 					}
-				})
-				{
-					IsBackground = true,
-					Priority = ThreadPriority.Normal
-				};
+				});
 
+			thread.IsBackground = true;
 			thread.SetApartmentState(ApartmentState.STA);
 			thread.Start();
 
 			return tcs.Task;
 		}
 
-		public static Task Run(Func<Task> func)
+		public static Task Run(Func<Task> func, ILogger? logger = null)
 		{
 			var tcs = new TaskCompletionSource();
 
@@ -93,25 +92,24 @@ public static Task Run(Func<Task> func)
 					}
 					catch (Exception ex)
 					{
+						tcs.SetResult();
+						logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");
 						tcs.SetException(ex);
 					}
 					finally
 					{
 						PInvoke.OleUninitialize();
 					}
-				})
-				{
-					IsBackground = true,
-					Priority = ThreadPriority.Normal
-				};
+				});
 
+			thread.IsBackground = true;
 			thread.SetApartmentState(ApartmentState.STA);
 			thread.Start();
 
 			return tcs.Task;
 		}
 
-		public static Task<T?> Run<T>(Func<Task<T>> func)
+		public static Task<T?> Run<T>(Func<Task<T>> func, ILogger? logger = null)
 		{
 			var tcs = new TaskCompletionSource<T?>();
 
@@ -126,18 +124,17 @@ public static Task Run(Func<Task> func)
 					}
 					catch (Exception ex)
 					{
+						tcs.SetResult(default);
+						logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");
 						tcs.SetException(ex);
 					}
 					finally
 					{
 						PInvoke.OleUninitialize();
 					}
-				})
-				{
-					IsBackground = true,
-					Priority = ThreadPriority.Normal
-				};
+				});
 
+			thread.IsBackground = true;
 			thread.SetApartmentState(ApartmentState.STA);
 			thread.Start();
 
diff --git a/src/Files.App.Storage/Storables/WindowsStorage/WindowsFolder.cs b/src/Files.App.Storage/Storables/WindowsStorage/WindowsFolder.cs
@@ -19,7 +19,7 @@ public IContextMenu* ShellNewMenu
 			get;
 
 			[MethodImpl(MethodImplOptions.AggressiveInlining)]
-			protected internal set;
+			set;
 		}
 
 		public WindowsFolder(IShellItem* ptr)
diff --git a/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorable.cs b/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorable.cs
@@ -17,7 +17,7 @@ public IShellItem* ThisPtr
 			get;
 
 			[MethodImpl(MethodImplOptions.AggressiveInlining)]
-			protected internal set;
+			set;
 		}
 
 		public IContextMenu* ContextMenu
@@ -26,7 +26,7 @@ public IContextMenu* ContextMenu
 			get;
 
 			[MethodImpl(MethodImplOptions.AggressiveInlining)]
-			protected internal set;
+			set;
 		}
 
 		public string Id => this.GetDisplayName(SIGDN.SIGDN_FILESYSPATH);
@@ -49,7 +49,7 @@ public IContextMenu* ContextMenu
 
 		public static WindowsStorable? TryParse(IShellItem* pShellItem)
 		{
-			bool isFolder = pShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded && returnedAttributes == SFGAO_FLAGS.SFGAO_FOLDER;
+			bool isFolder = pShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded && returnedAttributes is SFGAO_FLAGS.SFGAO_FOLDER;
 
 			return isFolder ? new WindowsFolder(pShellItem) : new WindowsFile(pShellItem);
 		}

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ namespace Files.App.Storage`
`7`	`7`	`{`
`8`	`8`	`public unsafe interface IWindowsStorable : IStorableChild, IEquatable<IWindowsStorable>, IDisposable`
`9`	`9`	`{`
`10`		`- IShellItem* ThisPtr { get; }`
	`10`	`+ IShellItem* ThisPtr { get; set; }`
`11`	`11`
`12`		`- IContextMenu* ContextMenu { get; }`
	`12`	`+ IContextMenu* ContextMenu { get; set; }`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,17 @@`
`1`	`1`	`// Copyright (c) Files Community`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
	`4`	`+using Microsoft.Extensions.Logging;`
`4`	`5`	`using Windows.Win32;`
`5`	`6`
`6`	`7`	`namespace Files.App.Storage`
`7`	`8`	`{`
`8`	`9`	`/// <summary>`
`9`		`- /// Represents an asynchronous operation on STA.`
	`10`	`+ /// Represents a synchronous/asynchronous operation on STA.`
`10`	`11`	`/// </summary>`
`11`	`12`	`public partial class STATask`
`12`	`13`	`{`
`13`		`- public static Task Run(Action action)`
	`14`	`+ public static Task Run(Action action, ILogger? logger = null)`
`14`	`15`	`{`
`15`	`16`	`var tcs = new TaskCompletionSource();`
`16`	`17`
`@@ -26,25 +27,24 @@ public static Task Run(Action action)`
`26`	`27`	`}`
`27`	`28`	`catch (Exception ex)`
`28`	`29`	`{`
	`30`	`+ tcs.SetResult();`
	`31`	`+ logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");`
`29`	`32`	`tcs.SetException(ex);`
`30`	`33`	`}`
`31`	`34`	`finally`
`32`	`35`	`{`
`33`	`36`	`PInvoke.OleUninitialize();`
`34`	`37`	`}`
`35`		`- })`
`36`		`- {`
`37`		`- IsBackground = true,`
`38`		`- Priority = ThreadPriority.Normal`
`39`		`- };`
	`38`	`+ });`
`40`	`39`
	`40`	`+ thread.IsBackground = true;`
`41`	`41`	`thread.SetApartmentState(ApartmentState.STA);`
`42`	`42`	`thread.Start();`
`43`	`43`
`44`	`44`	`return tcs.Task;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public static Task<T> Run<T>(Func<T> func)`
	`47`	`+ public static Task<T> Run<T>(Func<T> func, ILogger? logger = null)`
`48`	`48`	`{`
`49`	`49`	`var tcs = new TaskCompletionSource<T>();`
`50`	`50`
`@@ -59,25 +59,24 @@ public static Task<T> Run<T>(Func<T> func)`
`59`	`59`	`}`
`60`	`60`	`catch (Exception ex)`
`61`	`61`	`{`
	`62`	`+ tcs.SetResult(default!);`
	`63`	`+ logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");`
`62`	`64`	`tcs.SetException(ex);`
`63`	`65`	`}`
`64`	`66`	`finally`
`65`	`67`	`{`
`66`	`68`	`PInvoke.OleUninitialize();`
`67`	`69`	`}`
`68`		`- })`
`69`		`- {`
`70`		`- IsBackground = true,`
`71`		`- Priority = ThreadPriority.Normal`
`72`		`- };`
	`70`	`+ });`
`73`	`71`
	`72`	`+ thread.IsBackground = true;`
`74`	`73`	`thread.SetApartmentState(ApartmentState.STA);`
`75`	`74`	`thread.Start();`
`76`	`75`
`77`	`76`	`return tcs.Task;`
`78`	`77`	`}`
`79`	`78`
`80`		`- public static Task Run(Func<Task> func)`
	`79`	`+ public static Task Run(Func<Task> func, ILogger? logger = null)`
`81`	`80`	`{`
`82`	`81`	`var tcs = new TaskCompletionSource();`
`83`	`82`
`@@ -93,25 +92,24 @@ public static Task Run(Func<Task> func)`
`93`	`92`	`}`
`94`	`93`	`catch (Exception ex)`
`95`	`94`	`{`
	`95`	`+ tcs.SetResult();`
	`96`	`+ logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");`
`96`	`97`	`tcs.SetException(ex);`
`97`	`98`	`}`
`98`	`99`	`finally`
`99`	`100`	`{`
`100`	`101`	`PInvoke.OleUninitialize();`
`101`	`102`	`}`
`102`		`- })`
`103`		`- {`
`104`		`- IsBackground = true,`
`105`		`- Priority = ThreadPriority.Normal`
`106`		`- };`
	`103`	`+ });`
`107`	`104`
	`105`	`+ thread.IsBackground = true;`
`108`	`106`	`thread.SetApartmentState(ApartmentState.STA);`
`109`	`107`	`thread.Start();`
`110`	`108`
`111`	`109`	`return tcs.Task;`
`112`	`110`	`}`
`113`	`111`
`114`		`- public static Task<T?> Run<T>(Func<Task<T>> func)`
	`112`	`+ public static Task<T?> Run<T>(Func<Task<T>> func, ILogger? logger = null)`
`115`	`113`	`{`
`116`	`114`	`var tcs = new TaskCompletionSource<T?>();`
`117`	`115`
`@@ -126,18 +124,17 @@ public static Task Run(Func<Task> func)`
`126`	`124`	`}`
`127`	`125`	`catch (Exception ex)`
`128`	`126`	`{`
	`127`	`+ tcs.SetResult(default);`
	`128`	`+ logger?.LogWarning(ex, "An exception was occurred during the execution within STA.");`
`129`	`129`	`tcs.SetException(ex);`
`130`	`130`	`}`
`131`	`131`	`finally`
`132`	`132`	`{`
`133`	`133`	`PInvoke.OleUninitialize();`
`134`	`134`	`}`
`135`		`- })`
`136`		`- {`
`137`		`- IsBackground = true,`
`138`		`- Priority = ThreadPriority.Normal`
`139`		`- };`
	`135`	`+ });`
`140`	`136`
	`137`	`+ thread.IsBackground = true;`
`141`	`138`	`thread.SetApartmentState(ApartmentState.STA);`
`142`	`139`	`thread.Start();`
`143`	`140`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public IContextMenu* ShellNewMenu`
`19`	`19`	`get;`
`20`	`20`
`21`	`21`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`22`		`- protected internal set;`
	`22`	`+ set;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public WindowsFolder(IShellItem* ptr)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public IShellItem* ThisPtr`
`17`	`17`	`get;`
`18`	`18`
`19`	`19`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`20`		`- protected internal set;`
	`20`	`+ set;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public IContextMenu* ContextMenu`
`@@ -26,7 +26,7 @@ public IContextMenu* ContextMenu`
`26`	`26`	`get;`
`27`	`27`
`28`	`28`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`29`		`- protected internal set;`
	`29`	`+ set;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public string Id => this.GetDisplayName(SIGDN.SIGDN_FILESYSPATH);`
`@@ -49,7 +49,7 @@ public IContextMenu* ContextMenu`
`49`	`49`
`50`	`50`	`public static WindowsStorable? TryParse(IShellItem* pShellItem)`
`51`	`51`	`{`
`52`		`- bool isFolder = pShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded && returnedAttributes == SFGAO_FLAGS.SFGAO_FOLDER;`
	`52`	`+ bool isFolder = pShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded && returnedAttributes is SFGAO_FLAGS.SFGAO_FOLDER;`
`53`	`53`
`54`	`54`	`return isFolder ? new WindowsFolder(pShellItem) : new WindowsFile(pShellItem);`
`55`	`55`	`}`