EtwTrace exe

PowerToys.sln

@@ -618,6 +618,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesEditor", "src\mod
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLauncher", "src\modules\Workspaces\WorkspacesLauncher\WorkspacesLauncher.vcxproj", "{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtwTrace", "src\common\EtwTrace\EtwTrace.csproj", "{036A27C6-0DF3-4398-B051-D9F992E68BCF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2720,6 +2722,18 @@ Global
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x64.Build.0 = Release|x64
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x86.ActiveCfg = Release|x64
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x86.Build.0 = Release|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Debug|x64.ActiveCfg = Debug|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Debug|x64.Build.0 = Debug|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Debug|x86.ActiveCfg = Debug|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Debug|x86.Build.0 = Debug|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Release|ARM64.Build.0 = Release|ARM64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Release|x64.ActiveCfg = Release|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Release|x64.Build.0 = Release|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Release|x86.ActiveCfg = Release|x64
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2946,6 +2960,7 @@ Global
 		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{367D7543-7DBA-4381-99F1-BF6142A996C4} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{036A27C6-0DF3-4398-B051-D9F992E68BCF} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

src/common/EtwTrace/EtwTrace.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\Common.SelfContained.props" />
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
+
+    <UseWindowsForms>true</UseWindowsForms>
+    <OutputPath>..\..\..\$(Platform)\$(Configuration)</OutputPath>
+    <AssemblyName>PowerToys.EtwTrace</AssemblyName>
+    <AssemblyDescription>PowerToys EtwTrace</AssemblyDescription>
+    <RootNamespace>EtwTrace</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+    <ProjectReference Include="..\version\version.vcxproj" />
+  </ItemGroup>
+
+</Project>

src/common/EtwTrace/Program.cs

@@ -0,0 +1,41 @@
+// 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.Threading;
+using System.Windows.Forms;
+using ManagedCommon;
+using Microsoft.PowerToys.Telemetry;
+
+namespace EtwTrace
+{
+    internal static class Program
+    {
+        private static ManualResetEvent quitEvent = new ManualResetEvent(false);
+
+        public static void Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                return;
+            }
+
+            int runnerPid = -1;
+            if (!int.TryParse(args[0], out runnerPid))
+            {
+                return;
+            }
+
+            ETWTrace eTWTrace = new ETWTrace();
+            eTWTrace.Start();
+
+            RunnerHelper.WaitForPowerToysRunner(runnerPid, () =>
+            {
+                eTWTrace.Dispose();
+                quitEvent.Set();
+            });
+
+            quitEvent.WaitOne();
+        }
+    }
+}

src/modules/colorPicker/ColorPickerUI/App.xaml.cs

@@ -17,7 +17,6 @@ namespace ColorPickerUI
     /// </summary>
     public partial class App : Application, IDisposable
     {
-        private ETWTrace etwTrace = new ETWTrace();
         private Mutex _instanceMutex;
         private static string[] _args;
         private int _powerToysRunnerPid;
@@ -30,7 +29,6 @@ public partial class App : Application, IDisposable
 
         protected override void OnStartup(StartupEventArgs e)
         {
-            etwTrace.Start();
             NativeThreadCTS = new CancellationTokenSource();
             ExitToken = NativeThreadCTS.Token;
 
@@ -84,7 +82,6 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _instanceMutex?.Dispose();
-                    etwTrace?.Dispose();
                 }
 
                 disposedValue = true;

src/runner/main.cpp

@@ -90,6 +90,43 @@ void open_menu_from_another_instance(std::optional<std::string> settings_window)
     PostMessageW(hwnd_main, WM_COMMAND, ID_SETTINGS_MENU_COMMAND, msg);
 }
 
+DWORD g_etw_trace_process_id = 0;
+
+void run_etw_trace()
+{
+    PROCESS_INFORMATION process_info = { 0 };
+
+    // Arg 1: executable path.
+    std::wstring executable_path = get_module_folderpath();
+
+    executable_path.append(L"\\PowerToys.EtwTrace.exe");
+
+    // Arg 2: process pid.
+    DWORD powertoys_pid = GetCurrentProcessId();
+
+    std::wstring executable_args = fmt::format(L"\"{}\" {}",
+                                                executable_path,
+                                                std::to_wstring(powertoys_pid));
+
+    STARTUPINFO startup_info = { sizeof(startup_info) };
+    if (!CreateProcessW(executable_path.c_str(),
+                        executable_args.data(),
+                        nullptr,
+                        nullptr,
+                        FALSE,
+                        0,
+                        nullptr,
+                        nullptr,
+                        &startup_info,
+                        &process_info))
+    {
+        // error
+    }
+
+    g_etw_trace_process_id = process_info.dwProcessId;
+
+}
+
 int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow, bool openOobe, bool openScoobe, bool showRestartNotificationAfterUpdate)
 {
     Logger::info("Runner is starting. Elevated={} openOobe={} openScoobe={} showRestartNotificationAfterUpdate={}", isProcessElevated, openOobe, openScoobe, showRestartNotificationAfterUpdate);
@@ -320,6 +357,8 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR l
         L"(ML;;NX;;;LW)"; // Integrity label on No execute up for Low mandatory level
     initializeCOMSecurity(securityDescriptor);
 
+    run_etw_trace();
+
     int n_cmd_args = 0;
     LPWSTR* cmd_arg_list = CommandLineToArgvW(GetCommandLineW(), &n_cmd_args);
     switch (should_run_in_special_mode(n_cmd_args, cmd_arg_list))