Move code page check into the DoSrvSet functions.

j4james · Sep 30, 2024 · 8e191f8 · 8e191f8
1 parent ed33afd
commit 8e191f8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/src/host/getset.cpp b/src/host/getset.cpp
@@ -1128,16 +1128,22 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
     CATCH_RETURN();
 }
 
-void DoSrvSetConsoleOutputCodePage(const unsigned int codepage)
+[[nodiscard]] HRESULT DoSrvSetConsoleOutputCodePage(const unsigned int codepage)
 {
     auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
+
+    // Return if it's not known as a valid codepage ID.
+    RETURN_HR_IF(E_INVALIDARG, !(IsValidCodePage(codepage)));
+
     // Do nothing if no change.
     if (gci.OutputCP != codepage)
     {
         // Set new code page
         gci.OutputCP = codepage;
         SetConsoleCPInfo(TRUE);
     }
+
+    return S_OK;
 }
 
 // Routine Description:
@@ -1153,9 +1159,7 @@ void DoSrvSetConsoleOutputCodePage(const unsigned int codepage)
         auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
         LockConsole();
         auto Unlock = wil::scope_exit([&] { UnlockConsole(); });
-        // Return if it's not known as a valid codepage ID.
-        RETURN_HR_IF(E_INVALIDARG, !(IsValidCodePage(codepage)));
-        DoSrvSetConsoleOutputCodePage(codepage);
+        RETURN_IF_FAILED(DoSrvSetConsoleOutputCodePage(codepage));
         // Setting the code page via the API also updates the default value.
         // This is how the initial code page is set to UTF-8 in a WSL shell.
         gci.DefaultOutputCP = codepage;
@@ -1164,16 +1168,22 @@ void DoSrvSetConsoleOutputCodePage(const unsigned int codepage)
     CATCH_RETURN();
 }
 
-void DoSrvSetConsoleInputCodePage(const unsigned int codepage)
+[[nodiscard]] HRESULT DoSrvSetConsoleInputCodePage(const unsigned int codepage)
 {
     auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
+
+    // Return if it's not known as a valid codepage ID.
+    RETURN_HR_IF(E_INVALIDARG, !(IsValidCodePage(codepage)));
+
     // Do nothing if no change.
     if (gci.CP != codepage)
     {
         // Set new code page
         gci.CP = codepage;
         SetConsoleCPInfo(FALSE);
     }
+
+    return S_OK;
 }
 
 // Routine Description:
@@ -1189,9 +1199,7 @@ void DoSrvSetConsoleInputCodePage(const unsigned int codepage)
         auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
         LockConsole();
         auto Unlock = wil::scope_exit([&] { UnlockConsole(); });
-        // Return if it's not known as a valid codepage ID.
-        RETURN_HR_IF(E_INVALIDARG, !(IsValidCodePage(codepage)));
-        DoSrvSetConsoleInputCodePage(codepage);
+        RETURN_IF_FAILED(DoSrvSetConsoleInputCodePage(codepage));
         // Setting the code page via the API also updates the default value.
         // This is how the initial code page is set to UTF-8 in a WSL shell.
         gci.DefaultCP = codepage;

diff --git a/src/host/getset.h b/src/host/getset.h
@@ -18,5 +18,5 @@ Revision History:
 #include "../inc/conattrs.hpp"
 class SCREEN_INFORMATION;
 
-void DoSrvSetConsoleOutputCodePage(const unsigned int codepage);
-void DoSrvSetConsoleInputCodePage(const unsigned int codepage);
+[[nodiscard]] HRESULT DoSrvSetConsoleOutputCodePage(const unsigned int codepage);
+[[nodiscard]] HRESULT DoSrvSetConsoleInputCodePage(const unsigned int codepage);
diff --git a/src/host/outputStream.cpp b/src/host/outputStream.cpp
@@ -228,11 +228,8 @@ void ConhostInternalGetSet::ShowWindow(bool showOrHide)
 // - <none>
 void ConhostInternalGetSet::SetCodePage(const unsigned int codepage)
 {
-    if (IsValidCodePage(codepage))
-    {
-        DoSrvSetConsoleOutputCodePage(codepage);
-        DoSrvSetConsoleInputCodePage(codepage);
-    }
+    LOG_IF_FAILED(DoSrvSetConsoleOutputCodePage(codepage));
+    LOG_IF_FAILED(DoSrvSetConsoleInputCodePage(codepage));
 }
 
 // Routine Description:
@@ -244,8 +241,8 @@ void ConhostInternalGetSet::SetCodePage(const unsigned int codepage)
 void ConhostInternalGetSet::ResetCodePage()
 {
     const auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    DoSrvSetConsoleOutputCodePage(gci.DefaultOutputCP);
-    DoSrvSetConsoleInputCodePage(gci.DefaultCP);
+    LOG_IF_FAILED(DoSrvSetConsoleOutputCodePage(gci.DefaultOutputCP));
+    LOG_IF_FAILED(DoSrvSetConsoleInputCodePage(gci.DefaultCP));
 }
 
 // Routine Description: