use SHOW_WINDOW_CMD.SHOW_WINDOW_CMD instead of Vanara.PInvoke.ShowWindowCommand

marcofranzen99 · marcofranzen99 · commit 0c734ba30d0a · 2025-01-06T22:37:13.000+01:00
diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
@@ -9,8 +9,8 @@
 using System.Drawing;
 using System.IO;
 using System.Text;
-using Vanara.PInvoke;
 using Windows.Storage;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 #pragma warning disable CS0618 // Type or member is obsolete
 
@@ -527,7 +527,7 @@ public override string Name
 		public string Arguments { get; set; }
 		public string WorkingDirectory { get; set; }
 		public bool RunAsAdmin { get; set; }
-		public ShowWindowCommand ShowWindowCommand { get; set; }
+		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 		public bool IsUrl { get; set; }
 		public bool IsSymLink { get; set; }
 		public override bool IsExecutable => FileExtensionHelpers.IsExecutableFile(TargetPath, true);
diff --git a/src/Files.App/Data/Items/ShellLinkItem.cs b/src/Files.App/Data/Items/ShellLinkItem.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Vanara.PInvoke;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Data.Items
 {
@@ -17,7 +17,7 @@ public sealed class ShellLinkItem : ShellFileItem
 
 		public bool InvalidTarget { get; set; }
 
-		public ShowWindowCommand ShowWindowCommand { get; set; }
+		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 
 		public ShellLinkItem()
 		{
diff --git a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
@@ -5,7 +5,7 @@
 using Files.Shared.Helpers;
 using System.Windows.Input;
 using TagLib;
-using Vanara.PInvoke;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Data.Models
 {
@@ -782,22 +782,22 @@ public bool RunAsAdminEnabled
 			set => SetProperty(ref runAsAdminEnabled, value);
 		}
 
-		private static readonly IReadOnlyDictionary<ShowWindowCommand, string> showWindowCommandTypes = new Dictionary<ShowWindowCommand, string>()
+		private static readonly IReadOnlyDictionary<SHOW_WINDOW_CMD, string> showWindowCommandTypes = new Dictionary<SHOW_WINDOW_CMD, string>
 		{
-			{ ShowWindowCommand.SW_NORMAL, Strings.NormalWindow.GetLocalizedResource() },
-			{ ShowWindowCommand.SW_SHOWMINNOACTIVE, Strings.Minimized.GetLocalizedResource() },
-			{ ShowWindowCommand.SW_MAXIMIZE, Strings.Maximized.GetLocalizedResource() }
+			{ SHOW_WINDOW_CMD.SW_NORMAL, Strings.NormalWindow.GetLocalizedResource() },
+			{ SHOW_WINDOW_CMD.SW_SHOWMINNOACTIVE, Strings.Minimized.GetLocalizedResource() },
+			{ SHOW_WINDOW_CMD.SW_MAXIMIZE, Strings.Maximized.GetLocalizedResource() }
 		}.AsReadOnly();
-		public IReadOnlyDictionary<ShowWindowCommand, string> ShowWindowCommandTypes { get => showWindowCommandTypes; }
+		public IReadOnlyDictionary<SHOW_WINDOW_CMD, string> ShowWindowCommandTypes { get => showWindowCommandTypes; }
 
 		public string SelectedShowWindowCommand
 		{
 			get => ShowWindowCommandTypes.GetValueOrDefault(ShowWindowCommandEditedValue)!;
 			set => ShowWindowCommandEditedValue = ShowWindowCommandTypes.First(e => e.Value == value).Key;
 		}
 
-		private ShowWindowCommand showWindowCommand;
-		public ShowWindowCommand ShowWindowCommand
+		private SHOW_WINDOW_CMD showWindowCommand;
+		public SHOW_WINDOW_CMD ShowWindowCommand
 		{
 			get => showWindowCommand;
 			set
@@ -807,8 +807,8 @@ public ShowWindowCommand ShowWindowCommand
 			}
 		}
 
-		private ShowWindowCommand showWindowCommandEditedValue;
-		public ShowWindowCommand ShowWindowCommandEditedValue
+		private SHOW_WINDOW_CMD showWindowCommandEditedValue;
+		public SHOW_WINDOW_CMD ShowWindowCommandEditedValue
 		{
 			get => showWindowCommandEditedValue;
 			set
diff --git a/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs b/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Net;
 using System.Text;
-using Vanara.PInvoke;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Helpers
 {
@@ -246,7 +246,7 @@ public static async Task<bool> HandleShortcutCannotBeCreated(string shortcutName
 		/// <summary>
 		/// Updates ListedItem properties for a shortcut
 		/// </summary>
-		public static void UpdateShortcutItemProperties(ShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin, ShowWindowCommand showWindowCommand)
+		public static void UpdateShortcutItemProperties(ShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin, SHOW_WINDOW_CMD showWindowCommand)
 		{
 			item.TargetPath = Environment.ExpandEnvironmentVariables(targetPath);
 			item.Arguments = arguments;
diff --git a/src/Files.App/Utils/Shell/ShellFolderExtensions.cs b/src/Files.App/Utils/Shell/ShellFolderExtensions.cs
@@ -127,7 +127,7 @@ public static ShellLinkItem GetShellLinkItem(ShellLink linkItem)
 			{
 				IsFolder = !string.IsNullOrEmpty(linkItem.TargetPath) && linkItem.Target.IsFolder,
 				RunAsAdmin = linkItem.RunAsAdministrator,
-				ShowWindowCommand = linkItem.ShowState,
+				ShowWindowCommand = (Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD)linkItem.ShowState,
 				Arguments = linkItem.Arguments,
 				WorkingDirectory = Environment.ExpandEnvironmentVariables(linkItem.WorkingDirectory),
 				TargetPath = Environment.ExpandEnvironmentVariables(linkItem.TargetPath)
diff --git a/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs b/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs
@@ -12,6 +12,7 @@
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Utils.Storage
 {
@@ -733,7 +734,7 @@ public static void TryCancelOperation(string operationId)
 			}
 		}
 
-		public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string targetPath, string arguments = "", string workingDirectory = "", bool runAsAdmin = false, ShowWindowCommand showWindowCommand = ShowWindowCommand.SW_NORMAL)
+		public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string targetPath, string arguments = "", string workingDirectory = "", bool runAsAdmin = false, SHOW_WINDOW_CMD showWindowCommand = SHOW_WINDOW_CMD.SW_NORMAL)
 		{
 			try
 			{
@@ -748,7 +749,7 @@ public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string tar
 					newLink.SaveAs(linkSavePath); // Overwrite if exists
 
 					// ShowState has to be set after SaveAs has been called, otherwise an UnauthorizedAccessException gets thrown in some cases
-					newLink.ShowState = showWindowCommand;
+					newLink.ShowState = (ShowWindowCommand)showWindowCommand;
 
 					return Task.FromResult(true);
 				}
diff --git a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs
@@ -7,6 +7,7 @@
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.Storage.Streams;
+using Windows.Win32.UI.WindowsAndMessaging;
 using IO = System.IO;
 
 namespace Files.App.Utils.Storage
@@ -17,7 +18,7 @@ public sealed class ShortcutStorageFile : ShellStorageFile, IShortcutStorageItem
 		public string Arguments { get; }
 		public string WorkingDirectory { get; }
 		public bool RunAsAdmin { get; }
-		public ShowWindowCommand ShowWindowCommand { get; set; }
+		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 
 		public ShortcutStorageFile(ShellLinkItem item) : base(item)
 		{
diff --git a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System.Runtime.InteropServices.WindowsRuntime;
-using Vanara.PInvoke;
 using Windows.Foundation;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.Storage.Search;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Utils.Storage
 {
@@ -16,7 +16,7 @@ public sealed class ShortcutStorageFolder : ShellStorageFolder, IShortcutStorage
 		public string Arguments { get; }
 		public string WorkingDirectory { get; }
 		public bool RunAsAdmin { get; }
-		public ShowWindowCommand ShowWindowCommand { get; set; }
+		public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
 
 		public ShortcutStorageFolder(ShellLinkItem item) : base(item)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Files Community`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`		`-using Vanara.PInvoke;`
	`4`	`+using Windows.Win32.UI.WindowsAndMessaging;`
`5`	`5`
`6`	`6`	`namespace Files.App.Data.Items`
`7`	`7`	`{`
`@@ -17,7 +17,7 @@ public sealed class ShellLinkItem : ShellFileItem`
`17`	`17`
`18`	`18`	`public bool InvalidTarget { get; set; }`
`19`	`19`
`20`		`- public ShowWindowCommand ShowWindowCommand { get; set; }`
	`20`	`+ public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }`
`21`	`21`
`22`	`22`	`public ShellLinkItem()`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using Files.Shared.Helpers;`
`6`	`6`	`using System.Windows.Input;`
`7`	`7`	`using TagLib;`
`8`		`-using Vanara.PInvoke;`
	`8`	`+using Windows.Win32.UI.WindowsAndMessaging;`
`9`	`9`
`10`	`10`	`namespace Files.App.Data.Models`
`11`	`11`	`{`
`@@ -782,22 +782,22 @@ public bool RunAsAdminEnabled`
`782`	`782`	`set => SetProperty(ref runAsAdminEnabled, value);`
`783`	`783`	`}`
`784`	`784`
`785`		`- private static readonly IReadOnlyDictionary<ShowWindowCommand, string> showWindowCommandTypes = new Dictionary<ShowWindowCommand, string>()`
	`785`	`+ private static readonly IReadOnlyDictionary<SHOW_WINDOW_CMD, string> showWindowCommandTypes = new Dictionary<SHOW_WINDOW_CMD, string>`
`786`	`786`	`{`
`787`		`- { ShowWindowCommand.SW_NORMAL, Strings.NormalWindow.GetLocalizedResource() },`
`788`		`- { ShowWindowCommand.SW_SHOWMINNOACTIVE, Strings.Minimized.GetLocalizedResource() },`
`789`		`- { ShowWindowCommand.SW_MAXIMIZE, Strings.Maximized.GetLocalizedResource() }`
	`787`	`+ { SHOW_WINDOW_CMD.SW_NORMAL, Strings.NormalWindow.GetLocalizedResource() },`
	`788`	`+ { SHOW_WINDOW_CMD.SW_SHOWMINNOACTIVE, Strings.Minimized.GetLocalizedResource() },`
	`789`	`+ { SHOW_WINDOW_CMD.SW_MAXIMIZE, Strings.Maximized.GetLocalizedResource() }`
`790`	`790`	`}.AsReadOnly();`
`791`		`- public IReadOnlyDictionary<ShowWindowCommand, string> ShowWindowCommandTypes { get => showWindowCommandTypes; }`
	`791`	`+ public IReadOnlyDictionary<SHOW_WINDOW_CMD, string> ShowWindowCommandTypes { get => showWindowCommandTypes; }`
`792`	`792`
`793`	`793`	`public string SelectedShowWindowCommand`
`794`	`794`	`{`
`795`	`795`	`get => ShowWindowCommandTypes.GetValueOrDefault(ShowWindowCommandEditedValue)!;`
`796`	`796`	`set => ShowWindowCommandEditedValue = ShowWindowCommandTypes.First(e => e.Value == value).Key;`
`797`	`797`	`}`
`798`	`798`
`799`		`- private ShowWindowCommand showWindowCommand;`
`800`		`- public ShowWindowCommand ShowWindowCommand`
	`799`	`+ private SHOW_WINDOW_CMD showWindowCommand;`
	`800`	`+ public SHOW_WINDOW_CMD ShowWindowCommand`
`801`	`801`	`{`
`802`	`802`	`get => showWindowCommand;`
`803`	`803`	`set`
`@@ -807,8 +807,8 @@ public ShowWindowCommand ShowWindowCommand`
`807`	`807`	`}`
`808`	`808`	`}`
`809`	`809`
`810`		`- private ShowWindowCommand showWindowCommandEditedValue;`
`811`		`- public ShowWindowCommand ShowWindowCommandEditedValue`
	`810`	`+ private SHOW_WINDOW_CMD showWindowCommandEditedValue;`
	`811`	`+ public SHOW_WINDOW_CMD ShowWindowCommandEditedValue`
`812`	`812`	`{`
`813`	`813`	`get => showWindowCommandEditedValue;`
`814`	`814`	`set`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public static ShellLinkItem GetShellLinkItem(ShellLink linkItem)`
`127`	`127`	`{`
`128`	`128`	`IsFolder = !string.IsNullOrEmpty(linkItem.TargetPath) && linkItem.Target.IsFolder,`
`129`	`129`	`RunAsAdmin = linkItem.RunAsAdministrator,`
`130`		`- ShowWindowCommand = linkItem.ShowState,`
	`130`	`+ ShowWindowCommand = (Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD)linkItem.ShowState,`
`131`	`131`	`Arguments = linkItem.Arguments,`
`132`	`132`	`WorkingDirectory = Environment.ExpandEnvironmentVariables(linkItem.WorkingDirectory),`
`133`	`133`	`TargetPath = Environment.ExpandEnvironmentVariables(linkItem.TargetPath)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Vanara.PInvoke;`
`13`	`13`	`using Vanara.Windows.Shell;`
`14`	`14`	`using Windows.ApplicationModel.DataTransfer;`
	`15`	`+using Windows.Win32.UI.WindowsAndMessaging;`
`15`	`16`
`16`	`17`	`namespace Files.App.Utils.Storage`
`17`	`18`	`{`
`@@ -733,7 +734,7 @@ public static void TryCancelOperation(string operationId)`
`733`	`734`	`}`
`734`	`735`	`}`
`735`	`736`
`736`		`- public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string targetPath, string arguments = "", string workingDirectory = "", bool runAsAdmin = false, ShowWindowCommand showWindowCommand = ShowWindowCommand.SW_NORMAL)`
	`737`	`+ public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string targetPath, string arguments = "", string workingDirectory = "", bool runAsAdmin = false, SHOW_WINDOW_CMD showWindowCommand = SHOW_WINDOW_CMD.SW_NORMAL)`
`737`	`738`	`{`
`738`	`739`	`try`
`739`	`740`	`{`
`@@ -748,7 +749,7 @@ public static Task<bool> CreateOrUpdateLinkAsync(string linkSavePath, string tar`
`748`	`749`	`newLink.SaveAs(linkSavePath); // Overwrite if exists`
`749`	`750`
`750`	`751`	`// ShowState has to be set after SaveAs has been called, otherwise an UnauthorizedAccessException gets thrown in some cases`
`751`		`- newLink.ShowState = showWindowCommand;`
	`752`	`+ newLink.ShowState = (ShowWindowCommand)showWindowCommand;`
`752`	`753`
`753`	`754`	`return Task.FromResult(true);`
`754`	`755`	`}`