Remove Vanara from DriveHelpers

Author: 0x5bfa

src/Files.App.CsWin32/NativeMethods.txt

@@ -133,3 +133,4 @@ IFileOperation
 IShellItem2
 PSGetPropertyKeyFromName
 ShellExecuteEx
+QueryDosDevice

src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs

@@ -1,13 +1,14 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using DiscUtils.Udf;
 using Microsoft.Management.Infrastructure;
-using System.IO;
 using Windows.Devices.Enumeration;
 using Windows.Devices.Portable;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
-using DiscUtils.Udf;
+using Windows.Win32;
+using Windows.Win32.Foundation;
 
 namespace Files.App.Utils.Storage
 {
@@ -52,12 +53,12 @@ public static async Task<bool> CheckEmptyDrive(string? drivePath)
 
 		public static async Task<StorageFolderWithPath> GetRootFromPathAsync(string devicePath)
 		{
-			if (!Path.IsPathRooted(devicePath))
+			if (!SystemIO.Path.IsPathRooted(devicePath))
 				return null;
 
 			var drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
-			var rootPath = Path.GetPathRoot(devicePath);
+			var rootPath = SystemIO.Path.GetPathRoot(devicePath);
 			if (devicePath.StartsWith(@"\\?\", StringComparison.Ordinal)) // USB device
 			{
 				// Check among already discovered drives
@@ -102,41 +103,61 @@ public static async Task<StorageFolderWithPath> GetRootFromPathAsync(string devi
 			return null;
 		}
 
-		public static Data.Items.DriveType GetDriveType(System.IO.DriveInfo drive)
+		public static DriveType GetDriveType(SystemIO.DriveInfo drive)
 		{
-			if (drive.DriveType is System.IO.DriveType.Unknown)
+			if (drive.DriveType is SystemIO.DriveType.Unknown)
 			{
 				string path = PathNormalization.NormalizePath(drive.Name);
 
 				if (path is "A:" or "B:")
-					return Data.Items.DriveType.FloppyDisk;
+					return DriveType.FloppyDisk;
 			}
 
 			return drive.DriveType switch
 			{
-				System.IO.DriveType.CDRom => Data.Items.DriveType.CDRom,
-				System.IO.DriveType.Fixed => Data.Items.DriveType.Fixed,
-				System.IO.DriveType.Network => Data.Items.DriveType.Network,
-				System.IO.DriveType.NoRootDirectory => Data.Items.DriveType.NoRootDirectory,
-				System.IO.DriveType.Ram => Data.Items.DriveType.Ram,
-				System.IO.DriveType.Removable => Data.Items.DriveType.Removable,
-				_ => Data.Items.DriveType.Unknown,
+				SystemIO.DriveType.CDRom => DriveType.CDRom,
+				SystemIO.DriveType.Fixed => DriveType.Fixed,
+				SystemIO.DriveType.Network => DriveType.Network,
+				SystemIO.DriveType.NoRootDirectory => DriveType.NoRootDirectory,
+				SystemIO.DriveType.Ram => DriveType.Ram,
+				SystemIO.DriveType.Removable => DriveType.Removable,
+				_ => DriveType.Unknown,
 			};
 		}
 
-		public static string GetExtendedDriveLabel(DriveInfo drive)
+		public static unsafe string GetExtendedDriveLabel(SystemIO.DriveInfo drive)
 		{
 			return SafetyExtensions.IgnoreExceptions(() =>
 			{
-				if (drive.DriveType is not System.IO.DriveType.CDRom || drive.DriveFormat is not "UDF")
+				if (drive.DriveType is not SystemIO.DriveType.CDRom || drive.DriveFormat is not "UDF")
 					return drive.VolumeLabel;
+
 				return SafetyExtensions.IgnoreExceptions(() =>
 				{
-					var dosDevicePath = Vanara.PInvoke.Kernel32.QueryDosDevice(drive.Name).FirstOrDefault();
+					string dosDevicePath = "";
+
+					fixed (char* cDeviceName = drive.Name)
+					{
+						var cch = PInvoke.QueryDosDevice(cDeviceName, null, 0u);
+
+						fixed (char* cTargetPath = new char[cch])
+						{
+							PWSTR pszTargetPath = new(cTargetPath);
+							PInvoke.QueryDosDevice(cDeviceName, pszTargetPath, 0u);
+							dosDevicePath = pszTargetPath.ToString();
+						}
+					}
+
 					if (string.IsNullOrEmpty(dosDevicePath))
 						return drive.VolumeLabel;
-					using var driveStream = new FileStream(dosDevicePath.Replace(@"\Device\", @"\\.\"), FileMode.Open, FileAccess.Read);
+
+					using var driveStream = new SystemIO.FileStream(
+						dosDevicePath.Replace(@"\Device\", @"\\.\"),
+						SystemIO.FileMode.Open,
+						SystemIO.FileAccess.Read);
+
 					using var udf = new UdfReader(driveStream);
+
 					return udf.VolumeLabel;
 				}) ?? drive.VolumeLabel;
 			}) ?? "";