Merge branch 'public' into installer_update

markgalvan-intel · web-flow · commit 7ac36ffea648 · 2023-09-27T23:12:46.000-07:00
diff --git a/PresentData/Debug.cpp b/PresentData/Debug.cpp
@@ -465,8 +465,8 @@ void VerboseTraceEventImpl(PMTraceConsumer* pmConsumer, EVENT_RECORD* eventRecor
     if (hdr.ProviderId == Microsoft_Windows_Kernel_Process::GUID) {
         using namespace Microsoft_Windows_Kernel_Process;
         switch (hdr.EventDescriptor.Id) {
-        case ProcessStart_Start::Id: PrintEventHeader(eventRecord, metadata, "ProcessStart", { L"ImageName", PrintWString }); break;
-        case ProcessStop_Stop::Id:   PrintEventHeader(eventRecord, metadata, "ProcessStop",  { L"ImageName", PrintString }); break;
+        case ProcessStart_Start::Id: PrintEventHeader(eventRecord, metadata, "ProcessStart", { L"ProcessID", PrintU32, L"ImageName", PrintWString }); break;
+        case ProcessStop_Stop::Id:   PrintEventHeader(eventRecord, metadata, "ProcessStop",  { L"ProcessID", PrintU32, L"ImageName", PrintString }); break;
         }
         return;
     }
diff --git a/PresentMon/CommandLine.cpp b/PresentMon/CommandLine.cpp
@@ -151,17 +151,17 @@ bool ParseKeyName(KeyNameCode const* valid, size_t validCount, char* name, char
         }
     }
 
-    int col = PrintError("error: %s '%s'.\nValid options (case insensitive):", errorMessage, name);
+    int col = PrintErrorNoNewLine("error: %s '%s'.\nValid options (case insensitive):", errorMessage, name);
 
     size_t consoleWidth = GetConsoleWidth();
     for (size_t i = 0; i < validCount; ++i) {
         auto len = strlen(valid[i].mName);
         if (col + len + 1 > consoleWidth) {
-            col = PrintError("\n   ") - 1;
+            col = PrintErrorNoNewLine("\n   ") - 1;
         }
-        col += PrintError(" %s", valid[i].mName);
+        col += PrintErrorNoNewLine(" %s", valid[i].mName);
     }
-    PrintError("\n");
+    fprintf(stderr, "\n");
 
     return false;
 }
@@ -193,11 +193,11 @@ bool AssignHotkey(char* key, CommandLineArgs* args)
 void SetCaptureAll(CommandLineArgs* args)
 {
     if (!args->mTargetProcessNames.empty()) {
-        PrintWarning("warning: -captureall elides all previous -process_name arguments.\n");
+        PrintWarning("warning: -captureall elides all previous -process_name arguments.");
         args->mTargetProcessNames.clear();
     }
     if (args->mTargetPid != 0) {
-        PrintWarning("warning: -captureall elides all previous -process_id arguments.\n");
+        PrintWarning("warning: -captureall elides all previous -process_id arguments.");
         args->mTargetPid = 0;
     }
 }
@@ -234,7 +234,7 @@ bool ParseValue(char** argv, int argc, int* i)
         *i += 1;
         return true;
     }
-    PrintError("error: %s expecting argument.\n", argv[*i]);
+    PrintError("error: %s expecting argument.", argv[*i]);
     return false;
 }
 
@@ -413,7 +413,7 @@ bool ParseCommandLine(int argc, char** argv)
 
         // Provided argument wasn't recognized
         else if (!(ParseArg(argv[i], "?") || ParseArg(argv[i], "h") || ParseArg(argv[i], "help"))) {
-            PrintError("error: unrecognized argument '%s'.\n", argv[i]);
+            PrintError("error: unrecognized argument '%s'.", argv[i]);
         }
 
         PrintHelp();
@@ -422,32 +422,32 @@ bool ParseCommandLine(int argc, char** argv)
 
     // Handle deprecated command line arguments
     if (DEPRECATED_simple) {
-        PrintWarning("warning: -simple command line argument has been deprecated; using -no_track_display instead.\n");
+        PrintWarning("warning: -simple command line argument has been deprecated; using -no_track_display instead.");
         args->mTrackDisplay = false;
     }
     if (DEPRECATED_verbose) {
-        PrintWarning("warning: -verbose command line argument has been deprecated; using -track_debug instead.\n");
+        PrintWarning("warning: -verbose command line argument has been deprecated; using -track_debug instead.");
         args->mTrackDebug = true;
     }
     if (DEPRECATED_wmr) {
-        PrintWarning("warning: -include_mixed_reality command line argument has been deprecated; using -track_mixed_reality instead.\n");
+        PrintWarning("warning: -include_mixed_reality command line argument has been deprecated; using -track_mixed_reality instead.");
         args->mTrackWMR = true;
     }
     if (DEPRECATED_dontRestart) {
-        PrintWarning("warning: -dont_restart_as_admin command line argument has been deprecated; it is now the default behaviour.\n");
+        PrintWarning("warning: -dont_restart_as_admin command line argument has been deprecated; it is now the default behaviour.");
     }
 
     // Ignore -no_track_display if required for other requested tracking
     if (args->mTrackDebug && !args->mTrackDisplay) {
-        PrintWarning("warning: -track_debug requires display tracking; ignoring -no_track_display.\n");
+        PrintWarning("warning: -track_debug requires display tracking; ignoring -no_track_display.");
         args->mTrackDisplay = true;
     }
     if (args->mTrackGPU && !args->mTrackDisplay) {
-        PrintWarning("warning: -track_gpu requires display tracking; ignoring -no_track_display.\n");
+        PrintWarning("warning: -track_gpu requires display tracking; ignoring -no_track_display.");
         args->mTrackDisplay = true;
     }
     if (args->mTrackGPUVideo && !args->mTrackDisplay) {
-        PrintWarning("warning: -track_gpu_video requires display tracking; ignoring -no_track_display.\n");
+        PrintWarning("warning: -track_gpu_video requires display tracking; ignoring -no_track_display.");
         args->mTrackDisplay = true;
     }
 
@@ -459,7 +459,7 @@ bool ParseCommandLine(int argc, char** argv)
 
     // -date_time is mutually exclusive to -qpc_time and -qpc_time_s
     if (args->mOutputDateTime && (args->mOutputQpcTime || args->mOutputQpcTimeInSeconds)) {
-        PrintError("error: -date_time and -qpc_time or -qpc_time_s cannot be used at the same time.\n");
+        PrintError("error: -date_time and -qpc_time or -qpc_time_s cannot be used at the same time.");
         PrintHelp();
         return false;
     }
@@ -469,13 +469,13 @@ bool ParseCommandLine(int argc, char** argv)
         if ((args->mHotkeyModifiers & MOD_CONTROL) != 0 && (
             args->mHotkeyVirtualKeyCode == 0x44 /*C*/ ||
             args->mHotkeyVirtualKeyCode == VK_SCROLL)) {
-            PrintError("error: CTRL+C or CTRL+SCROLL cannot be used as a -hotkey, they are reserved for terminating the trace.\n");
+            PrintError("error: CTRL+C or CTRL+SCROLL cannot be used as a -hotkey, they are reserved for terminating the trace.");
             PrintHelp();
             return false;
         }
 
         if (args->mHotkeyModifiers == MOD_NOREPEAT && args->mHotkeyVirtualKeyCode == VK_F12) {
-            PrintError("error: 'F12' cannot be used as a -hotkey, it is reserved for the debugger.\n");
+            PrintError("error: 'F12' cannot be used as a -hotkey, it is reserved for the debugger.");
             PrintHelp();
             return false;
         }
@@ -485,24 +485,24 @@ bool ParseCommandLine(int argc, char** argv)
     // -output_file, or -output_stdout if they are also used.
     if (!args->mOutputCsvToFile) {
         if (args->mOutputQpcTime) {
-            PrintWarning("warning: -qpc_time and -qpc_time_s are only relevant for CSV output; ignoring due to -no_csv.\n");
+            PrintWarning("warning: -qpc_time and -qpc_time_s are only relevant for CSV output; ignoring due to -no_csv.");
             args->mOutputQpcTime = false;
             args->mOutputQpcTimeInSeconds = false;
         }
         if (args->mOutputDateTime) {
-            PrintWarning("warning: -date_time is only relevant for CSV output; ignoring due to -no_csv.\n");
+            PrintWarning("warning: -date_time is only relevant for CSV output; ignoring due to -no_csv.");
             args->mOutputDateTime = false;
         }
         if (args->mMultiCsv) {
-            PrintWarning("warning: -multi_csv and -no_csv arguments are not compatible; ignoring -multi_csv.\n");
+            PrintWarning("warning: -multi_csv and -no_csv arguments are not compatible; ignoring -multi_csv.");
             args->mMultiCsv = false;
         }
         if (args->mOutputCsvFileName != nullptr) {
-            PrintWarning("warning: -output_file and -no_csv arguments are not compatible; ignoring -output_file.\n");
+            PrintWarning("warning: -output_file and -no_csv arguments are not compatible; ignoring -output_file.");
             args->mOutputCsvFileName = nullptr;
         }
         if (args->mOutputCsvToStdout) {
-            PrintWarning("warning: -output_stdout and -no_csv arguments are not compatible; ignoring -output_stdout.\n");
+            PrintWarning("warning: -output_stdout and -no_csv arguments are not compatible; ignoring -output_stdout.");
             args->mOutputCsvToStdout = false;
         }
     }
@@ -517,18 +517,18 @@ bool ParseCommandLine(int argc, char** argv)
         args->mConsoleOutputType = ConsoleOutput::None;
 
         if (args->mOutputCsvFileName != nullptr) {
-            PrintError("error: only one of -output_file or -output_stdout arguments can be used.\n");
+            PrintError("error: only one of -output_file or -output_stdout arguments can be used.");
             PrintHelp();
             return false;
         }
 
         if (args->mMultiCsv) {
-            PrintWarning("warning: -multi_csv and -output_stdout are not compatible; ignoring -multi_csv.\n");
+            PrintWarning("warning: -multi_csv and -output_stdout are not compatible; ignoring -multi_csv.");
             args->mMultiCsv = false;
         }
 
         if (args->mTrackWMR) {
-            PrintWarning("warning: -track_mixed_reality and -output_stdout are not compatible; ignoring -track_mixed_reality.\n");
+            PrintWarning("warning: -track_mixed_reality and -output_stdout are not compatible; ignoring -track_mixed_reality.");
             args->mTrackWMR = false;
         }
     }
@@ -544,15 +544,15 @@ bool ParseCommandLine(int argc, char** argv)
     // Try to initialize the console, and warn if we're not going to be able to
     // do the advanced display as requested.
     if (args->mConsoleOutputType == ConsoleOutput::Full && !IsConsoleInitialized()) {
-        PrintWarning("warning: could not initialize console display; continuing with -no_top.\n");
+        PrintWarning("warning: could not initialize console display; continuing with -no_top.");
         args->mConsoleOutputType = ConsoleOutput::Simple;
     }
 
     // If -terminate_existing, warn about any normal arguments since we'll just
     // be stopping an existing session and then exiting.
     if (args->mTerminateExisting && argc != 2) {
         PrintWarning("warning: -terminate_existing exits without capturing anything; ignoring all capture,\n"
-                     "         output, and recording arguments.\n");
+                     "         output, and recording arguments.");
     }
 
     // Convert the provided process names into a canonical form used for comparison.
diff --git a/PresentMon/Console.cpp b/PresentMon/Console.cpp
@@ -258,10 +258,30 @@ int PrintWarning(char const* format, ...)
     va_start(val, format);
     int c = PrintColor(FOREGROUND_RED | FOREGROUND_GREEN, format, val);
     va_end(val);
+    c += fprintf(stderr, "\n");
     return c;
 }
 
 int PrintError(char const* format, ...)
+{
+    va_list val;
+    va_start(val, format);
+    int c = PrintColor(FOREGROUND_RED, format, val);
+    va_end(val);
+    c += fprintf(stderr, "\n");
+    return c;
+}
+
+int PrintWarningNoNewLine(char const* format, ...)
+{
+    va_list val;
+    va_start(val, format);
+    int c = PrintColor(FOREGROUND_RED | FOREGROUND_GREEN, format, val);
+    va_end(val);
+    return c;
+}
+
+int PrintErrorNoNewLine(char const* format, ...)
 {
     va_list val;
     va_start(val, format);
diff --git a/PresentMon/MainThread.cpp b/PresentMon/MainThread.cpp
@@ -46,7 +46,7 @@ static bool EnableScrollLock(bool enable)
 
         auto sendCount = SendInput(2, input, sizeof(INPUT));
         if (sendCount != 2) {
-            PrintWarning("warning: could not toggle scroll lock.\n");
+            PrintWarning("warning: could not toggle scroll lock.");
         }
     }
 
@@ -196,8 +196,8 @@ int main(int argc, char** argv)
         auto status = TraceSession::StopNamedSession(args.mSessionName);
         switch (status) {
         case ERROR_SUCCESS: return 0;
-        case ERROR_WMI_INSTANCE_NOT_FOUND: PrintError("error: no existing sessions found: %s\n", args.mSessionName); break;
-        default: PrintError("error: failed to terminate existing session (%s): %lu\n", args.mSessionName, status); break;
+        case ERROR_WMI_INSTANCE_NOT_FOUND: PrintError("error: no existing sessions found: %s", args.mSessionName); break;
+        default: PrintError("error: failed to terminate existing session (%s): %lu", args.mSessionName, status); break;
         }
         return 7;
     }
@@ -223,28 +223,28 @@ int main(int argc, char** argv)
             "warning: PresentMon requires elevated privilege in order to query processes that are\n"
             "         short-running or started on another account.  Without it, those processes will\n"
             "         be listed as '<error>' and they can't be targeted by -process_name nor trigger\n"
-            "         -terminate_on_proc_exit.\n");
+            "         -terminate_on_proc_exit.");
     }
 
     // Create a message queue to handle the input messages.
     WNDCLASSEXW wndClass = { sizeof(wndClass) };
     wndClass.lpfnWndProc = HandleWindowMessage;
     wndClass.lpszClassName = L"PresentMon";
     if (!RegisterClassExW(&wndClass)) {
-        PrintError("error: failed to register hotkey class.\n");
+        PrintError("error: failed to register hotkey class.");
         return 3;
     }
 
     gWnd = CreateWindowExW(0, wndClass.lpszClassName, L"PresentMonWnd", 0, 0, 0, 0, 0, HWND_MESSAGE, 0, 0, nullptr);
     if (!gWnd) {
-        PrintError("error: failed to create hotkey window.\n");
+        PrintError("error: failed to create hotkey window.");
         UnregisterClass(wndClass.lpszClassName, NULL);
         return 4;
     }
 
     // Register the hotkey.
     if (args.mHotkeySupport && !RegisterHotKey(gWnd, HOTKEY_ID, args.mHotkeyModifiers, args.mHotkeyVirtualKeyCode)) {
-        PrintError("error: failed to register hotkey.\n");
+        PrintError("error: failed to register hotkey.");
         DestroyWindow(gWnd);
         UnregisterClass(wndClass.lpszClassName, NULL);
         return 5;
diff --git a/PresentMon/OutputThread.cpp b/PresentMon/OutputThread.cpp
@@ -571,10 +571,10 @@ void Output()
     ULONG buffersLost = 0;
     CheckLostReports(&eventsLost, &buffersLost);
     if (buffersLost > 0) {
-        PrintWarning("warning: %lu ETW buffers were lost.\n", buffersLost);
+        PrintWarning("warning: %lu ETW buffers were lost.", buffersLost);
     }
     if (eventsLost > 0) {
-        PrintWarning("warning: %lu ETW events were lost.\n", eventsLost);
+        PrintWarning("warning: %lu ETW events were lost.", eventsLost);
     }
 
     // Close all CSV and process handles
diff --git a/PresentMon/PresentMon.hpp b/PresentMon/PresentMon.hpp
@@ -112,6 +112,8 @@ bool InitializeConsole();
 bool IsConsoleInitialized();
 int PrintWarning(char const* format, ...);
 int PrintError(char const* format, ...);
+int PrintWarningNoNewLine(char const* format, ...);
+int PrintErrorNoNewLine(char const* format, ...);
 void ConsolePrint(char const* format, ...);
 void ConsolePrintLn(char const* format, ...);
 void CommitConsole();
diff --git a/PresentMon/Privilege.cpp b/PresentMon/Privilege.cpp
@@ -111,17 +111,17 @@ int RestartAsAdministrator(
         GetExitCodeProcess(info.hProcess, &code);
         CloseHandle(info.hProcess);
     } else {
-        PrintError("error: failed to elevate privilege ");
+        PrintErrorNoNewLine("error: failed to elevate privilege: ");
         int e = GetLastError();
         switch (e) {
-        case ERROR_FILE_NOT_FOUND:    PrintError("(file not found).\n"); break;
-        case ERROR_PATH_NOT_FOUND:    PrintError("(path not found).\n"); break;
-        case ERROR_DLL_NOT_FOUND:     PrintError("(dll not found).\n"); break;
-        case ERROR_ACCESS_DENIED:     PrintError("(access denied).\n"); break;
-        case ERROR_CANCELLED:         PrintError("(cancelled).\n"); break;
-        case ERROR_NOT_ENOUGH_MEMORY: PrintError("(out of memory).\n"); break;
-        case ERROR_SHARING_VIOLATION: PrintError("(sharing violation).\n"); break;
-        default:                      PrintError("(%u).\n", e); break;
+        case ERROR_FILE_NOT_FOUND:    PrintError("file not found"); break;
+        case ERROR_PATH_NOT_FOUND:    PrintError("path not found"); break;
+        case ERROR_DLL_NOT_FOUND:     PrintError("dll not found"); break;
+        case ERROR_ACCESS_DENIED:     PrintError("access denied"); break;
+        case ERROR_CANCELLED:         PrintError("cancelled"); break;
+        case ERROR_NOT_ENOUGH_MEMORY: PrintError("out of memory"); break;
+        case ERROR_SHARING_VIOLATION: PrintError("sharing violation"); break;
+        default:                      PrintError("error code %u", e); break;
         }
     }
 
diff --git a/PresentMon/TraceSession.cpp b/PresentMon/TraceSession.cpp
@@ -44,13 +44,13 @@ bool StartTraceSession()
         if (args.mStopExistingSession) {
             PrintWarning(
                 "warning: a trace session named \"%s\" is already running and it will be stopped.\n"
-                "         Use -session_name with a different name to start a new session.\n",
+                "         Use -session_name with a different name to start a new session.",
                 args.mSessionName);
         } else {
             PrintError(
                 "error: a trace session named \"%s\" is already running. Use -stop_existing_session\n"
                 "       to stop the existing session, or use -session_name with a different name to\n"
-                "       start a new session.\n",
+                "       start a new session.",
                 args.mSessionName);
             delete gPMConsumer;
             delete gMRConsumer;
@@ -67,21 +67,20 @@ bool StartTraceSession()
 
     // Report error if we failed to start a new session
     if (status != ERROR_SUCCESS) {
-        PrintError("error: failed to start trace session");
+        PrintErrorNoNewLine("error: failed to start trace session: ");
         switch (status) {
-        case ERROR_FILE_NOT_FOUND:    PrintError(" (file not found)"); break;
-        case ERROR_PATH_NOT_FOUND:    PrintError(" (path not found)"); break;
-        case ERROR_BAD_PATHNAME:      PrintError(" (invalid --session_name)"); break;
-        case ERROR_ACCESS_DENIED:     PrintError(" (access denied)"); break;
-        case ERROR_FILE_CORRUPT:      PrintError(" (invalid --etl_file)"); break;
-        default:                      PrintError(" (error=%lu)", status); break;
+        case ERROR_FILE_NOT_FOUND:    PrintError(" file not found"); break;
+        case ERROR_PATH_NOT_FOUND:    PrintError(" path not found"); break;
+        case ERROR_BAD_PATHNAME:      PrintError(" invalid --session_name"); break;
+        case ERROR_ACCESS_DENIED:     PrintError(" access denied"); break;
+        case ERROR_FILE_CORRUPT:      PrintError(" invalid --etl_file"); break;
+        default:                      PrintError(" error code %lu", status); break;
         }
-        PrintError(".\n");
 
         if (status == ERROR_ACCESS_DENIED && !InPerfLogUsersGroup()) {
             PrintError(
                 "       PresentMon requires either administrative privileges or to be run by a user in the\n"
-                "       \"Performance Log Users\" user group.  View the readme for more details.\n");
+                "       \"Performance Log Users\" user group.  View the readme for more details.");
         }
 
         delete gPMConsumer;
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ There are also several other programs that build on this functionality and/or he
 - [Microsoft PIX on Windows System Monitor](https://devblogs.microsoft.com/pix/system-monitor/)
 - [NVIDIA FrameView](https://www.nvidia.com/en-us/geforce/technologies/frameview/)
 
-Binaries for the main releases of PresentMon are provided on [intel.com](game.intel.com/story/intel-presentmon/) or [github.com](https://github.com/GameTechDev/PresentMon/releases/latest) ([list of all releases](https://github.com/GameTechDev/PresentMon/releases)).
+Binaries for the main releases of PresentMon are provided on [intel.com](https://game.intel.com/story/intel-presentmon/) or [github.com](https://github.com/GameTechDev/PresentMon/releases/latest) ([list of all releases](https://github.com/GameTechDev/PresentMon/releases)).
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for information on how to request features, report issues, or contribute code changes.
 
diff --git a/Tools/PresentBench.exe b/Tools/PresentBench.exe
diff --git a/Tools/start_etl_collection.cmd b/Tools/start_etl_collection.cmd

Original file line number	Diff line number	Diff line change
`@@ -465,8 +465,8 @@ void VerboseTraceEventImpl(PMTraceConsumer* pmConsumer, EVENT_RECORD* eventRecor`
`465`	`465`	`if (hdr.ProviderId == Microsoft_Windows_Kernel_Process::GUID) {`
`466`	`466`	`using namespace Microsoft_Windows_Kernel_Process;`
`467`	`467`	`switch (hdr.EventDescriptor.Id) {`
`468`		`- case ProcessStart_Start::Id: PrintEventHeader(eventRecord, metadata, "ProcessStart", { L"ImageName", PrintWString }); break;`
`469`		`- case ProcessStop_Stop::Id: PrintEventHeader(eventRecord, metadata, "ProcessStop", { L"ImageName", PrintString }); break;`
	`468`	`+ case ProcessStart_Start::Id: PrintEventHeader(eventRecord, metadata, "ProcessStart", { L"ProcessID", PrintU32, L"ImageName", PrintWString }); break;`
	`469`	`+ case ProcessStop_Stop::Id: PrintEventHeader(eventRecord, metadata, "ProcessStop", { L"ProcessID", PrintU32, L"ImageName", PrintString }); break;`
`470`	`470`	`}`
`471`	`471`	`return;`
`472`	`472`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,17 +151,17 @@ bool ParseKeyName(KeyNameCode const* valid, size_t validCount, char* name, char`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- int col = PrintError("error: %s '%s'.\nValid options (case insensitive):", errorMessage, name);`
	`154`	`+ int col = PrintErrorNoNewLine("error: %s '%s'.\nValid options (case insensitive):", errorMessage, name);`
`155`	`155`
`156`	`156`	`size_t consoleWidth = GetConsoleWidth();`
`157`	`157`	`for (size_t i = 0; i < validCount; ++i) {`
`158`	`158`	`auto len = strlen(valid[i].mName);`
`159`	`159`	`if (col + len + 1 > consoleWidth) {`
`160`		`- col = PrintError("\n ") - 1;`
	`160`	`+ col = PrintErrorNoNewLine("\n ") - 1;`
`161`	`161`	`}`
`162`		`- col += PrintError(" %s", valid[i].mName);`
	`162`	`+ col += PrintErrorNoNewLine(" %s", valid[i].mName);`
`163`	`163`	`}`
`164`		`- PrintError("\n");`
	`164`	`+ fprintf(stderr, "\n");`
`165`	`165`
`166`	`166`	`return false;`
`167`	`167`	`}`
`@@ -193,11 +193,11 @@ bool AssignHotkey(char* key, CommandLineArgs* args)`
`193`	`193`	`void SetCaptureAll(CommandLineArgs* args)`
`194`	`194`	`{`
`195`	`195`	`if (!args->mTargetProcessNames.empty()) {`
`196`		`- PrintWarning("warning: -captureall elides all previous -process_name arguments.\n");`
	`196`	`+ PrintWarning("warning: -captureall elides all previous -process_name arguments.");`
`197`	`197`	`args->mTargetProcessNames.clear();`
`198`	`198`	`}`
`199`	`199`	`if (args->mTargetPid != 0) {`
`200`		`- PrintWarning("warning: -captureall elides all previous -process_id arguments.\n");`
	`200`	`+ PrintWarning("warning: -captureall elides all previous -process_id arguments.");`
`201`	`201`	`args->mTargetPid = 0;`
`202`	`202`	`}`
`203`	`203`	`}`
`@@ -234,7 +234,7 @@ bool ParseValue(char** argv, int argc, int* i)`
`234`	`234`	`*i += 1;`
`235`	`235`	`return true;`
`236`	`236`	`}`
`237`		`- PrintError("error: %s expecting argument.\n", argv[*i]);`
	`237`	`+ PrintError("error: %s expecting argument.", argv[*i]);`
`238`	`238`	`return false;`
`239`	`239`	`}`
`240`	`240`
`@@ -413,7 +413,7 @@ bool ParseCommandLine(int argc, char** argv)`
`413`	`413`
`414`	`414`	`// Provided argument wasn't recognized`
`415`	`415`	`else if (!(ParseArg(argv[i], "?") \|\| ParseArg(argv[i], "h") \|\| ParseArg(argv[i], "help"))) {`
`416`		`- PrintError("error: unrecognized argument '%s'.\n", argv[i]);`
	`416`	`+ PrintError("error: unrecognized argument '%s'.", argv[i]);`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`PrintHelp();`
`@@ -422,32 +422,32 @@ bool ParseCommandLine(int argc, char** argv)`
`422`	`422`
`423`	`423`	`// Handle deprecated command line arguments`
`424`	`424`	`if (DEPRECATED_simple) {`
`425`		`- PrintWarning("warning: -simple command line argument has been deprecated; using -no_track_display instead.\n");`
	`425`	`+ PrintWarning("warning: -simple command line argument has been deprecated; using -no_track_display instead.");`
`426`	`426`	`args->mTrackDisplay = false;`
`427`	`427`	`}`
`428`	`428`	`if (DEPRECATED_verbose) {`
`429`		`- PrintWarning("warning: -verbose command line argument has been deprecated; using -track_debug instead.\n");`
	`429`	`+ PrintWarning("warning: -verbose command line argument has been deprecated; using -track_debug instead.");`
`430`	`430`	`args->mTrackDebug = true;`
`431`	`431`	`}`
`432`	`432`	`if (DEPRECATED_wmr) {`
`433`		`- PrintWarning("warning: -include_mixed_reality command line argument has been deprecated; using -track_mixed_reality instead.\n");`
	`433`	`+ PrintWarning("warning: -include_mixed_reality command line argument has been deprecated; using -track_mixed_reality instead.");`
`434`	`434`	`args->mTrackWMR = true;`
`435`	`435`	`}`
`436`	`436`	`if (DEPRECATED_dontRestart) {`
`437`		`- PrintWarning("warning: -dont_restart_as_admin command line argument has been deprecated; it is now the default behaviour.\n");`
	`437`	`+ PrintWarning("warning: -dont_restart_as_admin command line argument has been deprecated; it is now the default behaviour.");`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`// Ignore -no_track_display if required for other requested tracking`
`441`	`441`	`if (args->mTrackDebug && !args->mTrackDisplay) {`
`442`		`- PrintWarning("warning: -track_debug requires display tracking; ignoring -no_track_display.\n");`
	`442`	`+ PrintWarning("warning: -track_debug requires display tracking; ignoring -no_track_display.");`
`443`	`443`	`args->mTrackDisplay = true;`
`444`	`444`	`}`
`445`	`445`	`if (args->mTrackGPU && !args->mTrackDisplay) {`
`446`		`- PrintWarning("warning: -track_gpu requires display tracking; ignoring -no_track_display.\n");`
	`446`	`+ PrintWarning("warning: -track_gpu requires display tracking; ignoring -no_track_display.");`
`447`	`447`	`args->mTrackDisplay = true;`
`448`	`448`	`}`
`449`	`449`	`if (args->mTrackGPUVideo && !args->mTrackDisplay) {`
`450`		`- PrintWarning("warning: -track_gpu_video requires display tracking; ignoring -no_track_display.\n");`
	`450`	`+ PrintWarning("warning: -track_gpu_video requires display tracking; ignoring -no_track_display.");`
`451`	`451`	`args->mTrackDisplay = true;`
`452`	`452`	`}`
`453`	`453`
`@@ -459,7 +459,7 @@ bool ParseCommandLine(int argc, char** argv)`
`459`	`459`
`460`	`460`	`// -date_time is mutually exclusive to -qpc_time and -qpc_time_s`
`461`	`461`	`if (args->mOutputDateTime && (args->mOutputQpcTime \|\| args->mOutputQpcTimeInSeconds)) {`
`462`		`- PrintError("error: -date_time and -qpc_time or -qpc_time_s cannot be used at the same time.\n");`
	`462`	`+ PrintError("error: -date_time and -qpc_time or -qpc_time_s cannot be used at the same time.");`
`463`	`463`	`PrintHelp();`
`464`	`464`	`return false;`
`465`	`465`	`}`
`@@ -469,13 +469,13 @@ bool ParseCommandLine(int argc, char** argv)`
`469`	`469`	`if ((args->mHotkeyModifiers & MOD_CONTROL) != 0 && (`
`470`	`470`	`args->mHotkeyVirtualKeyCode == 0x44 /C/ \|\|`
`471`	`471`	`args->mHotkeyVirtualKeyCode == VK_SCROLL)) {`
`472`		`- PrintError("error: CTRL+C or CTRL+SCROLL cannot be used as a -hotkey, they are reserved for terminating the trace.\n");`
	`472`	`+ PrintError("error: CTRL+C or CTRL+SCROLL cannot be used as a -hotkey, they are reserved for terminating the trace.");`
`473`	`473`	`PrintHelp();`
`474`	`474`	`return false;`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`if (args->mHotkeyModifiers == MOD_NOREPEAT && args->mHotkeyVirtualKeyCode == VK_F12) {`
`478`		`- PrintError("error: 'F12' cannot be used as a -hotkey, it is reserved for the debugger.\n");`
	`478`	`+ PrintError("error: 'F12' cannot be used as a -hotkey, it is reserved for the debugger.");`
`479`	`479`	`PrintHelp();`
`480`	`480`	`return false;`
`481`	`481`	`}`
`@@ -485,24 +485,24 @@ bool ParseCommandLine(int argc, char** argv)`
`485`	`485`	`// -output_file, or -output_stdout if they are also used.`
`486`	`486`	`if (!args->mOutputCsvToFile) {`
`487`	`487`	`if (args->mOutputQpcTime) {`
`488`		`- PrintWarning("warning: -qpc_time and -qpc_time_s are only relevant for CSV output; ignoring due to -no_csv.\n");`
	`488`	`+ PrintWarning("warning: -qpc_time and -qpc_time_s are only relevant for CSV output; ignoring due to -no_csv.");`
`489`	`489`	`args->mOutputQpcTime = false;`
`490`	`490`	`args->mOutputQpcTimeInSeconds = false;`
`491`	`491`	`}`
`492`	`492`	`if (args->mOutputDateTime) {`
`493`		`- PrintWarning("warning: -date_time is only relevant for CSV output; ignoring due to -no_csv.\n");`
	`493`	`+ PrintWarning("warning: -date_time is only relevant for CSV output; ignoring due to -no_csv.");`
`494`	`494`	`args->mOutputDateTime = false;`
`495`	`495`	`}`
`496`	`496`	`if (args->mMultiCsv) {`
`497`		`- PrintWarning("warning: -multi_csv and -no_csv arguments are not compatible; ignoring -multi_csv.\n");`
	`497`	`+ PrintWarning("warning: -multi_csv and -no_csv arguments are not compatible; ignoring -multi_csv.");`
`498`	`498`	`args->mMultiCsv = false;`
`499`	`499`	`}`
`500`	`500`	`if (args->mOutputCsvFileName != nullptr) {`
`501`		`- PrintWarning("warning: -output_file and -no_csv arguments are not compatible; ignoring -output_file.\n");`
	`501`	`+ PrintWarning("warning: -output_file and -no_csv arguments are not compatible; ignoring -output_file.");`
`502`	`502`	`args->mOutputCsvFileName = nullptr;`
`503`	`503`	`}`
`504`	`504`	`if (args->mOutputCsvToStdout) {`
`505`		`- PrintWarning("warning: -output_stdout and -no_csv arguments are not compatible; ignoring -output_stdout.\n");`
	`505`	`+ PrintWarning("warning: -output_stdout and -no_csv arguments are not compatible; ignoring -output_stdout.");`
`506`	`506`	`args->mOutputCsvToStdout = false;`
`507`	`507`	`}`
`508`	`508`	`}`
`@@ -517,18 +517,18 @@ bool ParseCommandLine(int argc, char** argv)`
`517`	`517`	`args->mConsoleOutputType = ConsoleOutput::None;`
`518`	`518`
`519`	`519`	`if (args->mOutputCsvFileName != nullptr) {`
`520`		`- PrintError("error: only one of -output_file or -output_stdout arguments can be used.\n");`
	`520`	`+ PrintError("error: only one of -output_file or -output_stdout arguments can be used.");`
`521`	`521`	`PrintHelp();`
`522`	`522`	`return false;`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`if (args->mMultiCsv) {`
`526`		`- PrintWarning("warning: -multi_csv and -output_stdout are not compatible; ignoring -multi_csv.\n");`
	`526`	`+ PrintWarning("warning: -multi_csv and -output_stdout are not compatible; ignoring -multi_csv.");`
`527`	`527`	`args->mMultiCsv = false;`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`if (args->mTrackWMR) {`
`531`		`- PrintWarning("warning: -track_mixed_reality and -output_stdout are not compatible; ignoring -track_mixed_reality.\n");`
	`531`	`+ PrintWarning("warning: -track_mixed_reality and -output_stdout are not compatible; ignoring -track_mixed_reality.");`
`532`	`532`	`args->mTrackWMR = false;`
`533`	`533`	`}`
`534`	`534`	`}`
`@@ -544,15 +544,15 @@ bool ParseCommandLine(int argc, char** argv)`
`544`	`544`	`// Try to initialize the console, and warn if we're not going to be able to`
`545`	`545`	`// do the advanced display as requested.`
`546`	`546`	`if (args->mConsoleOutputType == ConsoleOutput::Full && !IsConsoleInitialized()) {`
`547`		`- PrintWarning("warning: could not initialize console display; continuing with -no_top.\n");`
	`547`	`+ PrintWarning("warning: could not initialize console display; continuing with -no_top.");`
`548`	`548`	`args->mConsoleOutputType = ConsoleOutput::Simple;`
`549`	`549`	`}`
`550`	`550`
`551`	`551`	`// If -terminate_existing, warn about any normal arguments since we'll just`
`552`	`552`	`// be stopping an existing session and then exiting.`
`553`	`553`	`if (args->mTerminateExisting && argc != 2) {`
`554`	`554`	`PrintWarning("warning: -terminate_existing exits without capturing anything; ignoring all capture,\n"`
`555`		`- " output, and recording arguments.\n");`
	`555`	`+ " output, and recording arguments.");`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`// Convert the provided process names into a canonical form used for comparison.`
Original file line number	Diff line number	Diff line change
`@@ -571,10 +571,10 @@ void Output()`
`571`	`571`	`ULONG buffersLost = 0;`
`572`	`572`	`CheckLostReports(&eventsLost, &buffersLost);`
`573`	`573`	`if (buffersLost > 0) {`
`574`		`- PrintWarning("warning: %lu ETW buffers were lost.\n", buffersLost);`
	`574`	`+ PrintWarning("warning: %lu ETW buffers were lost.", buffersLost);`
`575`	`575`	`}`
`576`	`576`	`if (eventsLost > 0) {`
`577`		`- PrintWarning("warning: %lu ETW events were lost.\n", eventsLost);`
	`577`	`+ PrintWarning("warning: %lu ETW events were lost.", eventsLost);`
`578`	`578`	`}`
`579`	`579`
`580`	`580`	`// Close all CSV and process handles`