[Analyzers][CPP]Turn on warning 26427 (microsoft#22743)

Cazaea · Dec 18, 2022 · d1b55d9 · d1b55d9
1 parent 2f6d512
commit d1b55d9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CppRuleSet.ruleset b/CppRuleSet.ruleset
@@ -28,7 +28,7 @@
     <Rule Id="C26417" Action="Info" />
     <Rule Id="C26418" Action="Info" />
     <Rule Id="C26426" Action="Info" />
-    <Rule Id="C26427" Action="Info" />
+    <Rule Id="C26427" Action="Error" />
     <Rule Id="C26429" Action="Info" />
     <Rule Id="C26430" Action="Info" />
     <Rule Id="C26431" Action="Info" />

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/BufferValidationHelpers.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/BufferValidationHelpers.cpp
@@ -233,7 +233,7 @@ namespace BufferValidationHelpers
 
             // Convert app name to lower case
             std::transform(appName.begin(), appName.end(), appName.begin(), towlower);
-            std::wstring lowercaseDefAppName = KeyboardManagerEditorStrings::DefaultAppName;
+            std::wstring lowercaseDefAppName = KeyboardManagerEditorStrings::DefaultAppName();
             std::transform(lowercaseDefAppName.begin(), lowercaseDefAppName.end(), lowercaseDefAppName.begin(), towlower);
             if (appName == lowercaseDefAppName)
             {

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyDropDownControl.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyDropDownControl.cpp
@@ -268,7 +268,7 @@ void KeyDropDownControl::SetSelectionHandler(StackPanel& table, StackPanel row,
             if (targetApp != nullptr)
             {
                 std::wstring newText = targetApp.Text().c_str();
-                std::wstring lowercaseDefAppName = KeyboardManagerEditorStrings::DefaultAppName;
+                std::wstring lowercaseDefAppName = KeyboardManagerEditorStrings::DefaultAppName();
                 std::transform(newText.begin(), newText.end(), newText.begin(), towlower);
                 std::transform(lowercaseDefAppName.begin(), lowercaseDefAppName.end(), lowercaseDefAppName.begin(), towlower);
                 if (newText == lowercaseDefAppName)

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorStrings.h b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorStrings.h
@@ -7,7 +7,10 @@
 namespace KeyboardManagerEditorStrings
 {
     // String constant for the default app name in Remap shortcuts
-    inline const std::wstring DefaultAppName = GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_ALLAPPS);
+    inline std::wstring DefaultAppName()
+    {
+        return GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_ALLAPPS);
+    }
 
     // Function to return the error message
     winrt::hstring GetErrorMessage(ShortcutErrorType errorType);

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
@@ -120,7 +120,7 @@ void ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, std::vector<s
     row.Children().Append(target);
 
     targetAppTextBox.Width(EditorConstants::ShortcutTableDropDownWidth);
-    targetAppTextBox.PlaceholderText(KeyboardManagerEditorStrings::DefaultAppName);
+    targetAppTextBox.PlaceholderText(KeyboardManagerEditorStrings::DefaultAppName());
     targetAppTextBox.Text(targetAppName);
 
     // GotFocus handler will be called whenever the user tabs into or clicks on the textbox
@@ -167,7 +167,7 @@ void ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, std::vector<s
             shortcutRemapBuffer[rowIndex].first[1] = tempShortcut;
         }
         std::wstring newText = targetAppTextBox.Text().c_str();
-        std::wstring lowercaseDefAppName = KeyboardManagerEditorStrings::DefaultAppName;
+        std::wstring lowercaseDefAppName = KeyboardManagerEditorStrings::DefaultAppName();
         std::transform(newText.begin(), newText.end(), newText.begin(), towlower);
         std::transform(lowercaseDefAppName.begin(), lowercaseDefAppName.end(), lowercaseDefAppName.begin(), towlower);
         if (newText == lowercaseDefAppName)