Revert "Code Quality: Replaced the StartSTA helpers with STATask.Run (#17377)"

yaira2 · yaira2 · commit 6b35a2132f54 · 2025-08-04T17:53:46.000-04:00
This reverts commit c1d9e84.
diff --git a/src/Files.App/Helpers/Win32/Win32Helper.Shell.cs b/src/Files.App/Helpers/Win32/Win32Helper.Shell.cs
@@ -24,7 +24,7 @@ public static partial class Win32Helper
 				path = $"shell:{path}";
 			}
 
-			return await STATask.Run(() =>
+			return await Win32Helper.StartSTATask(() =>
 			{
 				var flc = new List<ShellFileItem>();
 				var folder = (ShellFileItem)null;
@@ -77,7 +77,7 @@ public static partial class Win32Helper
 				}
 
 				return (folder, flc);
-			}, App.Logger);
+			});
 		}
 
 		public static string GetFolderFromKnownFolderGUID(Guid guid)
diff --git a/src/Files.App/Helpers/Win32/Win32Helper.Storage.cs b/src/Files.App/Helpers/Win32/Win32Helper.Storage.cs
@@ -26,6 +26,143 @@ namespace Files.App.Helpers
 	/// </summary>
 	public static partial class Win32Helper
 	{
+		public static Task StartSTATask(Func<Task> func)
+		{
+			var taskCompletionSource = new TaskCompletionSource();
+			Thread thread = new Thread(async () =>
+			{
+				Ole32.OleInitialize();
+
+				try
+				{
+					await func();
+					taskCompletionSource.SetResult();
+				}
+				catch (Exception ex)
+				{
+					taskCompletionSource.SetResult();
+					App.Logger.LogWarning(ex, ex.Message);
+				}
+				finally
+				{
+					Ole32.OleUninitialize();
+				}
+			})
+
+			{
+				IsBackground = true,
+				Priority = ThreadPriority.Normal
+			};
+
+			thread.SetApartmentState(ApartmentState.STA);
+			thread.Start();
+
+			return taskCompletionSource.Task;
+		}
+
+		public static Task StartSTATask(Action action)
+		{
+			var taskCompletionSource = new TaskCompletionSource();
+			Thread thread = new Thread(() =>
+			{
+				Ole32.OleInitialize();
+
+				try
+				{
+					action();
+					taskCompletionSource.SetResult();
+				}
+				catch (Exception ex)
+				{
+					taskCompletionSource.SetResult();
+					App.Logger.LogWarning(ex, ex.Message);
+				}
+				finally
+				{
+					Ole32.OleUninitialize();
+				}
+			})
+
+			{
+				IsBackground = true,
+				Priority = ThreadPriority.Normal
+			};
+
+			thread.SetApartmentState(ApartmentState.STA);
+			thread.Start();
+
+			return taskCompletionSource.Task;
+		}
+
+		public static Task<T?> StartSTATask<T>(Func<T> func)
+		{
+			var taskCompletionSource = new TaskCompletionSource<T?>();
+
+			Thread thread = new Thread(() =>
+			{
+				Ole32.OleInitialize();
+
+				try
+				{
+					taskCompletionSource.SetResult(func());
+				}
+				catch (Exception ex)
+				{
+					taskCompletionSource.SetResult(default);
+					App.Logger.LogWarning(ex, ex.Message);
+					//tcs.SetException(e);
+				}
+				finally
+				{
+					Ole32.OleUninitialize();
+				}
+			})
+
+			{
+				IsBackground = true,
+				Priority = ThreadPriority.Normal
+			};
+
+			thread.SetApartmentState(ApartmentState.STA);
+			thread.Start();
+
+			return taskCompletionSource.Task;
+		}
+
+		public static Task<T?> StartSTATask<T>(Func<Task<T>> func)
+		{
+			var taskCompletionSource = new TaskCompletionSource<T?>();
+
+			Thread thread = new Thread(async () =>
+			{
+				Ole32.OleInitialize();
+				try
+				{
+					taskCompletionSource.SetResult(await func());
+				}
+				catch (Exception ex)
+				{
+					taskCompletionSource.SetResult(default);
+					App.Logger.LogInformation(ex, ex.Message);
+					//tcs.SetException(e);
+				}
+				finally
+				{
+					Ole32.OleUninitialize();
+				}
+			})
+
+			{
+				IsBackground = true,
+				Priority = ThreadPriority.Normal
+			};
+
+			thread.SetApartmentState(ApartmentState.STA);
+			thread.Start();
+
+			return taskCompletionSource.Task;
+		}
+
 		public static async Task<string?> GetFileAssociationAsync(string filename, bool checkDesktopFirst = false)
 		{
 			// Find UWP apps
diff --git a/src/Files.App/Services/Storage/StorageNetworkService.cs b/src/Files.App/Services/Storage/StorageNetworkService.cs
@@ -91,7 +91,7 @@ public async Task<IEnumerable<IFolder>> GetComputersAsync()
 		/// <inheritdoc/>
 		public async Task<IEnumerable<IFolder>> GetShortcutsAsync()
 		{
-			var networkLocations = await STATask.Run(() =>
+			var networkLocations = await Win32Helper.StartSTATask(() =>
 			{
 				var locations = new List<ShellLinkItem>();
 				using (var netHood = new ShellFolder(Shell32.KNOWNFOLDERID.FOLDERID_NetHood))
@@ -114,7 +114,7 @@ public async Task<IEnumerable<IFolder>> GetShortcutsAsync()
 					}
 				}
 				return locations;
-			}, App.Logger);
+			});
 
 			return (networkLocations ?? Enumerable.Empty<ShellLinkItem>()).Select(item =>
 			{
@@ -192,13 +192,13 @@ public bool DisconnectNetworkDrive(IFolder drive)
 		/// <inheritdoc/>
 		public Task OpenMapNetworkDriveDialogAsync()
 		{
-			return STATask.Run(() =>
+			return Win32Helper.StartSTATask(() =>
 			{
 				return CommonDialogService.Open_NetworkConnectionDialog(
 					MainWindow.Instance.WindowHandle,
 					useMostRecentPath: true,
 					hideRestoreConnectionCheckBox: false);
-			}, App.Logger);
+			});
 		}
 
 		/// <inheritdoc/>
diff --git a/src/Files.App/Services/Storage/StorageTrashBinService.cs b/src/Files.App/Services/Storage/StorageTrashBinService.cs
@@ -83,7 +83,7 @@ public bool EmptyTrashBin()
 		/// <inheritdoc/>
 		public async Task<bool> RestoreAllTrashesAsync()
 		{
-			return await STATask.Run(() =>
+			return await Win32Helper.StartSTATask(() =>
 			{
 				try
 				{
@@ -95,7 +95,7 @@ public async Task<bool> RestoreAllTrashesAsync()
 				{
 					return false;
 				}
-			}, App.Logger);
+			});
 		}
 
 		private unsafe bool RestoreAllTrashesInternal()
diff --git a/src/Files.App/Services/Windows/WindowsQuickAccessService.cs b/src/Files.App/Services/Windows/WindowsQuickAccessService.cs
@@ -63,20 +63,20 @@ private async Task UnpinFromSidebarAsync(string[] folderPaths, bool doUpdateQuic
 						(folderPaths.Contains(path) ||
 						(path.StartsWith(@"\\SHELL\\") && folderPaths.Any(x => x.StartsWith(@"\\SHELL\\")))))
 					{
-						await STATask.Run(async () =>
+						await Win32Helper.StartSTATask(async () =>
 						{
 							fi.InvokeVerb("unpinfromhome");
-						}, App.Logger);
+						});
 						continue;
 					}
 				}
 
 				if (folderPaths.Contains(pathStr))
 				{
-					await STATask.Run(async () =>
+					await Win32Helper.StartSTATask(async () =>
 					{
 						fi.InvokeVerb("unpinfromhome");
-					}, App.Logger);
+					});
 				}
 			}
 
diff --git a/src/Files.App/Utils/Library/LibraryManager.cs b/src/Files.App/Utils/Library/LibraryManager.cs
@@ -67,7 +67,7 @@ private void InitializeWatcher()
 		/// <returns>List of library items</returns>
 		public static async Task<List<LibraryLocationItem>> ListUserLibraries()
 		{
-			var libraries = await STATask.Run(() =>
+			var libraries = await Win32Helper.StartSTATask(() =>
 			{
 				try
 				{
@@ -90,7 +90,7 @@ public static async Task<List<LibraryLocationItem>> ListUserLibraries()
 				}
 
 				return [];
-			}, App.Logger);
+			});
 
 			return libraries.Select(lib => new LibraryLocationItem(lib)).ToList();
 		}
@@ -134,7 +134,7 @@ public async Task<bool> CreateNewLibrary(string name)
 			if (string.IsNullOrWhiteSpace(name) || !CanCreateLibrary(name).result)
 				return false;
 
-			var newLib = new LibraryLocationItem(await STATask.Run(() =>
+			var newLib = new LibraryLocationItem(await Win32Helper.StartSTATask(() =>
 			{
 				try
 				{
@@ -150,7 +150,7 @@ public async Task<bool> CreateNewLibrary(string name)
 				}
 
 				return Task.FromResult<ShellLibraryItem>(null);
-			}, App.Logger));
+			}));
 
 			if (newLib is not null)
 			{
@@ -178,7 +178,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
 				// Nothing to update
 				return null;
 
-			var item = await STATask.Run(() =>
+			var item = await Win32Helper.StartSTATask(() =>
 			{
 				try
 				{
@@ -231,7 +231,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
 				}
 
 				return Task.FromResult<ShellLibraryItem>(null);
-			}, App.Logger);
+			});
 
 			var newLib = item is not null ? new LibraryLocationItem(item) : null;
 			if (newLib is not null)
diff --git a/src/Files.App/Utils/Shell/LaunchHelper.cs b/src/Files.App/Utils/Shell/LaunchHelper.cs
@@ -141,7 +141,7 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 				{
 					try
 					{
-						var opened = await STATask.Run(async () =>
+						var opened = await Win32Helper.StartSTATask(async () =>
 						{
 							var split = application.Split('|').Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => GetMtpPath(x));
 							if (split.Count() == 1)
@@ -171,21 +171,21 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 							}
 
 							return true;
-						}, App.Logger);
+						});
 
 						if (!opened)
 						{
 							if (application.StartsWith(@"\\SHELL\", StringComparison.Ordinal))
 							{
-								opened = await STATask.Run(async () =>
+								opened = await Win32Helper.StartSTATask(async () =>
 								{
 									using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, PInvoke.CMF_DEFAULTONLY);
 
 									if (cMenu is not null)
 										await cMenu.InvokeItem(cMenu.Items.FirstOrDefault()?.ID ?? -1);
 
 									return true;
-								}, App.Logger);
+								});
 							}
 						}
 
diff --git a/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs b/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs
@@ -14,7 +14,7 @@ public static class FileThumbnailHelper
 		{
 			var size = iconOptions.HasFlag(IconOptions.UseCurrentScale) ? requestedSize * App.AppModel.AppWindowDPI : requestedSize;
 
-			return await STATask.Run(() => Win32Helper.GetIcon(path, (int)size, isFolder, iconOptions), App.Logger);
+			return await Win32Helper.StartSTATask(() => Win32Helper.GetIcon(path, (int)size, isFolder, iconOptions));
 		}
 
 		/// <summary>
@@ -24,7 +24,7 @@ public static class FileThumbnailHelper
 		/// <param name="isFolder"></param>
 		/// <returns></returns>
 		public static async Task<byte[]?> GetIconOverlayAsync(string path, bool isFolder)
-			=> await STATask.Run(() => Win32Helper.GetIconOverlay(path, isFolder), App.Logger);
+			=> await Win32Helper.StartSTATask(() => Win32Helper.GetIconOverlay(path, isFolder));
 
 		[Obsolete]
 		public static async Task<byte[]?> LoadIconFromPathAsync(string filePath, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions, bool isFolder = false)
diff --git a/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs b/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static partial class Win32Helper`
`24`	`24`	`path = $"shell:{path}";`
`25`	`25`	`}`
`26`	`26`
`27`		`- return await STATask.Run(() =>`
	`27`	`+ return await Win32Helper.StartSTATask(() =>`
`28`	`28`	`{`
`29`	`29`	`var flc = new List<ShellFileItem>();`
`30`	`30`	`var folder = (ShellFileItem)null;`
`@@ -77,7 +77,7 @@ public static partial class Win32Helper`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`return (folder, flc);`
`80`		`- }, App.Logger);`
	`80`	`+ });`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public static string GetFolderFromKnownFolderGUID(Guid guid)`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public async Task<IEnumerable<IFolder>> GetComputersAsync()`
`91`	`91`	`/// <inheritdoc/>`
`92`	`92`	`public async Task<IEnumerable<IFolder>> GetShortcutsAsync()`
`93`	`93`	`{`
`94`		`- var networkLocations = await STATask.Run(() =>`
	`94`	`+ var networkLocations = await Win32Helper.StartSTATask(() =>`
`95`	`95`	`{`
`96`	`96`	`var locations = new List<ShellLinkItem>();`
`97`	`97`	`using (var netHood = new ShellFolder(Shell32.KNOWNFOLDERID.FOLDERID_NetHood))`
`@@ -114,7 +114,7 @@ public async Task<IEnumerable<IFolder>> GetShortcutsAsync()`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`return locations;`
`117`		`- }, App.Logger);`
	`117`	`+ });`
`118`	`118`
`119`	`119`	`return (networkLocations ?? Enumerable.Empty<ShellLinkItem>()).Select(item =>`
`120`	`120`	`{`
`@@ -192,13 +192,13 @@ public bool DisconnectNetworkDrive(IFolder drive)`
`192`	`192`	`/// <inheritdoc/>`
`193`	`193`	`public Task OpenMapNetworkDriveDialogAsync()`
`194`	`194`	`{`
`195`		`- return STATask.Run(() =>`
	`195`	`+ return Win32Helper.StartSTATask(() =>`
`196`	`196`	`{`
`197`	`197`	`return CommonDialogService.Open_NetworkConnectionDialog(`
`198`	`198`	`MainWindow.Instance.WindowHandle,`
`199`	`199`	`useMostRecentPath: true,`
`200`	`200`	`hideRestoreConnectionCheckBox: false);`
`201`		`- }, App.Logger);`
	`201`	`+ });`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public bool EmptyTrashBin()`
`83`	`83`	`/// <inheritdoc/>`
`84`	`84`	`public async Task<bool> RestoreAllTrashesAsync()`
`85`	`85`	`{`
`86`		`- return await STATask.Run(() =>`
	`86`	`+ return await Win32Helper.StartSTATask(() =>`
`87`	`87`	`{`
`88`	`88`	`try`
`89`	`89`	`{`
`@@ -95,7 +95,7 @@ public async Task<bool> RestoreAllTrashesAsync()`
`95`	`95`	`{`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`		`- }, App.Logger);`
	`98`	`+ });`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private unsafe bool RestoreAllTrashesInternal()`
Original file line number	Diff line number	Diff line change
`@@ -63,20 +63,20 @@ private async Task UnpinFromSidebarAsync(string[] folderPaths, bool doUpdateQuic`
`63`	`63`	`(folderPaths.Contains(path) \|\|`
`64`	`64`	`(path.StartsWith(@"\\SHELL\\") && folderPaths.Any(x => x.StartsWith(@"\\SHELL\\")))))`
`65`	`65`	`{`
`66`		`- await STATask.Run(async () =>`
	`66`	`+ await Win32Helper.StartSTATask(async () =>`
`67`	`67`	`{`
`68`	`68`	`fi.InvokeVerb("unpinfromhome");`
`69`		`- }, App.Logger);`
	`69`	`+ });`
`70`	`70`	`continue;`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if (folderPaths.Contains(pathStr))`
`75`	`75`	`{`
`76`		`- await STATask.Run(async () =>`
	`76`	`+ await Win32Helper.StartSTATask(async () =>`
`77`	`77`	`{`
`78`	`78`	`fi.InvokeVerb("unpinfromhome");`
`79`		`- }, App.Logger);`
	`79`	`+ });`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private void InitializeWatcher()`
`67`	`67`	`/// <returns>List of library items</returns>`
`68`	`68`	`public static async Task<List<LibraryLocationItem>> ListUserLibraries()`
`69`	`69`	`{`
`70`		`- var libraries = await STATask.Run(() =>`
	`70`	`+ var libraries = await Win32Helper.StartSTATask(() =>`
`71`	`71`	`{`
`72`	`72`	`try`
`73`	`73`	`{`
`@@ -90,7 +90,7 @@ public static async Task<List<LibraryLocationItem>> ListUserLibraries()`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`return [];`
`93`		`- }, App.Logger);`
	`93`	`+ });`
`94`	`94`
`95`	`95`	`return libraries.Select(lib => new LibraryLocationItem(lib)).ToList();`
`96`	`96`	`}`
`@@ -134,7 +134,7 @@ public async Task<bool> CreateNewLibrary(string name)`
`134`	`134`	`if (string.IsNullOrWhiteSpace(name) \|\| !CanCreateLibrary(name).result)`
`135`	`135`	`return false;`
`136`	`136`
`137`		`- var newLib = new LibraryLocationItem(await STATask.Run(() =>`
	`137`	`+ var newLib = new LibraryLocationItem(await Win32Helper.StartSTATask(() =>`
`138`	`138`	`{`
`139`	`139`	`try`
`140`	`140`	`{`
`@@ -150,7 +150,7 @@ public async Task<bool> CreateNewLibrary(string name)`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`return Task.FromResult<ShellLibraryItem>(null);`
`153`		`- }, App.Logger));`
	`153`	`+ }));`
`154`	`154`
`155`	`155`	`if (newLib is not null)`
`156`	`156`	`{`
`@@ -178,7 +178,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string`
`178`	`178`	`// Nothing to update`
`179`	`179`	`return null;`
`180`	`180`
`181`		`- var item = await STATask.Run(() =>`
	`181`	`+ var item = await Win32Helper.StartSTATask(() =>`
`182`	`182`	`{`
`183`	`183`	`try`
`184`	`184`	`{`
`@@ -231,7 +231,7 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`return Task.FromResult<ShellLibraryItem>(null);`
`234`		`- }, App.Logger);`
	`234`	`+ });`
`235`	`235`
`236`	`236`	`var newLib = item is not null ? new LibraryLocationItem(item) : null;`
`237`	`237`	`if (newLib is not null)`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri`
`141`	`141`	`{`
`142`	`142`	`try`
`143`	`143`	`{`
`144`		`- var opened = await STATask.Run(async () =>`
	`144`	`+ var opened = await Win32Helper.StartSTATask(async () =>`
`145`	`145`	`{`
`146`	`146`	`var split = application.Split('\|').Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => GetMtpPath(x));`
`147`	`147`	`if (split.Count() == 1)`
`@@ -171,21 +171,21 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`return true;`
`174`		`- }, App.Logger);`
	`174`	`+ });`
`175`	`175`
`176`	`176`	`if (!opened)`
`177`	`177`	`{`
`178`	`178`	`if (application.StartsWith(@"\\SHELL\", StringComparison.Ordinal))`
`179`	`179`	`{`
`180`		`- opened = await STATask.Run(async () =>`
	`180`	`+ opened = await Win32Helper.StartSTATask(async () =>`
`181`	`181`	`{`
`182`	`182`	`using var cMenu = await ContextMenu.GetContextMenuForFiles(new[] { application }, PInvoke.CMF_DEFAULTONLY);`
`183`	`183`
`184`	`184`	`if (cMenu is not null)`
`185`	`185`	`await cMenu.InvokeItem(cMenu.Items.FirstOrDefault()?.ID ?? -1);`
`186`	`186`
`187`	`187`	`return true;`
`188`		`- }, App.Logger);`
	`188`	`+ });`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static class FileThumbnailHelper`
`14`	`14`	`{`
`15`	`15`	`var size = iconOptions.HasFlag(IconOptions.UseCurrentScale) ? requestedSize * App.AppModel.AppWindowDPI : requestedSize;`
`16`	`16`
`17`		`- return await STATask.Run(() => Win32Helper.GetIcon(path, (int)size, isFolder, iconOptions), App.Logger);`
	`17`	`+ return await Win32Helper.StartSTATask(() => Win32Helper.GetIcon(path, (int)size, isFolder, iconOptions));`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/// <summary>`
`@@ -24,7 +24,7 @@ public static class FileThumbnailHelper`
`24`	`24`	`/// <param name="isFolder"></param>`
`25`	`25`	`/// <returns></returns>`
`26`	`26`	`public static async Task<byte[]?> GetIconOverlayAsync(string path, bool isFolder)`
`27`		`- => await STATask.Run(() => Win32Helper.GetIconOverlay(path, isFolder), App.Logger);`
	`27`	`+ => await Win32Helper.StartSTATask(() => Win32Helper.GetIconOverlay(path, isFolder));`
`28`	`28`
`29`	`29`	`[Obsolete]`
`30`	`30`	`public static async Task<byte[]?> LoadIconFromPathAsync(string filePath, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions, bool isFolder = false)`