Brush up

Author: 0x5bfa

src/Files.App/Data/Contracts/IWindowsSecurityService.cs

@@ -11,14 +11,14 @@ public interface IWindowsSecurityService
 		/// <summary>
 		/// Gets a value that indicates whether the application is elevated.
 		/// </summary>
-		/// <returns>Returns true if the application is elevated via UAC prompt OR the application is elevated by default because the user, who launched the application, is in Administrators group; otherwise, false.</returns>
+		/// <returns>Returns true if the application is elevated; otherwise, false.</returns>
 		bool IsAppElevated();
 
 		/// <summary>
 		/// Gets a value that indicates whether the application can drag &amp; drop.
 		/// </summary>
 		/// <remarks>
-		/// Drag &amp; drop onto an elevated app is not allowed (just crashes) due to the Windows limitation by its design.
+		/// Drag &amp; drop onto an elevated app is not allowed (just crashes) due to UIPI.
 		/// <br/>
 		/// <br/>
 		/// For more info, visit:

src/Files.App/NativeMethods.txt

@@ -94,14 +94,3 @@ DesktopWallpaper
 SHCreateShellItemArrayFromIDLists
 ILCreateFromPath
 CLSIDFromString
-AllocateAndInitializeSid
-CheckTokenMembership
-FreeSid
-GetCurrentProcessToken
-GetTokenInformation
-LocalAlloc
-CloseHandle
-TOKEN_ELEVATION_TYPE
-TOKEN_ELEVATION
-GetCurrentProcess
-OpenProcessToken

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

@@ -1,12 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Microsoft.Extensions.Logging;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.Security;
-using Windows.Win32.System.Memory;
-
 namespace Files.App.Services
 {
 	/// <inheritdoc cref="IWindowsSecurityService"/>
@@ -22,80 +16,19 @@ public unsafe bool IsAppElevated()
 		}
 
 		/// <inheritdoc/>
-		public bool IsElevationRequired(string path)
+		public unsafe bool CanDragAndDrop()
 		{
-			if (string.IsNullOrEmpty(path))
-				return false;
-
-			// TODO: Use PInvoke partial class in a separate project
-			return Win32PInvoke.IsElevationRequired(path);
+			return !IsAppElevated();
 		}
 
 		/// <inheritdoc/>
-		public unsafe bool CanDragAndDrop()
+		public bool IsElevationRequired(string path)
 		{
-			//HANDLE hToken = default;
-			//uint cbTokenInfo = 0u;
-			//TOKEN_ELEVATION_TYPE* pTokenElevationTypeInfo = default;
-			//TOKEN_ELEVATION* pTokenElevationInfo = default;
-
-			try
-			{
-				//if (!PInvoke.OpenProcessToken(PInvoke.GetCurrentProcess(), TOKEN_ACCESS_MASK.TOKEN_QUERY, &hToken))
-				//{
-				//	throw new InvalidOperationException();
-				//}
-
-				//// Get size of TOKEN_ELEVATION_TYPE first
-				//PInvoke.GetTokenInformation(hToken, TOKEN_INFORMATION_CLASS.TokenElevationType, null, 0, &cbTokenInfo);
-
-				//// Allocate TOKEN_ELEVATION_TYPE
-				//pTokenElevationTypeInfo = (TOKEN_ELEVATION_TYPE*)PInvoke.LocalAlloc(LOCAL_ALLOC_FLAGS.LPTR, cbTokenInfo);
-				//if (pTokenElevationTypeInfo == null)
-				//{
-				//	PInvoke.CloseHandle(hToken);
-				//	throw new InvalidOperationException();
-				//}
-
-				//// Get the actual TOKEN_ELEVATION_TYPE
-				//PInvoke.GetTokenInformation(hToken, TOKEN_INFORMATION_CLASS.TokenElevationType, pTokenElevationTypeInfo, cbTokenInfo, &cbTokenInfo);
-
-				//// Get size of TOKEN_ELEVATION first
-				//PInvoke.GetTokenInformation(hToken, TOKEN_INFORMATION_CLASS.TokenElevation, null, 0, &cbTokenInfo);
-
-				//// Allocate TOKEN_ELEVATION
-				//pTokenElevationInfo = (TOKEN_ELEVATION*)PInvoke.LocalAlloc(LOCAL_ALLOC_FLAGS.LPTR, cbTokenInfo);
-				//if (pTokenElevationInfo == null)
-				//{
-				//	PInvoke.CloseHandle(hToken);
-				//	throw new InvalidOperationException();
-				//}
-
-				//// Get the actual TOKEN_ELEVATION
-				//PInvoke.GetTokenInformation(hToken, TOKEN_INFORMATION_CLASS.TokenElevation, pTokenElevationInfo, cbTokenInfo, &cbTokenInfo);
-
-				//// UAC is fully disabled
- 				//	if (*pTokenElevationTypeInfo is TOKEN_ELEVATION_TYPE.TokenElevationTypeDefault &&
-				//	pTokenElevationInfo->TokenIsElevated == 1u)
-				//	return false;
-
-				return !IsAppElevated();
-			}
-			catch (Exception ex)
-			{
-				App.Logger.LogWarning(ex, ex.Message);
-
-				// Disable it, just in case
+			if (string.IsNullOrEmpty(path))
 				return false;
-			}
-			finally
-			{
-				//if (pTokenElevationTypeInfo is not null)
-				//	PInvoke.LocalFree((HLOCAL)pTokenElevationTypeInfo);
 
-				//if (pTokenElevationInfo is not null)
-				//	PInvoke.LocalFree((HLOCAL)pTokenElevationInfo);
-			}
+			// TODO: Use PInvoke partial class in a separate project
+			return Win32PInvoke.IsElevationRequired(path);
 		}
 	}
 }