Add 3 additional error messages

Add additional information to 3 error senarios when launching a different profile in the ConptyConnection. - Requires Elevation - CTRL+C - Bad Command or File Not Found closes microsoft#7186
halldk · Jan 26, 2025 · 556a641 · 556a641
1 parent 08f9afe
commit 556a641
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/cascadia/TerminalConnection/ConptyConnection.cpp b/src/cascadia/TerminalConnection/ConptyConnection.cpp
@@ -428,6 +428,28 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             TerminalOutput.raise(L"\r\n");
             TerminalOutput.raise(badPathText);
         }
+        // If the requested action requires elevation, display appropriate message
+        else if (hr == HRESULT_FROM_WIN32(ERROR_ELEVATION_REQUIRED))
+        {
+            const auto elevationText = RS_(L"ElevationRequired");
+            TerminalOutput.raise(L"\r\n");
+            TerminalOutput.raise(elevationText);
+        }
+        // If a stop signal (ctrl+c) is detected, display appropriate message
+        else if (hr == HRESULT_FROM_NT(STATUS_CONTROL_C_EXIT))
+        {
+            const auto ctrlCText = RS_(L"CtrlCToClose");
+            TerminalOutput.raise(L"\r\n");
+            TerminalOutput.raise(ctrlCText);
+        }
+        // If the command or file is invalid, display appropriate message
+        else if (hr == HRESULT_FROM_WIN32(ERROR_BAD_COMMAND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
+        {
+            const auto badCommandText = RS_fmt(L"BadCommandOrFile", _commandline);
+            TerminalOutput.raise(L"\r\n");
+            TerminalOutput.raise(badCommandText);
+        }
+
 
         _transitionToState(ConnectionState::Failed);
 

diff --git a/src/cascadia/TerminalConnection/Resources/en-US/Resources.resw b/src/cascadia/TerminalConnection/Resources/en-US/Resources.resw
@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>You can now close this terminal with Ctrl+D, or press Enter to restart.</value>
-	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[error {0} when launching `{1}']</value>
@@ -220,4 +220,14 @@
     <value>Could not access starting directory "{0}"</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-</root>
+  <data name="ElevationRequired" xml:space="preserve">
+    <value>The requested operation requires elevation.</value>
+  </data>
+  <data name="CtrlCToClose" xml:space="preserve">
+    <value>{Application Exit by CTRL+C} The application terminated as a result of a CTRL+C.</value>
+  </data>
+  <data name="BadCommandOrFile" xml:space="preserve">
+    <value>{0} is not recognized as an internal or external command, operable program or batch file.</value>
+    <comment>The first argument {0} is the command or file, as provided by the user</comment>
+  </data>
+</root>