AAA

fix UI freeze

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

@@ -1,7 +1,6 @@
 # FALSE POSITIVES
 ## "PackagemanagerWrapper.cs" should be "PackageManagerWrapper.cs"
 ## NOTICE.MD > MOZILLA PUBLIC LICENSE v1.1
-
 aaaa
 abcdefghjkmnpqrstuvxyz
 abgr
@@ -43,7 +42,6 @@ AMPROPSETID
 amr
 ANDSCANS
 animatedvisuals
-anr
 ansicolor
 ANull
 AOC
@@ -1214,6 +1212,7 @@ prgms
 pri
 PRINTCLIENT
 printmanagement
+privacystatement
 prm
 proactively
 PROCESSENTRY

.pipelines/v2/templates/job-build-project.yml

@@ -212,6 +212,29 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
+  - task: VSBuild@1
+    ${{ if eq(parameters.runTests, true) }}:
+      displayName: Force rebuild PowerRename
+    ${{ else }}:
+      displayName: Force rebuild PowerRename
+    inputs:
+      solution: 'src\modules\powerrename\PowerRenameUILib\PowerRenameUI.vcxproj'
+      clean: true
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-0-main-powerrename.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+        /t:Rebuild
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
   - ${{ if eq(parameters.codeSign, true) }}:
     - template: steps-esrp-signing.yml
       parameters:

src/common/ManagedTelemetry/Telemetry/EtwTrace.cs

@@ -26,7 +26,7 @@ namespace Microsoft.PowerToys.Telemetry
 
         private readonly bool telemetryEnabled = DataDiagnosticsSettings.GetEnabledValue(); // This is the global telemetry setting on whether to log events
         private readonly bool telemetryRecordingEnabled = DataDiagnosticsSettings.GetViewEnabledValue(); // This is the setting for recording telemetry events to disk for viewing
-        private readonly string etwFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\PowerToys\", "etw");
+        private string etwFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\PowerToys\", "etw");
         private bool disposedValue;
         private string sessionName;
         private string etwFilePath;
@@ -49,6 +49,18 @@ namespace Microsoft.PowerToys.Telemetry
         /// Initializes a new instance of the <see cref="ETWTrace"/> class.
         /// </summary>
         public ETWTrace()
+        {
+            Init();
+        }
+
+        public ETWTrace(string etwPath)
+        {
+            this.etwFolderPath = etwPath;
+
+            Init();
+        }
+
+        private void Init()
         {
             if (File.Exists(etwFolderPath))
             {

src/modules/Hosts/Hosts/Helpers/NativeEventWaiter.cs

@@ -14,7 +14,7 @@ namespace Hosts.Helpers
         public static void WaitForEventLoop(string eventName, Action callback)
         {
             var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            new Thread(() =>
+            var t = new Thread(() =>
             {
                 var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
                 while (true)
@@ -24,7 +24,10 @@ namespace Hosts.Helpers
                         dispatcherQueue.TryEnqueue(() => callback());
                     }
                 }
-            }).Start();
+            });
+
+            t.IsBackground = true;
+            t.Start();
         }
     }
 }

src/modules/Hosts/HostsModuleInterface/dllmain.cpp

@@ -216,6 +216,12 @@ public:
             m_hShowAdminEvent = nullptr;
         }
 
+        if (m_hTerminateEvent)
+        {
+            CloseHandle(m_hTerminateEvent);
+            m_hTerminateEvent = nullptr;
+        }
+
         delete this;
     }
 
@@ -280,6 +286,7 @@ public:
             SetEvent(m_hTerminateEvent);
             WaitForSingleObject(m_hProcess, 1500);
             TerminateProcess(m_hProcess, 1);
+            ResetEvent(m_hTerminateEvent);
         }
 
         m_enabled = false;

src/modules/Workspaces/WorkspacesLauncher/main.cpp

@@ -38,6 +38,38 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
         return 0;
     }
 
+    std::wstring cmdLineStr{ GetCommandLineW() };
+    auto cmdArgs = split(cmdLineStr, L" ");
+    if (cmdArgs.workspaceId.empty())
+    {
+        Logger::warn("Incorrect command line arguments: no workspace id");
+        MessageBox(NULL, GET_RESOURCE_STRING(IDS_INCORRECT_ARGS).c_str(), GET_RESOURCE_STRING(IDS_WORKSPACES).c_str(), MB_ICONERROR | MB_OK);
+        return 1;
+    }
+
+    if (!cmdArgs.isRestarted)
+    {
+        // check if restart is needed. Only check it if not yet restarted to avoid endless restarting. Restart is needed if the process is elevated.
+        if (is_process_elevated())
+        {
+            Logger::warn("Workspaces Launcher is elevated, restart");
+
+            constexpr DWORD exe_path_size = 0xFFFF;
+            auto exe_path = std::make_unique<wchar_t[]>(exe_path_size);
+            GetModuleFileNameW(nullptr, exe_path.get(), exe_path_size);
+
+            const auto modulePath = get_module_folderpath();
+
+            std::string cmdLineStr(cmdline);
+            std::wstring cmdLineWStr(cmdLineStr.begin(), cmdLineStr.end());
+
+            std::wstring cmd = cmdArgs.workspaceId + L" " + std::to_wstring(cmdArgs.invokePoint) + L" " + NonLocalizable::restartedString;
+
+            RunNonElevatedEx(exe_path.get(), cmd, modulePath);
+            return 1;
+        }
+    }
+
     auto mutex = CreateMutex(nullptr, true, instanceMutexName.c_str());
     if (mutex == nullptr)
     {
@@ -50,34 +82,6 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
         return 0;
     }
 
-    std::wstring cmdLineStr{ GetCommandLineW() };
-    auto cmdArgs = split(cmdLineStr, L" ");
-    if (cmdArgs.workspaceId.empty())
-    {
-        Logger::warn("Incorrect command line arguments: no workspace id");
-        MessageBox(NULL, GET_RESOURCE_STRING(IDS_INCORRECT_ARGS).c_str(), GET_RESOURCE_STRING(IDS_WORKSPACES).c_str(), MB_ICONERROR | MB_OK);
-        return 1;
-    }
-
-    if (is_process_elevated())
-    {
-        Logger::warn("Workspaces Launcher is elevated, restart");
-
-        constexpr DWORD exe_path_size = 0xFFFF;
-        auto exe_path = std::make_unique<wchar_t[]>(exe_path_size);
-        GetModuleFileNameW(nullptr, exe_path.get(), exe_path_size);
-
-        const auto modulePath = get_module_folderpath();
-
-        std::string cmdLineStr(cmdline);
-        std::wstring cmdLineWStr(cmdLineStr.begin(), cmdLineStr.end());
-
-        std::wstring cmd = cmdArgs.workspaceId + L" " + std::to_wstring(cmdArgs.invokePoint);
-
-        RunNonElevatedEx(exe_path.get(), cmd, modulePath);
-        return 1;
-    }
-
     // COM should be initialized before ShellExecuteEx is called.
     if (FAILED(CoInitializeEx(NULL, COINIT_MULTITHREADED)))
     {

src/modules/Workspaces/WorkspacesLib/utils.h

@@ -6,15 +6,22 @@
 #include <workspaces-common/GuidUtils.h>
 #include <workspaces-common/InvokePoint.h>
 
+namespace NonLocalizable
+{
+    const wchar_t restartedString[] = L"restarted";
+}
+
 struct CommandLineArgs
 {
     std::wstring workspaceId;
     InvokePoint invokePoint;
+    bool isRestarted;
 };
 
 CommandLineArgs split(std::wstring s, const std::wstring& delimiter)
 {
     CommandLineArgs cmdArgs{};
+    cmdArgs.isRestarted = false;
 
     size_t pos = 0;
     std::wstring token;
@@ -29,7 +36,11 @@ CommandLineArgs split(std::wstring s, const std::wstring& delimiter)
 
     for (const auto& token : tokens)
     {
-        if (!cmdArgs.workspaceId.empty())
+        if (token == NonLocalizable::restartedString)
+        {
+            cmdArgs.isRestarted = true;
+        }
+        else if (!cmdArgs.workspaceId.empty())
         {
             try
             {
@@ -47,7 +58,7 @@ CommandLineArgs split(std::wstring s, const std::wstring& delimiter)
             {
                 cmdArgs.workspaceId = token;
             }
-        }   
+        }
     }
 
     return cmdArgs;

src/modules/peek/Peek.UI/NativeEventWaiter.cs

@@ -14,7 +14,7 @@ namespace Peek.UI.Native
         public static void WaitForEventLoop(string eventName, Action callback)
         {
             var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            new Thread(() =>
+            var t = new Thread(() =>
             {
                 var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
                 while (true)
@@ -24,7 +24,10 @@ namespace Peek.UI.Native
                         dispatcherQueue.TryEnqueue(() => callback());
                     }
                 }
-            }).Start();
+            });
+
+            t.IsBackground = true;
+            t.Start();
         }
     }
 }

src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandlerControl.cs

@@ -4,6 +4,8 @@
 
 using Common;
 using Microsoft.PowerToys.FilePreviewCommon;
+using Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerToys.PreviewHandler.Gcode
 {
@@ -84,6 +86,13 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
 
                 Resize += FormResized;
                 base.DoPreview(fs);
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new GcodeFilePreviewed());
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
             }
             catch (Exception ex)
             {
@@ -153,6 +162,14 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
         /// <param name="dataSource">Stream reference to access source file.</param>
         private void PreviewError<T>(Exception exception, T dataSource)
         {
+            try
+            {
+                PowerToysTelemetry.Log.WriteEvent(new GcodeFilePreviewError { Message = exception.Message });
+            }
+            catch
+            { // Should not crash if sending telemetry is failing. Ignore the exception.
+            }
+
             Controls.Clear();
             _infoBarAdded = true;
             AddTextBoxControl(Properties.Resource.GcodeNotPreviewedError);

src/modules/previewpane/GcodePreviewHandler/Program.cs

@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
+using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Gcode
@@ -27,6 +28,8 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
             {
                 if (args.Length == 6)
                 {
+                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
+
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -52,12 +55,16 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
+                                etwTrace?.Dispose();
+
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
+
+                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/GcodePreviewHandler/Telemetry/Events/GcodeFileHandlerLoaded.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when a svg file has been viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class GcodeFileHandlerLoaded : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/GcodePreviewHandler/Telemetry/Events/GcodeFilePreviewError.cs

@@ -0,0 +1,26 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when an error has occurred in the preview pane.
+    /// </summary>
+    [EventData]
+    public class GcodeFilePreviewError : EventBase, IEvent
+    {
+        /// <summary>
+        /// Gets or sets the error message to log as part of the telemetry event.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+    }
+}

src/modules/previewpane/GcodePreviewHandler/Telemetry/Events/GcodeFilePreviewed.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when a svg file has been viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class GcodeFilePreviewed : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs

@@ -9,6 +9,8 @@ using System.Text.RegularExpressions;
 
 using Common;
 using Microsoft.PowerToys.PreviewHandler.Markdown.Properties;
+using Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events;
+using Microsoft.PowerToys.Telemetry;
 using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.WinForms;
 using Windows.System;
@@ -215,9 +217,25 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
                     {
                     }
                 });
+
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new MarkdownFilePreviewed());
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new MarkdownFilePreviewError { Message = ex.Message });
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
+
                 Controls.Clear();
                 _infoBarDisplayed = true;
                 _infoBar = GetTextBoxControl(Resources.MarkdownNotPreviewedError);

src/modules/previewpane/MarkdownPreviewHandler/Program.cs

@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
+using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Markdown
@@ -27,6 +28,8 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
             {
                 if (args.Length == 6)
                 {
+                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
+
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -52,12 +55,16 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
+                                etwTrace?.Dispose();
+
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
+
+                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/MarkdownPreviewHandler/Telemetry/Events/MarkdownFileHandlerLoaded.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event that is triggered when a markdown file is viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class MarkdownFileHandlerLoaded : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/MarkdownPreviewHandler/Telemetry/Events/MarkdownFilePreviewError.cs

@@ -0,0 +1,23 @@
+// 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 Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event that is triggered when an error occurs while attempting to view a markdown file in the preview pane.
+    /// </summary>
+    public class MarkdownFilePreviewError : EventBase, IEvent
+    {
+        /// <summary>
+        /// Gets or sets the error message.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+    }
+}

src/modules/previewpane/MarkdownPreviewHandler/Telemetry/Events/MarkdownFilePreviewed.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event that is triggered when a markdown file is viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class MarkdownFilePreviewed : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandlerControl.cs

@@ -1,8 +1,17 @@
 // 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;
+using System.Drawing;
+using System.IO;
+using System.Runtime.InteropServices.ComTypes;
+using System.Windows.Forms;
+
 using Common;
+using Common.Utilities;
 using Microsoft.PowerToys.PreviewHandler.Pdf.Properties;
+using Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events;
+using Microsoft.PowerToys.Telemetry;
 using Windows.Data.Pdf;
 using Windows.Storage.Streams;
 using Windows.UI.ViewManagement;
@@ -149,9 +158,25 @@ namespace Microsoft.PowerToys.PreviewHandler.Pdf
                         memStream.Dispose();
                     }
                 }
+
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new PdfFilePreviewed());
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new PdfFilePreviewError { Message = ex.Message });
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
+
                 Controls.Clear();
                 _infoBar = GetTextBoxControl(Resources.PdfNotPreviewedError);
                 Controls.Add(_infoBar);

src/modules/previewpane/PdfPreviewHandler/Program.cs

@@ -5,6 +5,7 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
+using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Pdf
@@ -26,6 +27,8 @@ namespace Microsoft.PowerToys.PreviewHandler.Pdf
             {
                 if (args.Length == 6)
                 {
+                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
+
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -51,12 +54,16 @@ namespace Microsoft.PowerToys.PreviewHandler.Pdf
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
+                                etwTrace?.Dispose();
+
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
+
+                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/PdfPreviewHandler/Telemetry/Events/PdfFileHandlerLoaded.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event that is triggered when a pdf file is viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class PdfFileHandlerLoaded : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/PdfPreviewHandler/Telemetry/Events/PdfFilePreviewError.cs

@@ -0,0 +1,23 @@
+// 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 Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event that is triggered when an error occurs while attempting to view a markdown file in the preview pane.
+    /// </summary>
+    public class PdfFilePreviewError : EventBase, IEvent
+    {
+        /// <summary>
+        /// Gets or sets the error message.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+    }
+}

src/modules/previewpane/PdfPreviewHandler/Telemetry/Events/PdfFilePreviewed.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event that is triggered when a markdown file is viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class PdfFilePreviewed : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/QoiPreviewHandler/Program.cs

@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
+using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Qoi
@@ -27,6 +28,8 @@ namespace Microsoft.PowerToys.PreviewHandler.Qoi
             {
                 if (args.Length == 6)
                 {
+                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
+
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -52,12 +55,16 @@ namespace Microsoft.PowerToys.PreviewHandler.Qoi
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
+                                etwTrace?.Dispose();
+
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
+
+                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandlerControl.cs

@@ -4,6 +4,8 @@
 
 using Common;
 using Microsoft.PowerToys.FilePreviewCommon;
+using Microsoft.PowerToys.PreviewHandler.Qoi.Telemetry.Events;
+using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerToys.PreviewHandler.Qoi
 {
@@ -71,6 +73,13 @@ namespace Microsoft.PowerToys.PreviewHandler.Qoi
 
                 Resize += FormResized;
                 base.DoPreview(fs);
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new QoiFilePreviewed());
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
             }
             catch (Exception ex)
             {
@@ -140,6 +149,14 @@ namespace Microsoft.PowerToys.PreviewHandler.Qoi
         /// <param name="dataSource">Stream reference to access source file.</param>
         private void PreviewError<T>(Exception exception, T dataSource)
         {
+            try
+            {
+                PowerToysTelemetry.Log.WriteEvent(new QoiFilePreviewError { Message = exception.Message });
+            }
+            catch
+            { // Should not crash if sending telemetry is failing. Ignore the exception.
+            }
+
             Controls.Clear();
             _infoBarAdded = true;
             AddTextBoxControl(Properties.Resource.QoiNotPreviewedError);

src/modules/previewpane/QoiPreviewHandler/Telemetry/Events/QoiFilePreviewError.cs

@@ -0,0 +1,26 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Qoi.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when an error has occurred in the preview pane.
+    /// </summary>
+    [EventData]
+    public class QoiFilePreviewError : EventBase, IEvent
+    {
+        /// <summary>
+        /// Gets or sets the error message to log as part of the telemetry event.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+    }
+}

src/modules/previewpane/QoiPreviewHandler/Telemetry/Events/QoiFilePreviewed.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Qoi.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when a Qoi file has been viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class QoiFilePreviewed : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/SvgPreviewHandler/Program.cs

@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
+using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Svg
@@ -27,6 +28,8 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
             {
                 if (args.Length == 6)
                 {
+                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
+
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -52,12 +55,16 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
+                                etwTrace?.Dispose();
+
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
+
+                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs

@@ -2,11 +2,14 @@
 // 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.Net.Http;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
 using Common;
 using Common.Utilities;
+using Microsoft.PowerToys.PreviewHandler.Svg.Telemetry.Events;
+using Microsoft.PowerToys.Telemetry;
 using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.WinForms;
 using SvgPreviewHandler;
@@ -139,8 +142,15 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
                 svgData = SvgPreviewHandlerHelper.SwapNamespaces(svgData);
                 svgData = SvgPreviewHandlerHelper.AddStyleSVG(svgData);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new SvgFilePreviewError { Message = ex.Message });
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
             }
 
             try
@@ -157,6 +167,13 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
                 AddWebViewControl(svgData);
                 Resize += FormResized;
                 base.DoPreview(dataSource);
+                try
+                {
+                    PowerToysTelemetry.Log.WriteEvent(new SvgFilePreviewed());
+                }
+                catch
+                { // Should not crash if sending telemetry is failing. Ignore the exception.
+                }
             }
             catch (Exception ex)
             {
@@ -284,6 +301,14 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
         /// <param name="dataSource">Stream reference to access source file.</param>
         private void PreviewError<T>(Exception exception, T dataSource)
         {
+            try
+            {
+                PowerToysTelemetry.Log.WriteEvent(new SvgFilePreviewError { Message = exception.Message });
+            }
+            catch
+            { // Should not crash if sending telemetry is failing. Ignore the exception.
+            }
+
             Controls.Clear();
             _infoBarAdded = true;
             AddTextBoxControl(Properties.Resource.SvgNotPreviewedError);

src/modules/previewpane/SvgPreviewHandler/Telemetry/Events/SvgFileHandlerLoaded.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Svg.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when a svg file has been viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class SvgFileHandlerLoaded : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/modules/previewpane/SvgPreviewHandler/Telemetry/Events/SvgFilePreviewError.cs

@@ -0,0 +1,26 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Svg.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when an error has occurred in the preview pane.
+    /// </summary>
+    [EventData]
+    public class SvgFilePreviewError : EventBase, IEvent
+    {
+        /// <summary>
+        /// Gets or sets the error message to log as part of the telemetry event.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+    }
+}

src/modules/previewpane/SvgPreviewHandler/Telemetry/Events/SvgFilePreviewed.cs

@@ -0,0 +1,21 @@
+// 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.Tracing;
+
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.PowerToys.PreviewHandler.Svg.Telemetry.Events
+{
+    /// <summary>
+    /// A telemetry event to be raised when a svg file has been viewed in the preview pane.
+    /// </summary>
+    [EventData]
+    public class SvgFilePreviewed : EventBase, IEvent
+    {
+        /// <inheritdoc/>
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}

src/settings-ui/Settings.UI/Helpers/NativeEventWaiter.cs

@@ -4,7 +4,7 @@
 
 using System;
 using System.Threading;
-using System.Threading.Tasks;
+
 using Microsoft.UI.Dispatching;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers
@@ -14,7 +14,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
         public static void WaitForEventLoop(string eventName, Action callback)
         {
             var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            new Task(() =>
+            var t = new Thread(() =>
             {
                 var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
                 while (true)
@@ -24,7 +24,10 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                         dispatcherQueue.TryEnqueue(() => callback());
                     }
                 }
-            }).Start();
+            });
+
+            t.IsBackground = true;
+            t.Start();
         }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs

@@ -159,9 +159,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             ViewModel.RefreshSettingsOnExternalChange();
         }
 
-        private void ViewDiagnosticData_Click(object sender, RoutedEventArgs e)
+        private async void ViewDiagnosticData_Click(object sender, RoutedEventArgs e)
         {
-            ViewModel.ViewDiagnosticData();
+            await Task.Run(ViewModel.ViewDiagnosticData);
         }
     }
 }

src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs

@@ -168,6 +168,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
             DeleteDiagnosticDataOlderThan28Days(etwDirPath);
 
+            string localLowEtwDirPath = Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw");
+            DeleteDiagnosticDataOlderThan28Days(localLowEtwDirPath);
+
             InitializeLanguages();
         }
 
@@ -1253,7 +1256,34 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         internal void ViewDiagnosticData()
         {
+            string localLowEtwDirPath = Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw");
             string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
+
+            if (Directory.Exists(localLowEtwDirPath))
+            {
+                if (!Directory.Exists(etwDirPath))
+                {
+                    Directory.CreateDirectory(etwDirPath);
+                }
+
+                string[] localLowEtlFiles = Directory.GetFiles(localLowEtwDirPath, "*.etl");
+
+                foreach (string file in localLowEtlFiles)
+                {
+                    string fileName = Path.GetFileName(file);
+                    string destFile = Path.Combine(etwDirPath, fileName);
+
+                    try
+                    {
+                        File.Copy(file, destFile, overwrite: true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError($"Failed to copy etl file: {fileName}. Error: {ex.Message}");
+                    }
+                }
+            }
+
             string tracerptPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "system32");
 
             ETLConverter converter = new ETLConverter(etwDirPath, tracerptPath);