From 56c3dea2ae4d869b6dba946359bfa984667bfbb5 Mon Sep 17 00:00:00 2001
From: mntone <sd8@live.jp>
Date: Fri, 24 Jul 2020 15:54:00 +0900
Subject: [PATCH 1/3] Add virtual desktop naming API

---
 .../VirtualDesktop.Showcase/MainWindow.xaml   | 19 ++++++++
 .../MainWindow.xaml.cs                        | 42 ++++++++++++++++++
 .../Interop/(interfaces)/IVirtualDesktop2.cs  | 44 +++++++++++++++++++
 .../IVirtualDesktopManagerInternal2.cs        | 38 ++++++++++++++++
 .../VirtualDesktopManagerInternal.cs          | 12 ++++-
 .../Interop/ComInterfaceAssembly.cs           |  2 +-
 .../Interop/ComInterfaceAssemblyProvider.cs   |  3 +-
 .../Interop/ComInterfaceWrapperAttribute.cs   | 26 ++++++++++-
 .../Interop/ComInterfaceWrapperBase.cs        | 43 ++++++++++++++----
 source/VirtualDesktop/VirtualDesktop.cs       | 33 +++++++++++++-
 source/VirtualDesktop/VirtualDesktop.csproj   |  4 ++
 source/VirtualDesktop/VirtualDesktopCache.cs  | 15 +++++--
 source/VirtualDesktop/app.config              | 19 ++++++++
 13 files changed, 280 insertions(+), 20 deletions(-)
 create mode 100644 source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop2.cs
 create mode 100644 source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal2.cs

diff --git a/samples/VirtualDesktop.Showcase/MainWindow.xaml b/samples/VirtualDesktop.Showcase/MainWindow.xaml
index fdda1f6..07af1bf 100644
--- a/samples/VirtualDesktop.Showcase/MainWindow.xaml
+++ b/samples/VirtualDesktop.Showcase/MainWindow.xaml
@@ -22,6 +22,16 @@
 					<Setter Property="BorderThickness"
 							Value="0.99" />
 				</Style>
+				<Style TargetType="{x:Type TextBox}">
+					<Setter Property="Padding"
+							Value="18,4" />
+					<Setter Property="HorizontalContentAlignment"
+							Value="Left" />
+					<Setter Property="Margin"
+							Value="8" />
+					<Setter Property="BorderThickness"
+							Value="0.99" />
+				</Style>
 			</Panel.Resources>
 			<StackPanel Margin="8">
 				<RadioButton x:Name="ThisWindowMenu"
@@ -56,6 +66,15 @@
 					Click="PinApp" />
 			<Button Content="Remove"
 					Click="Remove" />
+			<Button Content="Get name"
+					Click="GetName" />
+			<TextBox x:Name="NameTextBlock"
+					 Margin="8,8,8,0"
+					 Text="Desktop name" />
+			<Button Grid.Column="1"
+					Content="Set name"
+					Click="SetName"
+					Margin="8,0,8,8" />
 		</StackPanel>
 	</ScrollViewer>
 </Window>
diff --git a/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs b/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
index 720cf14..b79c6c8 100644
--- a/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
+++ b/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
@@ -141,6 +141,48 @@ private async void Remove(object sender, RoutedEventArgs e)
 			}
 		}
 
+		private async void GetName(object sender, RoutedEventArgs e)
+		{
+			if (this.ThisWindowMenu.IsChecked ?? false)
+			{
+				var name = this.GetCurrentDesktop().Name;
+				MessageBox.Show(name, "Current desktop name");
+			}
+			else
+			{
+				await Task.Delay(_delay);
+				var name = this.GetCurrentDesktop().Name;
+				MessageBox.Show(name, "Current desktop name");
+			}
+		}
+
+		private async void SetName(object sender, RoutedEventArgs e)
+		{
+			if (this.ThisWindowMenu.IsChecked ?? false)
+			{
+				try
+				{
+					this.GetCurrentDesktop().Name = this.NameTextBlock.Text;
+				}
+				catch (PlatformNotSupportedException ex)
+				{
+					MessageBox.Show(ex.Message, "Error");
+				}
+			}
+			else
+			{
+				await Task.Delay(_delay);
+				try
+				{
+					this.GetCurrentDesktop().Name = this.NameTextBlock.Text;
+				}
+				catch (PlatformNotSupportedException ex)
+				{
+					MessageBox.Show(ex.Message, "Error");
+				}
+			}
+		}
+
 
 		[DllImport("user32.dll")]
 		private static extern IntPtr GetForegroundWindow();
diff --git a/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop2.cs b/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop2.cs
new file mode 100644
index 0000000..70c75fd
--- /dev/null
+++ b/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop2.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktop2
+	{
+		bool IsViewVisible(object pView);
+
+		Guid GetID();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetName();
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L156-L173
+
+	public class VirtualDesktopCacheImpl2 : IVirtualDesktopCache
+	{
+		private readonly ConcurrentDictionary<Guid, VirtualDesktop> _wrappers = new ConcurrentDictionary<Guid, VirtualDesktop>();
+
+		public Func<Guid, object, VirtualDesktop> Factory { get; set; }
+
+		public VirtualDesktop GetOrCreate(object comObject)
+		{
+			if (comObject is IVirtualDesktop2)
+			{
+				return this._wrappers.GetOrAdd(((IVirtualDesktop)comObject).GetID(), id => this.Factory(id, comObject));
+			}
+
+			throw new ArgumentException();
+		}
+
+		public void Clear()
+		{
+			this._wrappers.Clear();
+		}
+	}
+}
diff --git a/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal2.cs b/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal2.cs
new file mode 100644
index 0000000..7a8a927
--- /dev/null
+++ b/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal2.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IVirtualDesktopManagerInternal2
+	{
+		int GetCount();
+
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop desktop);
+
+		bool CanViewMoveDesktops(IApplicationView pView);
+
+		IVirtualDesktop GetCurrentDesktop();
+
+		IObjectArray GetDesktops();
+
+		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
+
+		void SwitchDesktop(IVirtualDesktop desktop);
+
+		IVirtualDesktop CreateDesktopW();
+
+		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
+
+		IVirtualDesktop FindDesktop(ref Guid desktopId);
+
+		void Unknown1(IVirtualDesktop desktop, out IntPtr unknown1, out IntPtr unknown2);
+
+		void SetName(IVirtualDesktop desktop, [MarshalAs(UnmanagedType.HString)] string name);
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L193-L211
+}
diff --git a/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs b/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs
index ca6d145..a1e003b 100644
--- a/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs
+++ b/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs
@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Security.Cryptography;
 
 namespace WindowsDesktop.Interop
 {
-	[ComInterfaceWrapper]
+	[ComInterfaceWrapper(2)]
 	internal class VirtualDesktopManagerInternal : ComInterfaceWrapperBase
 	{
 		public VirtualDesktopManagerInternal(ComInterfaceAssembly assembly)
-			: base(assembly, service: CLSID.VirtualDesktopAPIUnknown)
+			: base(assembly, latestVersion: 2, service: CLSID.VirtualDesktopAPIUnknown)
 		{
 		}
 
@@ -62,5 +63,12 @@ public VirtualDesktop FindDesktop(ref Guid desktopId)
 
 		private VirtualDesktop GetDesktop(object[] parameters = null, [CallerMemberName] string methodName = "")
 			=> VirtualDesktopCache.GetOrCreate(this.Invoke<object>(parameters, methodName));
+
+		public void SetName(VirtualDesktop desktop, string name)
+		{
+			if (this.ComVersion < 2) throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+
+			this.Invoke(Args(desktop.ComObject, name));
+		}
 	}
 }
diff --git a/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs b/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs
index a154fba..0f882f6 100644
--- a/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs
+++ b/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs
@@ -22,7 +22,7 @@ internal Type GetType(string typeName)
 			{
 				type = this._knownTypes[typeName] = this._compiledAssembly
 					.GetTypes()
-					.Single(x => x.Name.Split('.').Last() == typeName);
+					.SingleOrDefault(x => x.Name.Split('.').Last() == typeName);
 			}
 
 			return type;
diff --git a/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs b/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
index f0bf364..0b77a3b 100644
--- a/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
+++ b/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
@@ -76,7 +76,7 @@ private Assembly CreateAssembly()
 			var executingAssembly = Assembly.GetExecutingAssembly();
 			var interfaceNames = executingAssembly
 				.GetTypes()
-				.Select(x => x.GetComInterfaceNameIfWrapper())
+				.SelectMany(x => x.GetComInterfaceNamesIfWrapper())
 				.Where(x => x != null)
 				.ToArray();
 			var iids = IID.GetIIDs(interfaceNames);
@@ -101,6 +101,7 @@ private Assembly CreateAssembly()
 
 				var interfaceName = interfaceNames.FirstOrDefault(x => typeName == x);
 				if (interfaceName == null) continue;
+				if (!iids.ContainsKey(interfaceName)) continue;
 
 				var stream = executingAssembly.GetManifestResourceStream(name);
 				if (stream == null) continue;
diff --git a/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs b/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs
index e1d3cad..087a776 100644
--- a/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs
+++ b/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs
@@ -10,6 +10,8 @@ public class ComInterfaceWrapperAttribute : Attribute
 	{
 		public string InterfaceName { get; set; }
 
+		public uint LatestVersion { get; set; } = 1;
+
 		public ComInterfaceWrapperAttribute() { }
 
 		public ComInterfaceWrapperAttribute(string interfaceName)
@@ -17,6 +19,11 @@ public ComInterfaceWrapperAttribute(string interfaceName)
 			this.InterfaceName = interfaceName;
 		}
 
+		public ComInterfaceWrapperAttribute(uint latestVersion)
+		{
+			this.LatestVersion = latestVersion;
+		}
+
 		public static string GetInterfaceName(Type wrapperType)
 			=> $"I{wrapperType.Name}";
 	}
@@ -29,9 +36,24 @@ public static class ComInterfaceWrapperAttributeExtensions
 		public static string GetComInterfaceNameIfWrapper(this Type type)
 		{
 			var attr = type.GetCustomAttribute<ComInterfaceWrapperAttribute>();
-			return attr != null 
-				? attr.InterfaceName ?? $"I{type.Name}" 
+			return attr != null
+				? attr.InterfaceName ?? $"I{type.Name}"
+				: null;
+		}
+
+		/// <summary>
+		/// Gets COM interface names if specific type has '<see cref="ComInterfaceWrapperAttribute"/>' attribute.
+		/// </summary>
+		public static IEnumerable<string> GetComInterfaceNamesIfWrapper(this Type type)
+		{
+			var attr = type.GetCustomAttribute<ComInterfaceWrapperAttribute>();
+			var baseName = attr != null
+				? attr.InterfaceName ?? $"I{type.Name}"
 				: null;
+			if (string.IsNullOrEmpty(baseName)) return Enumerable.Empty<string>();
+
+			return Enumerable.Range(1, (int)attr.LatestVersion)
+				.Select(v => v == 1 ? baseName : $"{baseName}{v}");
 		}
 	}
 }
diff --git a/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs b/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs
index c18c9ef..8a3671e 100644
--- a/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs
+++ b/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs
@@ -17,20 +17,45 @@ public abstract class ComInterfaceWrapperBase
 
 		public object ComObject { get; }
 
-		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, string comInterfaceName = null, Guid? service = null)
+		public uint ComVersion { get; }
+
+		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, string comInterfaceName = null, uint latestVersion = 1, Guid? service = null)
 		{
-			var (type, instance) = assembly.CreateInstance(comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper(), service);
+			var comInterfaceName2 = comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper();
+			for (var version = latestVersion; version >= 1; version--)
+			{
+				var type = assembly.GetType(version != 1 ? $"{comInterfaceName2}{version}" : comInterfaceName2);
+				if (type != null)
+				{
+					var instance = assembly.CreateInstance(type, service);
+					this.ComInterfaceAssembly = assembly;
+					this.ComInterfaceType = type;
+					this.ComObject = instance;
+					this.ComVersion = version;
+					return;
+				}
+			}
 
-			this.ComInterfaceAssembly = assembly;
-			this.ComInterfaceType = type;
-			this.ComObject = instance;
+			throw new InvalidOperationException($"{comInterfaceName2} or later version is not found.");
 		}
 
-		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, object comObject, string comInterfaceName = null)
+		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, object comObject, string comInterfaceName = null, uint latestVersion = 1)
 		{
-			this.ComInterfaceAssembly = assembly;
-			this.ComInterfaceType = assembly.GetType(comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper());
-			this.ComObject = comObject;
+			var comInterfaceName2 = comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper();
+			for (var version = latestVersion; version >= 1; version--)
+			{
+				var type = assembly.GetType(version != 1 ? $"{comInterfaceName2}{version}" : comInterfaceName2);
+				if (type != null)
+				{
+					this.ComInterfaceAssembly = assembly;
+					this.ComInterfaceType = type;
+					this.ComObject = comObject;
+					this.ComVersion = version;
+					return;
+				}
+			}
+
+			throw new InvalidOperationException($"{comInterfaceName2} or later version is not found.");
 		}
 
 		protected static object[] Args(params object[] args)
diff --git a/source/VirtualDesktop/VirtualDesktop.cs b/source/VirtualDesktop/VirtualDesktop.cs
index 7eb66c7..df2a5ac 100644
--- a/source/VirtualDesktop/VirtualDesktop.cs
+++ b/source/VirtualDesktop/VirtualDesktop.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
 using WindowsDesktop.Interop;
 using JetBrains.Annotations;
 
@@ -11,7 +12,7 @@ namespace WindowsDesktop
 	/// <summary>
 	/// Encapsulates a Windows 10 virtual desktop.
 	/// </summary>
-	[ComInterfaceWrapper]
+	[ComInterfaceWrapper(2)]
 	[DebuggerDisplay("{Id}")]
 	[UsedImplicitly(ImplicitUseTargetFlags.Members)]
 	public partial class VirtualDesktop : ComInterfaceWrapperBase, IDisposable
@@ -21,9 +22,37 @@ public partial class VirtualDesktop : ComInterfaceWrapperBase, IDisposable
 		/// </summary>
 		public Guid Id { get; }
 
+		/// <summary>
+		/// Gets the name for the virtual desktop.
+		/// </summary>
+		public string Name
+		{
+			get
+			{
+				if (this.ComVersion >= 2)
+				{
+					var name = this.Invoke<string>(Args(), "GetName");
+					if (!string.IsNullOrEmpty(name))
+					{
+						return name;
+					}
+				}
+
+				var desktops = GetDesktops();
+				var index = Array.IndexOf(desktops, this) + 1;
+				return $"Desktop {index}";
+			}
+			set
+			{
+				if (this.ComVersion < 2) throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+
+				ComInterface.VirtualDesktopManagerInternal.SetName(this, value);
+			}
+		}
+
 		[UsedImplicitly]
 		internal VirtualDesktop(ComInterfaceAssembly assembly, Guid id, object comObject)
-			: base(assembly, comObject)
+			: base(assembly, comObject, latestVersion: 2)
 		{
 			this.Id = id;
 		}
diff --git a/source/VirtualDesktop/VirtualDesktop.csproj b/source/VirtualDesktop/VirtualDesktop.csproj
index bc0de6c..87a57ad 100644
--- a/source/VirtualDesktop/VirtualDesktop.csproj
+++ b/source/VirtualDesktop/VirtualDesktop.csproj
@@ -30,7 +30,9 @@
     <Compile Remove="Interop\%28interfaces%29\IApplicationView.cs" />
     <Compile Remove="Interop\%28interfaces%29\IApplicationViewCollection.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktop.cs" />
+    <Compile Remove="Interop\%28interfaces%29\IVirtualDesktop2.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopManagerInternal.cs" />
+    <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopManagerInternal2.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopNotification.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopNotificationService.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopPinnedApps.cs" />
@@ -42,7 +44,9 @@
     <EmbeddedResource Include="Interop\(interfaces)\IApplicationView.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IApplicationViewCollection.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktop.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktop2.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopManagerInternal.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopManagerInternal2.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopNotification.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopNotificationService.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopPinnedApps.cs" />
diff --git a/source/VirtualDesktop/VirtualDesktopCache.cs b/source/VirtualDesktop/VirtualDesktopCache.cs
index da39415..16ab829 100644
--- a/source/VirtualDesktop/VirtualDesktopCache.cs
+++ b/source/VirtualDesktop/VirtualDesktopCache.cs
@@ -20,9 +20,18 @@ public static void Initialize(ComInterfaceAssembly assembly)
 		{
 			if (_cache == null)
 			{
-				var type = assembly.GetType("VirtualDesktopCacheImpl");
-				_cache = (IVirtualDesktopCache)Activator.CreateInstance(type);
-				_cache.Factory = (id, comObject) => new VirtualDesktop(assembly, id, comObject);
+				var type2 = assembly.GetType("VirtualDesktopCacheImpl2");
+				if (type2 != null)
+				{
+					_cache = (IVirtualDesktopCache)Activator.CreateInstance(type2);
+					_cache.Factory = (id, comObject) => new VirtualDesktop(assembly, id, comObject);
+				}
+				else
+				{
+					var type = assembly.GetType("VirtualDesktopCacheImpl");
+					_cache = (IVirtualDesktopCache)Activator.CreateInstance(type);
+					_cache.Factory = (id, comObject) => new VirtualDesktop(assembly, id, comObject);
+				}
 			}
 			else
 			{
diff --git a/source/VirtualDesktop/app.config b/source/VirtualDesktop/app.config
index 45e16a4..825ef2c 100644
--- a/source/VirtualDesktop/app.config
+++ b/source/VirtualDesktop/app.config
@@ -7,6 +7,25 @@
   </configSections>
   <applicationSettings>
     <WindowsDesktop.Properties.Settings>
+      <setting name="v_18975" serializeAs="Xml">
+        <value>
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <string>IApplicationView,{871F602A-2B58-42B4-8C4B-6C43D642C06F}</string>
+            <string>IApplicationViewCollection,{2C08ADF0-A386-4B35-9250-0FE183476FCC} </string>
+            <string>IObjectArray,{92CA9DCD-5622-4BBA-A805-5E9F541BD8C9} </string>
+            <string>IServiceProvider,{6D5140C1-7436-11CE-8034-00AA006009FA} </string>
+            <string>IVirtualDesktop,{FF72FFDD-BE7E-43FC-9C03-AD81681E88E4} </string>
+            <string>IVirtualDesktop2,{31EBDE3F-6EC3-4CBD-B9FB-0EF6D09B41F4} </string>
+            <string>IVirtualDesktopManager,{A5CD92FF-29BE-454C-8D04-D82879FB3F1B} </string>
+            <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
+            <string>IVirtualDesktopManagerInternal2,{0F3A72B0-4566-487E-9A33-4ED302F6D6CE} </string>
+            <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
+            <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
+            <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
+          </ArrayOfString>
+        </value>
+      </setting>
       <setting name="v_17134" serializeAs="Xml">
         <value>
           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 696d933cde11e92c078d58f7b13a2fd5b016ce15 Mon Sep 17 00:00:00 2001
From: mntone <sd8@live.jp>
Date: Fri, 24 Jul 2020 23:46:57 +0900
Subject: [PATCH 2/3] Add virtual desktop rename notification support

---
 .../MainWindow.xaml.cs                        |  1 +
 .../IVirtualDesktopNotification2.cs           | 63 +++++++++++++++++++
 .../(wrappers)/VirtualDesktopNotification.cs  | 23 +++++--
 source/VirtualDesktop/VirtualDesktop.cs       | 29 ++++-----
 source/VirtualDesktop/VirtualDesktop.csproj   |  2 +
 .../VirtualDesktop.static.notification.cs     | 14 +++++
 .../VirtualDesktopRenamedEventArgs.cs         | 32 ++++++++++
 source/VirtualDesktop/app.config              |  1 +
 8 files changed, 144 insertions(+), 21 deletions(-)
 create mode 100644 source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification2.cs
 create mode 100644 source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs

diff --git a/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs b/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
index b79c6c8..634b892 100644
--- a/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
+++ b/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
@@ -30,6 +30,7 @@ private static async void InitializeComObjects()
 			}
 
 			VirtualDesktop.CurrentChanged += (sender, args) => System.Diagnostics.Debug.WriteLine($"Desktop changed: {args.NewDesktop.Id}");
+			VirtualDesktop.Renamed += (sender, args) => System.Diagnostics.Debug.WriteLine($"Desktop renamed: {args.OldName} -> {args.NewName} ({args.Source.Id})");
 		}
 
 		private void CreateNew(object sender, RoutedEventArgs e)
diff --git a/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification2.cs b/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification2.cs
new file mode 100644
index 0000000..7a5d960
--- /dev/null
+++ b/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification2.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktopNotification2
+	{
+		void VirtualDesktopCreated(IVirtualDesktop pDesktop);
+
+		void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void ViewVirtualDesktopChanged(IntPtr pView);
+
+		void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
+		
+		void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string name);
+	}
+
+	public class VirtualDesktopNotificationListener2 : VirtualDesktopNotification, IVirtualDesktopNotification, IVirtualDesktopNotification2
+	{
+		public void VirtualDesktopCreated(IVirtualDesktop pDesktop)
+		{
+			this.VirtualDesktopCreatedCore(pDesktop);
+		}
+
+		public void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyBeginCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyFailedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void ViewVirtualDesktopChanged(IntPtr pView)
+		{
+			this.ViewVirtualDesktopChangedCore(pView);
+		}
+
+		public void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew)
+		{
+			this.CurrentVirtualDesktopChangedCore(pDesktopOld, pDesktopNew);
+		}
+
+		public void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string name)
+		{
+			this.VirtualDesktopRenamedCore(pDesktop, name);
+		}
+	}
+}
diff --git a/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs b/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs
index 464f1e9..c08f3ee 100644
--- a/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs
+++ b/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs
@@ -5,16 +5,24 @@
 
 namespace WindowsDesktop.Interop
 {
-	[ComInterfaceWrapper]
+	[ComInterfaceWrapper(2)]
 	[UsedImplicitly(ImplicitUseTargetFlags.Members)]
 	public abstract class VirtualDesktopNotification
 	{
 		internal static VirtualDesktopNotification CreateInstance(ComInterfaceAssembly assembly)
 		{
-			var type = assembly.GetType("VirtualDesktopNotificationListener");
-			var instance = (VirtualDesktopNotification)Activator.CreateInstance(type);
-
-			return instance;
+			var type2 = assembly.GetType("VirtualDesktopNotificationListener2");
+			if (type2 != null)
+			{
+				var instance = (VirtualDesktopNotification)Activator.CreateInstance(type2);
+				return instance;
+			}
+			else
+			{
+				var type = assembly.GetType("VirtualDesktopNotificationListener");
+				var instance = (VirtualDesktopNotification)Activator.CreateInstance(type);
+				return instance;
+			}
 		}
 
 		protected VirtualDesktop GetDesktop(object comObject)
@@ -49,5 +57,10 @@ protected void CurrentVirtualDesktopChangedCore(object pDesktopOld, object pDesk
 		{
 			VirtualDesktop.EventRaiser.RaiseCurrentChanged(this, VirtualDesktopCache.GetOrCreate(pDesktopOld), VirtualDesktopCache.GetOrCreate(pDesktopNew));
 		}
+
+		protected void VirtualDesktopRenamedCore(object pDesktop, string name)
+		{
+			VirtualDesktop.EventRaiser.RaiseRenamed(this, VirtualDesktopCache.GetOrCreate(pDesktop), name);
+		}
 	}
 }
diff --git a/source/VirtualDesktop/VirtualDesktop.cs b/source/VirtualDesktop/VirtualDesktop.cs
index df2a5ac..0a78296 100644
--- a/source/VirtualDesktop/VirtualDesktop.cs
+++ b/source/VirtualDesktop/VirtualDesktop.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using WindowsDesktop.Interop;
 using JetBrains.Annotations;
 
@@ -22,26 +21,14 @@ public partial class VirtualDesktop : ComInterfaceWrapperBase, IDisposable
 		/// </summary>
 		public Guid Id { get; }
 
+		private string _name = null;
+
 		/// <summary>
 		/// Gets the name for the virtual desktop.
 		/// </summary>
 		public string Name
 		{
-			get
-			{
-				if (this.ComVersion >= 2)
-				{
-					var name = this.Invoke<string>(Args(), "GetName");
-					if (!string.IsNullOrEmpty(name))
-					{
-						return name;
-					}
-				}
-
-				var desktops = GetDesktops();
-				var index = Array.IndexOf(desktops, this) + 1;
-				return $"Desktop {index}";
-			}
+			get => this._name;
 			set
 			{
 				if (this.ComVersion < 2) throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
@@ -55,6 +42,11 @@ internal VirtualDesktop(ComInterfaceAssembly assembly, Guid id, object comObject
 			: base(assembly, comObject, latestVersion: 2)
 		{
 			this.Id = id;
+			
+			if (this.ComVersion >= 2)
+			{
+				this._name = this.Invoke<string>(Args(), "GetName");
+			}
 		}
 
 		/// <summary>
@@ -116,6 +108,11 @@ public VirtualDesktop GetRight()
 			}
 		}
 
+		private void SetNameToCache(string name)
+		{
+			this._name = name;
+		}
+		
 #region IDisposable
 		private bool _disposed = false;
 
diff --git a/source/VirtualDesktop/VirtualDesktop.csproj b/source/VirtualDesktop/VirtualDesktop.csproj
index 87a57ad..47871ea 100644
--- a/source/VirtualDesktop/VirtualDesktop.csproj
+++ b/source/VirtualDesktop/VirtualDesktop.csproj
@@ -34,6 +34,7 @@
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopManagerInternal.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopManagerInternal2.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopNotification.cs" />
+    <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopNotification2.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopNotificationService.cs" />
     <Compile Remove="Interop\%28interfaces%29\IVirtualDesktopPinnedApps.cs" />
   </ItemGroup>
@@ -48,6 +49,7 @@
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopManagerInternal.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopManagerInternal2.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopNotification.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopNotification2.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopNotificationService.cs" />
     <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopPinnedApps.cs" />
     <None Include="..\..\LICENSE">
diff --git a/source/VirtualDesktop/VirtualDesktop.static.notification.cs b/source/VirtualDesktop/VirtualDesktop.static.notification.cs
index 6e069ab..ff1eec6 100644
--- a/source/VirtualDesktop/VirtualDesktop.static.notification.cs
+++ b/source/VirtualDesktop/VirtualDesktop.static.notification.cs
@@ -29,6 +29,11 @@ partial class VirtualDesktop
 		/// Occurs when the current virtual desktop is changed.
 		/// </summary>
 		public static event EventHandler<VirtualDesktopChangedEventArgs> CurrentChanged;
+
+		/// <summary>
+		/// Occurs when a virtual desktop is renamed.
+		/// </summary>
+		public static event EventHandler<VirtualDesktopRenamedEventArgs> Renamed;
 		
 		internal static class EventRaiser
 		{
@@ -65,6 +70,15 @@ public static void RaiseCurrentChanged(object sender, VirtualDesktop pDesktopOld
 				var args = new VirtualDesktopChangedEventArgs(pDesktopOld, pDesktopNew);
 				CurrentChanged?.Invoke(sender, args);
 			}
+
+			public static void RaiseRenamed(object sender, VirtualDesktop pDesktop, string name)
+			{
+				var oldName = pDesktop.Name;
+				pDesktop.SetNameToCache(name);
+
+				var args = new VirtualDesktopRenamedEventArgs(pDesktop, oldName, name);
+				Renamed?.Invoke(sender, args);
+			}
 		}
 	}
 }
diff --git a/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs b/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs
new file mode 100644
index 0000000..d8e6a37
--- /dev/null
+++ b/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace WindowsDesktop
+{
+	/// <summary>
+	/// Provides data for the <see cref="VirtualDesktop.Renamed" /> event.
+	/// </summary>
+	public class VirtualDesktopRenamedEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets the virtual desktop that was renamed.
+		/// </summary>
+		public VirtualDesktop Source { get; }
+
+		/// <summary>
+		/// Gets the old name of the virtual desktop.
+		/// </summary>
+		public string OldName { get; }
+
+		/// <summary>
+		/// Gets the new name of the virtual desktop.
+		/// </summary>
+		public string NewName { get; }
+
+		public VirtualDesktopRenamedEventArgs(VirtualDesktop source, string oldName, string newName)
+		{
+			this.Source = source;
+			this.OldName = oldName;
+			this.NewName = newName;
+		}
+	}
+}
diff --git a/source/VirtualDesktop/app.config b/source/VirtualDesktop/app.config
index 825ef2c..c854eee 100644
--- a/source/VirtualDesktop/app.config
+++ b/source/VirtualDesktop/app.config
@@ -21,6 +21,7 @@
             <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
             <string>IVirtualDesktopManagerInternal2,{0F3A72B0-4566-487E-9A33-4ED302F6D6CE} </string>
             <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
+            <string>IVirtualDesktopNotification2,{1BA7CF30-3591-43FA-ABFA-4AAF7ABEEDB7} </string>
             <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
             <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
           </ArrayOfString>

From d3eb4e3fe73415b5390b3ee242edc81bfacbc606 Mon Sep 17 00:00:00 2001
From: mntone <sd8@live.jp>
Date: Thu, 30 Jul 2020 23:02:34 +0900
Subject: [PATCH 3/3] Implement INotifyPropertyChanging/ed to VirtualDesktop.

---
 source/VirtualDesktop/VirtualDesktop.cs       |  4 +++
 .../VirtualDesktop.notification.cs            | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 source/VirtualDesktop/VirtualDesktop.notification.cs

diff --git a/source/VirtualDesktop/VirtualDesktop.cs b/source/VirtualDesktop/VirtualDesktop.cs
index 0a78296..b5fe1c9 100644
--- a/source/VirtualDesktop/VirtualDesktop.cs
+++ b/source/VirtualDesktop/VirtualDesktop.cs
@@ -110,7 +110,11 @@ public VirtualDesktop GetRight()
 
 		private void SetNameToCache(string name)
 		{
+			if (this._name == name) return;
+
+			this.RaisePropertyChanging(nameof(this.Name));
 			this._name = name;
+			this.RaisePropertyChanged(nameof(this.Name));
 		}
 		
 #region IDisposable
diff --git a/source/VirtualDesktop/VirtualDesktop.notification.cs b/source/VirtualDesktop/VirtualDesktop.notification.cs
new file mode 100644
index 0000000..24d5c4f
--- /dev/null
+++ b/source/VirtualDesktop/VirtualDesktop.notification.cs
@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+namespace WindowsDesktop
+{
+	partial class VirtualDesktop : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Occurs when a virtual desktop property changing.
+		/// </summary>
+		public event PropertyChangingEventHandler PropertyChanging;
+
+		private void RaisePropertyChanging([CallerMemberName] string propertyName = "")
+			=> PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+
+		/// <summary>
+		/// Occurs when a virtual desktop property changed.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		private void RaisePropertyChanged([CallerMemberName] string propertyName = "")
+			=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+	}
+}