Restore Quick access menu item in tray menu

Co-authored-by: davidegiacometti <25966642+davidegiacometti@users.noreply.github.com>

.github/actions/spell-check/expect.txt

@@ -639,6 +639,7 @@ Hiber
 Hiberboot
 HIBYTE
 hicon
+HICONSM
 HIDEREADONLY
 HIDEWINDOW
 Hif

src/modules/cmdpal/CoreCommonProps.props

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
   <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
   <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/LocalKeyboardListener.cs

@@ -14,7 +14,7 @@ namespace Microsoft.CmdPal.UI.Helpers;
 /// <summary>
 /// A class that listens for local keyboard events using a Windows hook.
 /// </summary>
-internal sealed class LocalKeyboardListener : IDisposable
+internal sealed partial class LocalKeyboardListener : IDisposable
 {
     /// <summary>
     /// Event that is raised when a key is pressed down.

src/modules/cmdpal/Microsoft.CmdPal.UI/LocalSuppressions.cs

@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.DestroyIconSafeHandle")]
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.DestroyMenuSafeHandle")]
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.FreeLibrarySafeHandle")]
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.UnhookWindowsHookExSafeHandle")]

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml

@@ -6,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.CmdPal.UI.Settings"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:text="using:Windows.UI.Text"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:winuiex="using:WinUIEx"
     Title="SettingsWindow"
@@ -73,14 +74,14 @@
                         ItemsSource="{x:Bind BreadCrumbs, Mode=OneWay}">
                         <BreadcrumbBar.ItemTemplate>
                             <DataTemplate x:DataType="local:Crumb">
-                                <TextBlock Text="{x:Bind Label, Mode=OneWay}" />
+                                <TextBlock Text="{x:Bind Label}" />
                             </DataTemplate>
                         </BreadcrumbBar.ItemTemplate>
                         <BreadcrumbBar.Resources>
                             <ResourceDictionary>
                                 <x:Double x:Key="BreadcrumbBarItemThemeFontSize">28</x:Double>
                                 <Thickness x:Key="BreadcrumbBarChevronPadding">7,4,8,0</Thickness>
-                                <FontWeight x:Key="BreadcrumbBarItemFontWeight">SemiBold</FontWeight>
+                                <text:FontWeight x:Key="BreadcrumbBarItemFontWeight">SemiBold</text:FontWeight>
                                 <x:Double x:Key="BreadcrumbBarChevronFontSize">16</x:Double>
                             </ResourceDictionary>
                         </BreadcrumbBar.Resources>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Settings.cs

@@ -17,6 +17,7 @@ public class Settings : ISettingsInterface
     private readonly bool hideKillProcessOnElevatedProcesses;
     private readonly bool hideExplorerSettingInfo;
     private readonly bool inMruOrder;
+    private readonly bool useWindowIcon;
 
     public Settings(
         bool resultsFromVisibleDesktopOnly = false,
@@ -27,7 +28,8 @@ public class Settings : ISettingsInterface
         bool openAfterKillAndClose = false,
         bool hideKillProcessOnElevatedProcesses = false,
         bool hideExplorerSettingInfo = true,
-        bool inMruOrder = true)
+        bool inMruOrder = true,
+        bool useWindowIcon = true)
     {
         this.resultsFromVisibleDesktopOnly = resultsFromVisibleDesktopOnly;
         this.subtitleShowPid = subtitleShowPid;
@@ -38,6 +40,7 @@ public class Settings : ISettingsInterface
         this.hideKillProcessOnElevatedProcesses = hideKillProcessOnElevatedProcesses;
         this.hideExplorerSettingInfo = hideExplorerSettingInfo;
         this.inMruOrder = inMruOrder;
+        this.useWindowIcon = useWindowIcon;
     }
 
     public bool ResultsFromVisibleDesktopOnly => resultsFromVisibleDesktopOnly;
@@ -57,4 +60,6 @@ public class Settings : ISettingsInterface
     public bool HideExplorerSettingInfo => hideExplorerSettingInfo;
 
     public bool InMruOrder => inMruOrder;
+
+    public bool UseWindowIcon => useWindowIcon;
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/LocalSuppressions.cs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.SysFreeStringSafeHandle")]

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -187,7 +187,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to Show a confirmation dialog when manually deleting an item.
         /// </summary>
         public static string settings_confirm_delete_description {
             get {
@@ -196,7 +196,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show a confirmation dialog when manually deleting an item.
+        ///   Looks up a localized string similar to Ask for confirmation before deleting items.
         /// </summary>
         public static string settings_confirm_delete_title {
             get {
@@ -205,7 +205,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to Keep items in clipboard history after pasting.
         /// </summary>
         public static string settings_keep_after_paste_description {
             get {
@@ -214,7 +214,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keep items in clipboard history after pasting.
+        ///   Looks up a localized string similar to Keep items after pasting.
         /// </summary>
         public static string settings_keep_after_paste_title {
             get {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx

@@ -151,16 +151,16 @@
     <value>Deleted from clipboard history</value>
   </data>
   <data name="settings_keep_after_paste_description" xml:space="preserve">
-    <value />
-  </data>
-  <data name="settings_keep_after_paste_title" xml:space="preserve">
     <value>Keep items in clipboard history after pasting</value>
   </data>
+  <data name="settings_keep_after_paste_title" xml:space="preserve">
+    <value>Keep items after pasting</value>
+  </data>
   <data name="settings_confirm_delete_title" xml:space="preserve">
-    <value>Show a confirmation dialog when manually deleting an item</value>
+    <value>Ask for confirmation before deleting items</value>
   </data>
   <data name="settings_confirm_delete_description" xml:space="preserve">
-    <value />
+    <value>Show a confirmation dialog when manually deleting an item</value>
   </data>
   <data name="delete_confirmation_title" xml:space="preserve">
     <value>Delete item?</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/LocalSuppressions.cs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.LocalFreeSafeHandle")]

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/NetworkConnectionProperties.cs

@@ -27,6 +27,14 @@ internal sealed class NetworkConnectionProperties
     /// <seealso cref="https://github.com/xoofx/markdig/blob/master/src/Markdig/Extensions/Emoji/EmojiMapping.cs"/>
     private const int GreenCircleCharacter = 128994;
 
+    /// <summary>
+    /// Decimal unicode value for green circle emoji.
+    /// We need to generate it in the code because it does not render using Markdown emoji syntax or Unicode character syntax.
+    /// </summary>
+    /// <seealso cref="https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/MarkdownTextBlock/samples/MarkdownTextBlock.md"/>
+    /// <seealso cref="https://github.com/xoofx/markdig/blob/master/src/Markdig/Extensions/Emoji/EmojiMapping.cs"/>
+    private const int RedCircleCharacter = 128308;
+
     /// <summary>
     /// Gets the name of the adapter
     /// </summary>
@@ -170,7 +178,7 @@ internal sealed class NetworkConnectionProperties
     internal string GetAdapterDetails()
     {
         return $"**{Resources.Microsoft_plugin_sys_AdapterName}:** {Adapter}" +
-            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : ":red_circle: " + Resources.Microsoft_plugin_sys_Disconnected) +
+            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : char.ConvertFromUtf32(RedCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Disconnected) +
             $"\n\n**{Resources.Microsoft_plugin_sys_PhysicalAddress}:** {PhysicalAddress}" +
             $"\n\n**{Resources.Microsoft_plugin_sys_Speed}:** {GetFormattedSpeedValue(Speed)}" +
             $"\n\n**{Resources.Microsoft_plugin_sys_Type}:** {GetAdapterTypeAsString(Type)}" +
@@ -184,7 +192,7 @@ internal sealed class NetworkConnectionProperties
     internal string GetConnectionDetails()
     {
         return $"**{Resources.Microsoft_plugin_sys_ConnectionName}:** {ConnectionName}" +
-            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : ":red_circle: " + Resources.Microsoft_plugin_sys_Disconnected) +
+            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : char.ConvertFromUtf32(RedCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Disconnected) +
             $"\n\n**{Resources.Microsoft_plugin_sys_Type}:** {GetAdapterTypeAsString(Type)}" +
             $"\n\n**{Resources.Microsoft_plugin_sys_Suffix}:** {Suffix}" +
             CreateIpInfoForDetailsText($"**{Resources.Microsoft_plugin_sys_Ip4Address}:** ", IPv4) +

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/SwitchToWindowCommand.cs

@@ -2,11 +2,16 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Diagnostics;
+using System.Drawing;
+using System.IO;
 using Microsoft.CmdPal.Ext.WindowWalker.Components;
+using Microsoft.CmdPal.Ext.WindowWalker.Helpers;
 using Microsoft.CmdPal.Ext.WindowWalker.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Storage.Streams;
 
 namespace Microsoft.CmdPal.Ext.WindowWalker.Commands;
 
@@ -16,20 +21,53 @@ internal sealed partial class SwitchToWindowCommand : InvokableCommand
 
     public SwitchToWindowCommand(Window? window)
     {
+        Icon = Icons.GenericAppIcon; // Fallback to default icon
         Name = Resources.switch_to_command_title;
         _window = window;
         if (_window is not null)
         {
-            var p = Process.GetProcessById((int)_window.Process.ProcessID);
-            if (p is not null)
+            // Use window icon
+            if (SettingsManager.Instance.UseWindowIcon)
             {
-                try
+                if (_window.TryGetWindowIcon(out var icon) && icon is not null)
                 {
-                    var processFileName = p.MainModule?.FileName;
-                    Icon = new IconInfo(processFileName);
+                    try
+                    {
+                        using var bitmap = icon.ToBitmap();
+                        using var memoryStream = new MemoryStream();
+                        bitmap.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png);
+                        var raStream = new InMemoryRandomAccessStream();
+                        using var outputStream = raStream.GetOutputStreamAt(0);
+                        using var dataWriter = new DataWriter(outputStream);
+                        dataWriter.WriteBytes(memoryStream.ToArray());
+                        dataWriter.StoreAsync().AsTask().Wait();
+                        dataWriter.FlushAsync().AsTask().Wait();
+                        Icon = IconInfo.FromStream(raStream);
+                    }
+                    catch
+                    {
+                    }
+                    finally
+                    {
+                        icon.Dispose();
+                    }
                 }
-                catch
+            }
+
+            // Use process icon
+            else
+            {
+                var p = Process.GetProcessById((int)_window.Process.ProcessID);
+                if (p is not null)
                 {
+                    try
+                    {
+                        var processFileName = p.MainModule?.FileName;
+                        Icon = new IconInfo(processFileName);
+                    }
+                    catch
+                    {
+                    }
                 }
             }
         }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs

@@ -188,6 +188,62 @@ internal sealed class Window
         thread.Start();
     }
 
+    /// <summary>
+    /// Tries to get the window icon.
+    /// </summary>
+    /// <param name="icon">The window icon if found; otherwise, null.</param>
+    /// <returns>True if an icon was found; otherwise, false.</returns>
+    internal bool TryGetWindowIcon(out System.Drawing.Icon? icon)
+    {
+        icon = null;
+
+        if (hwnd == IntPtr.Zero)
+        {
+            return false;
+        }
+
+        // Try WM_GETICON with SendMessageTimeout
+        if (NativeMethods.SendMessageTimeout(hwnd, Win32Constants.WM_GETICON, (UIntPtr)Win32Constants.ICON_BIG, IntPtr.Zero, Win32Constants.SMTO_ABORTIFHUNG, 100, out var result) != 0 && result != 0)
+        {
+            icon = System.Drawing.Icon.FromHandle((IntPtr)result);
+            NativeMethods.DestroyIcon((IntPtr)result);
+            return true;
+        }
+
+        if (NativeMethods.SendMessageTimeout(hwnd, Win32Constants.WM_GETICON, (UIntPtr)Win32Constants.ICON_SMALL, IntPtr.Zero, Win32Constants.SMTO_ABORTIFHUNG, 100, out result) != 0 && result != 0)
+        {
+            icon = System.Drawing.Icon.FromHandle((IntPtr)result);
+            NativeMethods.DestroyIcon((IntPtr)result);
+            return true;
+        }
+
+        if (NativeMethods.SendMessageTimeout(hwnd, Win32Constants.WM_GETICON, (UIntPtr)Win32Constants.ICON_SMALL2, IntPtr.Zero, Win32Constants.SMTO_ABORTIFHUNG, 100, out result) != 0 && result != 0)
+        {
+            icon = System.Drawing.Icon.FromHandle((IntPtr)result);
+            NativeMethods.DestroyIcon((IntPtr)result);
+            return true;
+        }
+
+        // Fallback to GetClassLongPtr
+        var iconHandle = NativeMethods.GetClassLongPtr(hwnd, Win32Constants.GCLP_HICON);
+        if (iconHandle != IntPtr.Zero)
+        {
+            icon = System.Drawing.Icon.FromHandle(iconHandle);
+            NativeMethods.DestroyIcon((IntPtr)iconHandle);
+            return true;
+        }
+
+        iconHandle = NativeMethods.GetClassLongPtr(hwnd, Win32Constants.GCLP_HICONSM);
+        if (iconHandle != IntPtr.Zero)
+        {
+            icon = System.Drawing.Icon.FromHandle(iconHandle);
+            NativeMethods.DestroyIcon((IntPtr)iconHandle);
+            return true;
+        }
+
+        return false;
+    }
+
     /// <summary>
     /// Converts the window name to string along with the process name
     /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ISettingsInterface.cs

@@ -23,4 +23,6 @@ public interface ISettingsInterface
     public bool HideExplorerSettingInfo { get; }
 
     public bool InMruOrder { get; }
+
+    public bool UseWindowIcon { get; }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/NativeMethods.cs

@@ -84,6 +84,12 @@ public static partial class NativeMethods
     [DllImport("user32.dll")]
     public static extern int SendMessageTimeout(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam, int fuFlags, int uTimeout, out int lpdwResult);
 
+    [DllImport("user32.dll", EntryPoint = "GetClassLongPtr")]
+    public static extern IntPtr GetClassLongPtr(IntPtr hWnd, int nIndex);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    internal static extern bool DestroyIcon(IntPtr hIcon);
+
     [DllImport("kernel32.dll")]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool CloseHandle(IntPtr hObject);
@@ -143,6 +149,41 @@ public static class Win32Constants
     /// </summary>
     public const int SC_CLOSE = 0xF060;
 
+    /// <summary>
+    /// Sent to a window to retrieve a handle to the large or small icon associated with a window.
+    /// </summary>
+    public const uint WM_GETICON = 0x007F;
+
+    /// <summary>
+    /// Retrieve the large icon for the window.
+    /// </summary>
+    public const int ICON_BIG = 1;
+
+    /// <summary>
+    /// Retrieve the small icon for the window.
+    /// </summary>
+    public const int ICON_SMALL = 0;
+
+    /// <summary>
+    /// Retrieve the small icon provided by the application.
+    /// </summary>
+    public const int ICON_SMALL2 = 2;
+
+    /// <summary>
+    /// The function returns if the receiving thread does not respond within the timeout period.
+    /// </summary>
+    public const int SMTO_ABORTIFHUNG = 0x0002;
+
+    /// <summary>
+    /// Retrieves a handle to the icon associated with the class.
+    /// </summary>
+    public const int GCLP_HICON = -14;
+
+    /// <summary>
+    /// Retrieves a handle to the small icon associated with the class.
+    /// </summary>
+    public const int GCLP_HICONSM = -34;
+
     /// <summary>
     /// RPC call succeeded
     /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/SettingsManager.cs

@@ -70,6 +70,12 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         Resources.windowwalker_SettingInMruOrder_Description,
         true);
 
+    private readonly ToggleSetting _useWindowIcon = new(
+        Namespaced(nameof(UseWindowIcon)),
+        Resources.windowwalker_SettingUseWindowIcon,
+        Resources.windowwalker_SettingUseWindowIcon_Description,
+        true);
+
     public bool ResultsFromVisibleDesktopOnly => _resultsFromVisibleDesktopOnly.Value;
 
     public bool SubtitleShowPid => _subtitleShowPid.Value;
@@ -88,6 +94,8 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
 
     public bool InMruOrder => _inMruOrder.Value;
 
+    public bool UseWindowIcon => _useWindowIcon.Value;
+
     internal static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
@@ -110,6 +118,7 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         Settings.Add(_hideKillProcessOnElevatedProcesses);
         Settings.Add(_hideExplorerSettingInfo);
         Settings.Add(_inMruOrder);
+        Settings.Add(_useWindowIcon);
 
         // Load settings from file upon initialization
         LoadSettings();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Icons.cs

@@ -15,4 +15,6 @@ internal sealed class Icons
     internal static IconInfo CloseWindow { get; } = new IconInfo("\uE894"); // Clear
 
     internal static IconInfo Info { get; } = new IconInfo("\uE946"); // Info
+
+    internal static IconInfo GenericAppIcon { get; } = new("\uE737"); // Favicon
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.Designer.cs

@@ -401,5 +401,23 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
                 return ResourceManager.GetString("windowwalker_SettingTagPid", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Use window icons.
+        /// </summary>
+        public static string windowwalker_SettingUseWindowIcon {
+            get {
+                return ResourceManager.GetString("windowwalker_SettingUseWindowIcon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show the actual window icon instead of the process icon.
+        /// </summary>
+        public static string windowwalker_SettingUseWindowIcon_Description {
+            get {
+                return ResourceManager.GetString("windowwalker_SettingUseWindowIcon_Description", resourceCulture);
+            }
+        }
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.resx

@@ -235,4 +235,10 @@
   <data name="windowwalker_NoResultsMessage" xml:space="preserve">
     <value>No open windows found</value>
   </data>
+  <data name="windowwalker_SettingUseWindowIcon" xml:space="preserve">
+    <value>Use window icons</value>
+  </data>
+  <data name="windowwalker_SettingUseWindowIcon_Description" xml:space="preserve">
+    <value>Show the actual window icon instead of the process icon</value>
+  </data>
 </root>

tools/BugReportTool/BugReportTool/XmlDocumentEx.cpp

@@ -19,13 +19,13 @@ void XmlDocumentEx::Print(winrt::Windows::Data::Xml::Dom::IXmlNode node, int ind
     PrintTagWithAttributes(node);
     if (!node.HasChildNodes())
     {
-        stream << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+        stream << L"</" << node.NodeName().c_str() << ">" << std::endl;
         return;
     }
 
     if (node.ChildNodes().Size() == 1 && !node.FirstChild().HasChildNodes())
     {
-        stream << node.InnerText().c_str() << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+        stream << node.InnerText().c_str() << L"</" << node.NodeName().c_str() << ">" << std::endl;
         return;
     }
 
@@ -40,7 +40,7 @@ void XmlDocumentEx::Print(winrt::Windows::Data::Xml::Dom::IXmlNode node, int ind
     {
         stream << " ";
     }
-    stream << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+    stream << L"</" << node.NodeName().c_str() << ">" << std::endl;
 }
 
 void XmlDocumentEx::PrintTagWithAttributes(winrt::Windows::Data::Xml::Dom::IXmlNode node)