Code Quality: Various fixes to the WinRT server call (#15229)

Co-authored-by: hishitetsu <[email protected]>

Author: hez2010

src/Files.App.Server/NativeMethods.json

@@ -4,7 +4,7 @@
 	"$schema": "https://aka.ms/CsWin32.schema.json",
 
 	// Emit COM interfaces instead of structs, and allow generation of non-blittable structs for the sake of an easier to use API.
-	"allowMarshaling": true,
+	"allowMarshaling": false,
 
 	// A value indicating whether to generate APIs judged to be unnecessary or redundant given the target framework.
 	// This is useful for multi-targeting projects that need a consistent set of APIs across target frameworks
@@ -24,5 +24,5 @@
 	"className": "PInvoke",
 
 	// A value indicating whether to expose the generated APIs publicly (as opposed to internally).
-	"public": true
+	"public": false
 }

src/Files.App.Server/NativeMethods.txt

@@ -6,4 +6,3 @@ RoRevokeActivationFactories
 WindowsCreateString
 WindowsDeleteString
 RoInitialize
-RoUninitialize

src/Files.App.Server/Program.cs

@@ -23,36 +23,36 @@ static async Task Main()
 
 		nint cookie = 0;
 
-		unsafe
-		{
-			_ = PInvoke.RoInitialize(RO_INIT_TYPE.RO_INIT_MULTITHREADED);
+		_ = PInvoke.RoInitialize(RO_INIT_TYPE.RO_INIT_MULTITHREADED);
 
-			var classIds = typeof(Program).Assembly.GetTypes()
-				.Where(t => t.IsSealed && t.IsPublic && t.IsClass)
-				.Select(t => t.FullName!)
-				.Where(name => name.StartsWith("Files.App.Server.", StringComparison.Ordinal))
-				.Select(name =>
+		var classIds = typeof(Program).Assembly.GetTypes()
+			.Where(t => t.IsSealed && t.IsPublic && t.IsClass)
+			.Select(t => t.FullName!)
+			.Where(name => name.StartsWith("Files.App.Server.", StringComparison.Ordinal))
+			.Select(name =>
+			{
+				if (PInvoke.WindowsCreateString(name, (uint)name.Length, out var classId) is HRESULT hr && hr.Value is not 0)
 				{
-					if (PInvoke.WindowsCreateString(name, (uint)name.Length, out var classId) is HRESULT hr && hr.Value is not 0)
-					{
-						Marshal.ThrowExceptionForHR(hr);
-					}
+					Marshal.ThrowExceptionForHR(hr);
+				}
 
-					return new HSTRING(classId.DangerousGetHandle());
-				})
-				.ToArray();
+				return new HSTRING(classId.DangerousGetHandle());
+			})
+			.ToArray();
 
+		unsafe
+		{
 			var callbacks = Enumerable.Repeat((nint)(delegate* unmanaged[Stdcall]<void*, void**, int>)&Helpers.GetActivationFactory, classIds.Length).ToArray();
 
 			if (PInvoke.RoRegisterActivationFactories(classIds, callbacks, out cookie) is HRESULT hr && hr.Value != 0)
 			{
 				Marshal.ThrowExceptionForHR(hr);
 			}
+		}
 
-			foreach (var str in classIds)
-			{
-				_ = PInvoke.WindowsDeleteString(str);
-			}
+		foreach (var str in classIds)
+		{
+			_ = PInvoke.WindowsDeleteString(str);
 		}
 
 		AppDomain.CurrentDomain.ProcessExit += (_, _) => cancellationTokenSource.Cancel();
@@ -72,8 +72,6 @@ static async Task Main()
 			{
 				PInvoke.RoRevokeActivationFactories(cookie);
 			}
-
-			PInvoke.RoUninitialize();
 		}
 	}
 

src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

@@ -505,6 +505,9 @@ public static void SetLayoutPreferencesForPath(string path, LayoutPreferencesIte
 			{
 				path = path.TrimPath() ?? string.Empty;
 
+				if (path.StartsWith("tag:", StringComparison.Ordinal))
+					return GetLayoutPreferencesFromDatabase("Home", null);
+
 				var folderFRN = NativeFileOperationsHelper.GetFolderFRN(path);
 
 				return GetLayoutPreferencesFromDatabase(path, folderFRN)

src/Files.App/Program.cs

@@ -57,6 +57,46 @@ private static void Main()
 		{
 			WinRT.ComWrappersSupport.InitializeComWrappers();
 
+			// We are about to do the first WinRT server call, in case the WinRT server is hanging
+			// we need to kill the server if there is no other Files instances already running
+
+			static bool ProcessPathPredicate(Process p)
+			{
+				try
+				{
+					return p.MainModule?.FileName
+						.StartsWith(Windows.ApplicationModel.Package.Current.EffectivePath, StringComparison.OrdinalIgnoreCase) ?? false;
+				}
+				catch
+				{
+					return false;
+				}
+			}
+
+			var processes = Process.GetProcessesByName("Files")
+				.Where(ProcessPathPredicate)
+				.Where(p => p.Id != Environment.ProcessId);
+
+			if (!processes.Any())
+			{
+				foreach (var process in Process.GetProcessesByName("Files.App.Server").Where(ProcessPathPredicate))
+				{
+					try
+					{
+						process.Kill();
+					}
+					catch
+					{
+						// ignore any exceptions
+					}
+					finally
+					{
+						process.Dispose();
+					}
+				}
+			}
+
+			// Now we can do the first WinRT server call
 			Server.AppInstanceMonitor.StartMonitor(Environment.ProcessId);
 
 			var OpenTabInExistingInstance = ApplicationData.Current.LocalSettings.Values.Get("OpenTabInExistingInstance", true);

src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs

@@ -84,7 +84,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 						return destFile;
 					}
 				}
-				catch (UnauthorizedAccessException ex) // shortcuts & .url
+				catch (UnauthorizedAccessException) // shortcuts & .url
 				{
 					if (!string.IsNullOrEmpty(destFolder.Path))
 					{
@@ -102,7 +102,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 							return new NativeStorageFile(destination, desiredNewName, DateTime.Now);
 						}
 					}
-					throw ex;
+					throw;
 				}
 			});
 		}