Unify processes list in BugReportTool source (#14269)

microsoft · Nov 5, 2021 · 1596293 · 1596293
1 parent 3a6dd45
commit 1596293
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
@@ -39,6 +39,7 @@
     </ClCompile>
     <ClCompile Include="EventViewer.cpp" />
     <ClCompile Include="InstallationFolder.cpp" />
+    <ClCompile Include="ProcessesList.cpp" />
     <ClCompile Include="ReportMonitorInfo.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="RegistryUtils.cpp" />

diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters
@@ -14,6 +14,7 @@
     <ClCompile Include="EventViewer.cpp" />
     <ClCompile Include="XmlDocumentEx.cpp" />
     <ClCompile Include="InstallationFolder.cpp" />
+    <ClCompile Include="ProcessesList.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="ZipTools">

diff --git a/tools/BugReportTool/BugReportTool/EventViewer.cpp b/tools/BugReportTool/BugReportTool/EventViewer.cpp
@@ -10,22 +10,10 @@
 
 #include "XmlDocumentEx.h"
 
+extern std::vector<std::wstring> processes;
+
 namespace
 {
-    std::vector<std::wstring> processes = 
-    {
-        L"PowerToys.exe",
-        L"PowerToys.Settings.exe",
-        L"ColorPickerUI.exe",
-        L"PowerToys.Awake.exe",
-        L"FancyZonesEditor.exe",
-        L"PowerToys.FancyZones.exe",
-        L"PowerToys.KeyboardManagerEngine.exe",
-        L"PowerToys.KeyboardManagerEditor.exe",
-        L"PowerLauncher.exe",
-        L"PowerToys.ShortcutGuide.exe"
-    };
-
     // Batch size for number of events queried at once
     constexpr int BATCH_SIZE = 50;
 

diff --git a/tools/BugReportTool/BugReportTool/ProcessesList.cpp b/tools/BugReportTool/BugReportTool/ProcessesList.cpp
@@ -0,0 +1,20 @@
+#include <string>
+#include <vector>
+
+std::vector<std::wstring> processes =
+{
+    L"PowerToys.exe",
+    L"PowerToys.Settings.exe",
+    L"ColorPickerUI.exe",
+    L"PowerToys.Awake.exe",
+    L"FancyZonesEditor.exe",
+    L"PowerToys.FancyZones.exe",
+    L"PowerToys.KeyboardManagerEngine.exe",
+    L"PowerToys.KeyboardManagerEditor.exe",
+    L"PowerLauncher.exe",
+    L"PowerToys.ShortcutGuide.exe",
+    L"PowerRename.exe",
+    L"ImageResizer.exe",
+    L"PowerToys.Update.exe",
+    L"PowerToys.ActionRunner.exe"
+};
diff --git a/tools/BugReportTool/BugReportTool/RegistryUtils.cpp b/tools/BugReportTool/BugReportTool/RegistryUtils.cpp
@@ -4,6 +4,8 @@
 
 using namespace std;
 
+extern std::vector<std::wstring> processes;
+
 namespace
 {
     vector<pair<HKEY, wstring>> registryKeys = {
@@ -163,20 +165,8 @@ namespace
 
 void ReportCompatibilityTab(HKEY key, wofstream& report)
 {
-    vector<std::wstring> apps
-    {
-        L"PowerToys.exe",
-        L"ColorPickerUI.exe",
-        L"FancyZonesEditor.exe",
-        L"PowerToys.FancyZones.exe",
-        L"PowerToys.KeyboardManagerEngine.exe",
-        L"PowerToys.KeyboardManagerEditor.exe",
-        L"PowerLauncher.exe",
-        L"PowerToys.ShortcutGuide.exe"
-    };
-
     map<wstring, wstring> flags;
-    for (auto app : apps)
+    for (auto app : processes)
     {
         flags[app] = L"";
     }
@@ -190,7 +180,7 @@ void ReportCompatibilityTab(HKEY key, wofstream& report)
             auto values = QueryValues(outKey);
             for (auto value : values)
             {
-                for (auto app : apps)
+                for (auto app : processes)
                 {
                     if (value.first.find(app) != wstring::npos)
                     {