[PTRun][WindowWalker] Fixes and small improvements (#16959)

* fixes and changes

* fix spelling

* add os version check

* Improve speed of virtual desktop helper

* speed improvement two

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs

@@ -5,7 +5,6 @@
 // Code forked from Betsegaw Tadele's https://github.com/betsegaw/windowwalker/
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using Wox.Plugin.Common.Win32;
 
@@ -89,7 +88,7 @@ namespace Microsoft.Plugin.WindowWalker.Components
 
             if (newWindow.IsWindow && newWindow.Visible && newWindow.IsOwner &&
                 (!newWindow.IsToolWindow || newWindow.IsAppWindow) && !newWindow.TaskListDeleted &&
-                (newWindow.Desktop.IsVisible || !WindowWalkerSettings.Instance.ResultsFromVisibleDesktopOnly) &&
+                (newWindow.Desktop.IsVisible || !WindowWalkerSettings.Instance.ResultsFromVisibleDesktopOnly || Main.VirtualDesktopHelperInstance.GetDesktopCount() < 2) &&
                 newWindow.ClassName != "Windows.UI.Core.CoreWindow" && newWindow.Process.Name != _powerLauncherExe)
             {
                 // To hide (not add) preloaded uwp app windows that are invisible to the user and other cloaked windows, we check the cloak state. (Issue #13637.)

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/ResultHelper.cs

@@ -126,7 +126,8 @@ namespace Microsoft.Plugin.WindowWalker.Components
                     $"Is ShellProcess: {window.Process.IsShellProcess}\n" +
                     $"Is window cloaked: {window.IsCloaked}\n" +
                     $"Window cloak state: {window.GetWindowCloakState()}\n" +
-                    $"Desktop name: {window.Desktop.Name}" +
+                    $"Desktop id: {window.Desktop.Id}\n" +
+                    $"Desktop name: {window.Desktop.Name}\n" +
                     $"Desktop number: {window.Desktop.Number}\n" +
                     $"Desktop is visible: {window.Desktop.IsVisible}\n" +
                     $"Desktop position: {window.Desktop.Position}\n" +

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs

@@ -307,7 +307,7 @@ namespace Microsoft.Plugin.WindowWalker.Components
                 case (int)DwmWindowCloakStates.CloakedApp:
                     return WindowCloakState.App;
                 case (int)DwmWindowCloakStates.CloakedShell:
-                    return Main.VirtualDesktopHelperInstance.IsWindowCloakedByVirtualDesktopManager(hwnd) ? WindowCloakState.OtherDesktop : WindowCloakState.Shell;
+                    return Main.VirtualDesktopHelperInstance.IsWindowCloakedByVirtualDesktopManager(hwnd, Desktop.Id) ? WindowCloakState.OtherDesktop : WindowCloakState.Shell;
                 case (int)DwmWindowCloakStates.CloakedInherited:
                     return WindowCloakState.Inherited;
                 default:

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Windows.Controls;
 using ManagedCommon;
 using Microsoft.Plugin.WindowWalker.Components;
@@ -24,8 +23,6 @@ namespace Microsoft.Plugin.WindowWalker
 
         public string Name => Properties.Resources.wox_plugin_windowwalker_plugin_name;
 
-        private readonly string _assemblyName = Assembly.GetExecutingAssembly().GetName().Name;
-
         public string Description => Properties.Resources.wox_plugin_windowwalker_plugin_description;
 
         internal static readonly VirtualDesktopHelper VirtualDesktopHelperInstance = new VirtualDesktopHelper();

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Properties/Resources.Designer.cs

@@ -250,7 +250,7 @@ namespace Microsoft.Plugin.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show desktop name in subtitle (If two or more desktops exist).
+        ///   Looks up a localized string similar to Show desktop name in the subtitle (If two or more desktops exist).
         /// </summary>
         public static string wox_plugin_windowwalker_SettingSubtitleDesktopName {
             get {
@@ -259,7 +259,7 @@ namespace Microsoft.Plugin.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show process id in subtitle.
+        ///   Looks up a localized string similar to Show process id in the subtitle.
         /// </summary>
         public static string wox_plugin_windowwalker_SettingSubtitlePid {
             get {

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Properties/Resources.resx

@@ -140,10 +140,10 @@
     <value>Show only results from visible desktop</value>
   </data>
   <data name="wox_plugin_windowwalker_SettingSubtitleDesktopName" xml:space="preserve">
-    <value>Show desktop name in subtitle (If two or more desktops exist)</value>
+    <value>Show desktop name in the subtitle (If two or more desktops exist)</value>
   </data>
   <data name="wox_plugin_windowwalker_SettingSubtitlePid" xml:space="preserve">
-    <value>Show process id in subtitle</value>
+    <value>Show process id in the subtitle</value>
   </data>
   <data name="wox_plugin_windowwalker_SettingOpenAfterKillAndClose" xml:space="preserve">
     <value>Stay open after closing windows and killing processes (Not working with kill process confirmation)</value>

src/modules/launcher/Wox.Plugin/Common/VirtualDesktop/VDesktop.cs

@@ -73,7 +73,7 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
                     Id = Guid.Empty,
                     Name = string.Empty,
                     Number = 0,
-                    IsVisible = false,
+                    IsVisible = true, // Setting this always to true to simulate a visible desktop
                     IsAllDesktopsView = false,
                     Position = VirtualDesktopPosition.NotApplicable,
                 };

src/modules/launcher/Wox.Plugin/Common/VirtualDesktop/VirtualDesktopHelper.cs

@@ -26,6 +26,11 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
     /// <SeeAlso href="https://docs.microsoft.com/en-us/archive/blogs/winsdk/virtual-desktop-switching-in-windows-10">CSharp example code for IVirtualDesktopManager</SeeAlso>
     public class VirtualDesktopHelper
     {
+        /// <summary>
+        /// Are we running on Windows 11
+        /// </summary>
+        private static readonly bool _IsWindowsEleven = IsWindowsElevenOrLater();
+
         /// <summary>
         /// Instance of "Virtual Desktop Manager"
         /// </summary>
@@ -60,7 +65,7 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
             }
             catch (COMException ex)
             {
-                Log.Exception("Failed to create an instance of COM interface <IVirtualDesktopManager>.", ex, typeof(VirtualDesktopHelper));
+                Log.Exception("Initialization of <VirtualDesktopHelper> failed: An exception was thrown when creating the instance of COM interface <IVirtualDesktopManager>.", ex, typeof(VirtualDesktopHelper));
                 return;
             }
 
@@ -80,18 +85,23 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Method to update the list of Virtual Desktops from Registry
         /// The data in the registry are always up to date
         /// </summary>
+        /// <remarks>If we can not read from registry, we set the list/guid to empty values.</remarks>
         public void UpdateDesktopList()
         {
-            // List of all desktops
-            RegistryKey allDeskSubKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VirtualDesktops", false);
-            byte[] allDeskValue = (byte[])allDeskSubKey.GetValue("VirtualDesktopIDs");
-            availableDesktops.Clear();
+            // Registry paths
+            int userSessionId = Process.GetCurrentProcess().SessionId;
+            string registrySessionVirtualDesktops = $"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SessionInfo\\{userSessionId}\\VirtualDesktops";
+            string registryExplorerVirtualDesktops = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VirtualDesktops";
 
+            // List of all desktops
+            byte[] allDeskValue = (byte[])Registry.CurrentUser.OpenSubKey(registryExplorerVirtualDesktops, false).GetValue("VirtualDesktopIDs", null);
             if (allDeskValue != null)
             {
+                // We clear only, if we can read from registry. Otherwise we keep the existing values.
+                availableDesktops.Clear();
+
                 // Each guid has a length of 16 elements
                 int numberOfDesktops = allDeskValue.Length / 16;
-
                 for (int i = 0; i < numberOfDesktops; i++)
                 {
                     byte[] guidArray = new byte[16];
@@ -101,13 +111,13 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
             }
             else
             {
-                Log.Error("Failed to read the list of existing desktops form registry.", typeof(VirtualDesktopHelper));
+                Log.Debug("VirtualDesktopHelper.UpdateDesktopList() failed to read the list of existing desktops form registry.", typeof(VirtualDesktopHelper));
             }
 
             // Guid for current desktop
-            int userSessionId = Process.GetCurrentProcess().SessionId;
-            RegistryKey currentDeskSubKey = Registry.CurrentUser.OpenSubKey($"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SessionInfo\\{userSessionId}\\VirtualDesktops", false);
-            var currentDeskValue = currentDeskSubKey.GetValue("CurrentVirtualDesktop");
+            var currentDeskSessionValue = Registry.CurrentUser.OpenSubKey(registrySessionVirtualDesktops, false).GetValue("CurrentVirtualDesktop", null); // Windows 10
+            var currentDeskExplorerValue = Registry.CurrentUser.OpenSubKey(registryExplorerVirtualDesktops, false).GetValue("CurrentVirtualDesktop", null); // Windows 11
+            var currentDeskValue = _IsWindowsEleven ? currentDeskExplorerValue : currentDeskSessionValue;
             if (currentDeskValue != null)
             {
                 currentDesktop = new Guid((byte[])currentDeskValue);
@@ -115,8 +125,9 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
             else
             {
                 // The registry value is missing when the user hasn't switched the desktop at least one time before reading the registry. In this case we can set it to desktop one.
-                Log.Debug("Failed to read the id for the current desktop form registry.", typeof(VirtualDesktopHelper));
-                currentDesktop = availableDesktops[0];
+                // We can only set it to desktop one, if we have at least one desktop in the desktops list. Otherwise we keep the existing value.
+                Log.Debug("VirtualDesktopHelper.UpdateDesktopList() failed to read the id for the current desktop form registry.", typeof(VirtualDesktopHelper));
+                currentDesktop = availableDesktops.Count >= 1 ? availableDesktops[0] : currentDesktop;
             }
         }
 
@@ -171,7 +182,7 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// <summary>
         /// Returns the id of the desktop that is currently visible to the user.
         /// </summary>
-        /// <returns>Guid of the current desktop or an empty guid on failure.</returns>
+        /// <returns>The <see cref="Guid"/> of the current desktop. Or <see cref="Guid.Empty"/> on failure and if we don't know the current desktop.</returns>
         public Guid GetCurrentDesktopId()
         {
             if (_desktopListAutoUpdate)
@@ -200,7 +211,7 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Checks if a desktop is currently visible to the user.
         /// </summary>
         /// <param name="desktop">The guid of the desktop to check.</param>
-        /// <returns>A value indicating if the guid belongs to the currently visible desktop.</returns>
+        /// <returns><see langword="True"/> if the guid belongs to the currently visible desktop. <see langword="False"/> if not or if we don't know the visible desktop.</returns>
         public bool IsDesktopVisible(Guid desktop)
         {
             if (_desktopListAutoUpdate)
@@ -231,12 +242,12 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Returns the name of a desktop
         /// </summary>
         /// <param name="desktop">Guid of the desktop</param>
-        /// <returns>Returns the name of the desktop or an empty string on failure.</returns>
+        /// <returns>Returns the name of the desktop or <see cref="string.Empty"/> on failure.</returns>
         public string GetDesktopName(Guid desktop)
         {
             if (desktop == Guid.Empty || !GetDesktopIdList().Contains(desktop))
             {
-                Log.Debug($"GetDesktopName() failed. Parameter contains an invalid desktop guid ({desktop}) that doesn't belongs to an available desktop. Maybe the guid belongs to the generic 'AllDesktops' view.", typeof(VirtualDesktopHelper));
+                Log.Debug($"VirtualDesktopHelper.GetDesktopName() failed. Parameter contains an invalid desktop guid ({desktop}) that doesn't belongs to an available desktop. Maybe the guid belongs to the generic 'AllDesktops' view.", typeof(VirtualDesktopHelper));
                 return string.Empty;
             }
 
@@ -254,13 +265,18 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Returns the position type for a desktop.
         /// </summary>
         /// <param name="desktop">Guid of the desktop.</param>
-        /// <returns>Type of desktop position.</returns>
+        /// <returns>Type of <see cref="VirtualDesktopPosition"/>. On failure we return <see cref="VirtualDesktopPosition.Unknown"/>.</returns>
         public VirtualDesktopPosition GetDesktopPositionType(Guid desktop)
         {
             int desktopNumber = GetDesktopNumber(desktop);
             int desktopCount = GetDesktopCount();
 
-            if (desktopNumber == 1)
+            if (desktopCount == 0 || desktop == Guid.Empty)
+            {
+                // On failure or empty guid
+                return VirtualDesktopPosition.NotApplicable;
+            }
+            else if (desktopNumber == 1)
             {
                 return VirtualDesktopPosition.FirstDesktop;
             }
@@ -274,6 +290,7 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
             }
             else
             {
+                // All desktops view or a guid that doesn't belong to an existing desktop
                 return VirtualDesktopPosition.NotApplicable;
             }
         }
@@ -283,12 +300,12 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// </summary>
         /// <param name="hWindow">Handle of the window.</param>
         /// <param name="desktopId">The guid of the desktop, where the window is shown.</param>
-        /// <returns>HResult of the called method.</returns>
+        /// <returns>HResult of the called method as integer.</returns>
         public int GetWindowDesktopId(IntPtr hWindow, out Guid desktopId)
         {
             if (_virtualDesktopManager == null)
             {
-                Log.Error("GetWindowDesktopId() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
+                Log.Error("VirtualDesktopHelper.GetWindowDesktopId() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
                 desktopId = Guid.Empty;
                 return unchecked((int)HRESULT.E_UNEXPECTED);
             }
@@ -305,7 +322,7 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         {
             if (_virtualDesktopManager == null)
             {
-                Log.Error("GetWindowDesktopId() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
+                Log.Error("VirtualDesktopHelper.GetWindowDesktop() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
                 return CreateVDesktopInstance(Guid.Empty);
             }
 
@@ -317,17 +334,19 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Returns the desktop assignment type for a window.
         /// </summary>
         /// <param name="hWindow">Handle of the window.</param>
-        /// <returns>Type of <see cref="DesktopAssignment"/>.</returns>
-        public VirtualDesktopAssignmentType GetWindowDesktopAssignmentType(IntPtr hWindow)
+        /// <param name="desktop">Optional the desktop id if known</param>
+        /// <returns>Type of <see cref="VirtualDesktopAssignmentType"/>.</returns>
+        public VirtualDesktopAssignmentType GetWindowDesktopAssignmentType(IntPtr hWindow, Guid? desktop = null)
         {
             if (_virtualDesktopManager == null)
             {
-                Log.Error("GetWindowDesktopAssignmentType() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
+                Log.Error("VirtualDesktopHelper.GetWindowDesktopAssignmentType() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
                 return VirtualDesktopAssignmentType.Unknown;
             }
 
             _ = _virtualDesktopManager.IsWindowOnCurrentVirtualDesktop(hWindow, out int isOnCurrentDesktop);
-            int hResult = GetWindowDesktopId(hWindow, out Guid windowDesktopId);
+            Guid windowDesktopId = desktop ?? Guid.Empty; // Prepare variable in case we have no input parameter for desktop
+            int hResult = desktop is null ? GetWindowDesktopId(hWindow, out windowDesktopId) : 0;
 
             if (hResult != (int)HRESULT.S_OK)
             {
@@ -357,10 +376,11 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Returns a value indicating if the window is assigned to a currently visible desktop.
         /// </summary>
         /// <param name="hWindow">Handle to the top level window.</param>
-        /// <returns>True if the desktop with the window is visible or if the window is assigned to all desktops. False if the desktop is not visible and on failure,</returns>
-        public bool IsWindowOnVisibleDesktop(IntPtr hWindow)
+        /// <param name="desktop">Optional the desktop id if known</param>
+        /// <returns><see langword="True"/> if the desktop with the window is visible or if the window is assigned to all desktops. <see langword="False"/> if the desktop is not visible and on failure,</returns>
+        public bool IsWindowOnVisibleDesktop(IntPtr hWindow, Guid? desktop = null)
         {
-            return GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.CurrentDesktop || GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.AllDesktops;
+            return GetWindowDesktopAssignmentType(hWindow, desktop) == VirtualDesktopAssignmentType.CurrentDesktop || GetWindowDesktopAssignmentType(hWindow, desktop) == VirtualDesktopAssignmentType.AllDesktops;
         }
 
         /// <summary>
@@ -368,12 +388,13 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// (A cloaked window is not visible to the user. But the window is still composed by DWM.)
         /// </summary>
         /// <param name="hWindow">Handle of the window.</param>
+        /// <param name="desktop">Optional the desktop id if known</param>
         /// <returns>A value indicating if the window is cloaked by Virtual Desktop Manager, because it is moved to an other desktop.</returns>
-        public bool IsWindowCloakedByVirtualDesktopManager(IntPtr hWindow)
+        public bool IsWindowCloakedByVirtualDesktopManager(IntPtr hWindow, Guid? desktop = null)
         {
             // If a window is hidden because it is moved to an other desktop, then DWM returns type "CloakedShell". If DWM returns an other type the window is not cloaked by shell or VirtualDesktopManager.
             _ = NativeMethods.DwmGetWindowAttribute(hWindow, (int)DwmWindowAttributes.Cloaked, out int dwmCloakedState, sizeof(uint));
-            return GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.OtherDesktop && dwmCloakedState == (int)DwmWindowCloakStates.CloakedShell;
+            return GetWindowDesktopAssignmentType(hWindow, desktop) == VirtualDesktopAssignmentType.OtherDesktop && dwmCloakedState == (int)DwmWindowCloakStates.CloakedShell;
         }
 
         /// <summary>
@@ -381,19 +402,19 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// </summary>
         /// <param name="hWindow">Handle of the top level window.</param>
         /// <param name="desktopId">Guid of the target desktop.</param>
-        /// <returns>True on success and false on failure.</returns>
+        /// <returns><see langword="True"/> on success and <see langword="false"/> on failure.</returns>
         public bool MoveWindowToDesktop(IntPtr hWindow, in Guid desktopId)
         {
             if (_virtualDesktopManager == null)
             {
-                Log.Error("MoveWindowToDesktop() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
+                Log.Error("VirtualDesktopHelper.MoveWindowToDesktop() failed: The instance of <IVirtualDesktopHelper> isn't available.", typeof(VirtualDesktopHelper));
                 return false;
             }
 
             int hr = _virtualDesktopManager.MoveWindowToDesktop(hWindow, desktopId);
             if (hr != (int)HRESULT.S_OK)
             {
-                Log.Exception($"Failed to move the window ({hWindow}) to an other desktop ({desktopId}).", Marshal.GetExceptionForHR(hr), typeof(VirtualDesktopHelper));
+                Log.Exception($"VirtualDesktopHelper.MoveWindowToDesktop() failed: An exception was thrown when moving the window ({hWindow}) to an other desktop ({desktopId}).", Marshal.GetExceptionForHR(hr), typeof(VirtualDesktopHelper));
                 return false;
             }
 
@@ -404,25 +425,26 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Move a window one desktop left.
         /// </summary>
         /// <param name="hWindow">Handle of the top level window.</param>
-        /// <returns>True on success and false on failure.</returns>
+        /// <returns><see langword="True"/> on success and <see langword="false"/> on failure.</returns>
         public bool MoveWindowOneDesktopLeft(IntPtr hWindow)
         {
-            if (GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.Unknown || GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.NotAssigned)
-            {
-                return false;
-            }
-
             int hr = GetWindowDesktopId(hWindow, out Guid windowDesktop);
             if (hr != (int)HRESULT.S_OK)
             {
-                Log.Error($"Failed to move the window ({hWindow}) one desktop left: Can't get current desktop of the window.", typeof(VirtualDesktopHelper));
+                Log.Error($"VirtualDesktopHelper.MoveWindowOneDesktopLeft() failed when moving the window ({hWindow}) one desktop left: Can't get current desktop of the window.", typeof(VirtualDesktopHelper));
+                return false;
+            }
+
+            if (GetDesktopIdList().Count == 0 || GetWindowDesktopAssignmentType(hWindow, windowDesktop) == VirtualDesktopAssignmentType.Unknown || GetWindowDesktopAssignmentType(hWindow, windowDesktop) == VirtualDesktopAssignmentType.NotAssigned)
+            {
+                Log.Error($"VirtualDesktopHelper.MoveWindowOneDesktopLeft() failed when moving the window ({hWindow}) one desktop left: We can't find the target desktop. This can happen if the desktop list is empty or if the window isn't assigned to a specific desktop.", typeof(VirtualDesktopHelper));
                 return false;
             }
 
             int windowDesktopNumber = GetDesktopIdList().IndexOf(windowDesktop);
             if (windowDesktopNumber == 1)
             {
-                Log.Error($"Failed to move the window ({hWindow}) one desktop left: The window is on the first desktop.", typeof(VirtualDesktopHelper));
+                Log.Error($"VirtualDesktopHelper.MoveWindowOneDesktopLeft() failed when moving the window ({hWindow}) one desktop left: The window is on the first desktop.", typeof(VirtualDesktopHelper));
                 return false;
             }
 
@@ -434,25 +456,26 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         /// Move a window one desktop right.
         /// </summary>
         /// <param name="hWindow">Handle of the top level window.</param>
-        /// <returns>True on success and false on failure.</returns>
+        /// <returns><see langword="True"/> on success and <see langword="false"/> on failure.</returns>
         public bool MoveWindowOneDesktopRight(IntPtr hWindow)
         {
-            if (GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.Unknown || GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.NotAssigned)
-            {
-                return false;
-            }
-
             int hr = GetWindowDesktopId(hWindow, out Guid windowDesktop);
             if (hr != (int)HRESULT.S_OK)
             {
-                Log.Error($"Failed to move the window ({hWindow}) one desktop right: Can't get current desktop of the window.", typeof(VirtualDesktopHelper));
+                Log.Error($"VirtualDesktopHelper.MoveWindowOneDesktopRight() failed when moving the window ({hWindow}) one desktop right: Can't get current desktop of the window.", typeof(VirtualDesktopHelper));
+                return false;
+            }
+
+            if (GetDesktopIdList().Count == 0 || GetWindowDesktopAssignmentType(hWindow, windowDesktop) == VirtualDesktopAssignmentType.Unknown || GetWindowDesktopAssignmentType(hWindow, windowDesktop) == VirtualDesktopAssignmentType.NotAssigned)
+            {
+                Log.Error($"VirtualDesktopHelper.MoveWindowOneDesktopRight() failed when moving the window ({hWindow}) one desktop right: We can't find the target desktop. This can happen if the desktop list is empty or if the window isn't assigned to a specific desktop.", typeof(VirtualDesktopHelper));
                 return false;
             }
 
             int windowDesktopNumber = GetDesktopIdList().IndexOf(windowDesktop);
             if (windowDesktopNumber == GetDesktopCount())
             {
-                Log.Error($"Failed to move the window ({hWindow}) one desktop right: The window is on the last desktop.", typeof(VirtualDesktopHelper));
+                Log.Error($"VirtualDesktopHelper.MoveWindowOneDesktopRight() failed when moving the window ({hWindow}) one desktop right: The window is on the last desktop.", typeof(VirtualDesktopHelper));
                 return false;
             }
 
@@ -461,26 +484,49 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         }
 
         /// <summary>
-        /// Returns an instance of VDesktop for a Guid.
+        /// Returns an instance of <see cref="VDesktop"/> for a Guid.
         /// </summary>
         /// <param name="desktop">Guid of the desktop.</param>
         /// <param name="hWindow">Handle of the window shown on the desktop. If this parameter is set we can detect if it is the AllDesktops view.</param>
-        /// <returns>VDesktop instance.</returns>
+        /// <returns>A <see cref="VDesktop"/> instance. If the parameter desktop is <see cref="Guid.Empty"/>, we return an empty <see cref="VDesktop"/> instance.</returns>
         private VDesktop CreateVDesktopInstance(Guid desktop, IntPtr hWindow = default)
         {
+            if (desktop == Guid.Empty)
+            {
+                return VDesktop.Empty;
+            }
+
             // Can be only detected if method is invoked with window handle parameter.
-            bool isAllDesktops = (hWindow != default) && GetWindowDesktopAssignmentType(hWindow) == VirtualDesktopAssignmentType.AllDesktops;
+            VirtualDesktopAssignmentType desktopType = (hWindow != default) ? GetWindowDesktopAssignmentType(hWindow, desktop) : VirtualDesktopAssignmentType.Unknown;
+            bool isAllDesktops = (hWindow != default) && desktopType == VirtualDesktopAssignmentType.AllDesktops;
+            bool isDesktopVisible = (hWindow != default) ? (isAllDesktops || desktopType == VirtualDesktopAssignmentType.CurrentDesktop) : IsDesktopVisible(desktop);
 
             return new VDesktop()
             {
                 Id = desktop,
                 Name = isAllDesktops ? Resources.VirtualDesktopHelper_AllDesktops : GetDesktopName(desktop),
                 Number = GetDesktopNumber(desktop),
-                IsVisible = IsDesktopVisible(desktop) || isAllDesktops,
+                IsVisible = isDesktopVisible || isAllDesktops,
                 IsAllDesktopsView = isAllDesktops,
                 Position = GetDesktopPositionType(desktop),
             };
         }
+
+        /// <summary>
+        /// Check if we running on Windows 11 or later.
+        /// </summary>
+        /// <returns><see langword="True"/> if yes and <see langword="false"/> if no.</returns>
+        private static bool IsWindowsElevenOrLater()
+        {
+            var currentBuildString = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", false).GetValue("CurrentBuild", uint.MinValue);
+            uint currentBuild = uint.TryParse(currentBuildString as string, out var build) ? build : uint.MinValue;
+
+            var currentBuildNumberString = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", false).GetValue("CurrentBuildNumber", uint.MinValue);
+            uint currentBuildNumber = uint.TryParse(currentBuildNumberString as string, out var buildNumber) ? buildNumber : uint.MinValue;
+
+            uint currentWindowsBuild = currentBuild != uint.MinValue ? currentBuild : currentBuildNumber;
+            return currentWindowsBuild >= 22000;
+        }
     }
 
     /// <summary>
@@ -503,6 +549,6 @@ namespace Wox.Plugin.Common.VirtualDesktop.Helper
         FirstDesktop,
         BetweenOtherDesktops,
         LastDesktop,
-        NotApplicable,
+        NotApplicable, // If not applicable or unknown
     }
 }