fix spellcheck

jefflord · Feb 7, 2024 · d4ae22b · d4ae22b
1 parent 77f60e3
commit d4ae22b
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 96 deletions.
diff --git a/.github/actions/spell-check/allow/names.txt b/.github/actions/spell-check/allow/names.txt
@@ -99,6 +99,7 @@ Pooja
 Quriz
 randyrants
 ricardosantos
+ritchielawrence
 robmikh
 Rutkas
 ryanbodrug
@@ -128,6 +129,7 @@ Zykova
 
 # OTHERS
 
+cmdow
 Controlz
 cortana
 fancymouse

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -99,6 +99,7 @@ bbwe
 bck
 BESTEFFORT
 bhid
+BIF
 bigbar
 bigobj
 binlog
@@ -125,6 +126,7 @@ BPBF
 bpmf
 bpp
 Browsable
+BROWSEINFO
 bsd
 bthprops
 bti
@@ -212,6 +214,7 @@ cominterop
 commandline
 COMMANDTITLE
 commctrl
+commdlg
 compmgmt
 COMPOSITIONFULL
 comsupp
@@ -471,6 +474,7 @@ FILELOCKSMITH
 FILELOCKSMITHEXT
 FILELOCKSMITHLIB
 FILELOCKSMITHLIBINTEROP
+FILEMUSTEXIST
 FILEOP
 FILEOS
 FILESUBTYPE
@@ -799,13 +803,15 @@ LPCTSTR
 lpdw
 lpfn
 LPINPUT
+LPITEMIDLIST
 lpmi
 LPMINMAXINFO
 LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
 LPSAFEARRAY
+lpstr
 lpsz
 lpt
 LPTHREAD
@@ -969,6 +975,7 @@ netsetup
 netsh
 newcolor
 newdev
+NEWDIALOGSTYLE
 newitem
 newpath
 newrow
@@ -1039,6 +1046,7 @@ ocr
 Ocrsettings
 odbccp
 officehubintl
+OFN
 ofs
 oldcolor
 olditem
@@ -1049,6 +1057,7 @@ OLECHAR
 onebranch
 OOBEPT
 opencode
+OPENFILENAME
 opensource
 openxmlformats
 OPTIMIZEFORINVOKE
@@ -1083,6 +1092,7 @@ parray
 PARTIALCONFIRMATIONDIALOGTITLE
 PATCOPY
 pathcch
+PATHMUSTEXIST
 Pathto
 PATINVERT
 PATPAINT
@@ -1171,6 +1181,7 @@ PRINTCLIENT
 printmanagement
 prm
 proactively
+PROCESSENTRY
 PROCESSKEY
 processthreadsapi
 PRODEXT
@@ -1290,6 +1301,7 @@ RESTORETOMAXIMIZED
 restrictedcapabilities
 restrictederrorinfo
 resultlist
+RETURNONLYFSDIRS
 RGBQUAD
 rgbs
 rgelt
@@ -1434,6 +1446,7 @@ sln
 SMALLICON
 smartphone
 SMTO
+SNAPPROCESS
 snwprintf
 softline
 SOURCECLIENTAREAONLY
@@ -1576,6 +1589,7 @@ tlbimp
 TMPVAR
 TNP
 toggleswitch
+Toolhelp
 toolkitconverters
 Toolset
 toolwindow
@@ -1632,6 +1646,7 @@ Updatelayout
 UPGRADINGPRODUCTCODE
 Uptool
 urld
+urlmon
 Usb
 USEDEFAULT
 USEFILEATTRIBUTES
@@ -1707,6 +1722,7 @@ wcautil
 WCE
 wcex
 WClass
+wcsicmp
 wcsnicmp
 WDA
 wdp

diff --git a/src/common/utils/elevation.h b/src/common/utils/elevation.h
@@ -213,7 +213,7 @@ inline HANDLE run_as_different_user(const std::wstring& file, const std::wstring
     Logger::info(L"run_elevated with params={}", params);
     SHELLEXECUTEINFOW exec_info = { 0 };
     exec_info.cbSize = sizeof(SHELLEXECUTEINFOW);
-    exec_info.lpVerb = L"runasuser";
+    exec_info.lpVerb = L"runAsUser";
     exec_info.lpFile = file.c_str();
     exec_info.lpParameters = params.c_str();
     exec_info.hwnd = 0;

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/Resources.resx b/src/modules/keyboardmanager/KeyboardManagerEditor/Resources.resx
@@ -244,7 +244,7 @@
     <value>Edit shortcuts to activate and then configure the actions to happen when activated.</value>
     <comment>Key on a keyboard</comment>
   </data>
-  <data name="EditSingleShortcut_Info" xml:space="preserve">
+  <data name="Edit_Single_Shortcut_Info" xml:space="preserve">
     <value>Edit shortcut to activate and then configure the action to happen when activated.</value>
     <comment>Key on a keyboard</comment>
   </data>
@@ -284,10 +284,10 @@
   <data name="EditShortcuts_Allow_Chords" xml:space="preserve">
     <value>Allow chords</value>
   </data>
-  <data name="EditShortcuts_PathToProgram" xml:space="preserve">
+  <data name="EditShortcuts_Path_To_Program" xml:space="preserve">
     <value>Path to program</value>
   </data>
-  <data name="EditShortcuts_UriExample" xml:space="preserve">
+  <data name="EditShortcuts_Uri_Example" xml:space="preserve">
     <value>E.g.: https://website.url</value>
   </data>
   <data name="EditShortcuts_What_Can_I_Use_Link" xml:space="preserve">

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
@@ -473,7 +473,7 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
         headerText.Text(GET_RESOURCE_STRING(IDS_EDIT_THIS_SHORTCUT_WINDOWNAME));
         addShortcut.Visibility(Visibility::Collapsed);
         headerText.Visibility(Visibility::Collapsed);
-        shortcutRemapInfoHeader.Text(GET_RESOURCE_STRING(IDS_EDITSINGLESHORTCUT_INFO));
+        shortcutRemapInfoHeader.Text(GET_RESOURCE_STRING(IDS_EDIT_SINGLE_SHORTCUT_INFO));
 
         StackPanel tempSp;
 

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
@@ -597,7 +597,7 @@ StackPanel SetupOpenURIControls(StackPanel& parent, StackPanel& row, Shortcut& s
     int runProgramLabelWidth = 80;
 
     uriTextBox.Text(shortCut.uriToOpen);
-    uriTextBox.PlaceholderText(GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_URIEXAMPLE));
+    uriTextBox.PlaceholderText(GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_URI_EXAMPLE));
     uriTextBox.Margin(textInputMargin);
     uriTextBox.Width(EditorConstants::TableDropDownHeight);
     uriTextBox.HorizontalAlignment(HorizontalAlignment::Left);
@@ -660,7 +660,7 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
     StackPanel stackPanelForRunProgramPath;
     StackPanel stackPanelRunProgramStartInDir;
 
-    runProgramPathInput.PlaceholderText(GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_PATHTOPROGRAM));
+    runProgramPathInput.PlaceholderText(GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_PATH_TO_PROGRAM));
 
     runProgramPathInput.Margin(textInputMargin);
 
@@ -837,24 +837,24 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
             return;
         }
 
-        OPENFILENAME ofn;
+        OPENFILENAME openFileName;
         TCHAR szFile[260] = { 0 };
 
-        ZeroMemory(&ofn, sizeof(ofn));
-        ofn.lStructSize = sizeof(ofn);
-        ofn.hwndOwner = NULL;
-        ofn.lpstrFile = szFile;
-        ofn.nMaxFile = sizeof(szFile);
-        ofn.lpstrFilter = TEXT("All Files (*.*)\0*.*\0");
-        ofn.nFilterIndex = 1;
-        ofn.lpstrFileTitle = NULL;
-        ofn.nMaxFileTitle = 0;
-        ofn.lpstrInitialDir = NULL;
-        ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+        ZeroMemory(&openFileName, sizeof(openFileName));
+        openFileName.lStructSize = sizeof(openFileName);
+        openFileName.hwndOwner = NULL;
+        openFileName.lpstrFile = szFile;
+        openFileName.nMaxFile = sizeof(szFile);
+        openFileName.lpstrFilter = TEXT("All Files (*.*)\0*.*\0");
+        openFileName.nFilterIndex = 1;
+        openFileName.lpstrFileTitle = NULL;
+        openFileName.nMaxFileTitle = 0;
+        openFileName.lpstrInitialDir = NULL;
+        openFileName.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
 
         auto runProgramPathInput = row.FindName(L"runProgramPathInput_" + std::to_wstring(rowIndex)).as<TextBox>();
 
-        if (GetOpenFileName(&ofn) == TRUE)
+        if (GetOpenFileName(&openFileName) == TRUE)
         {
             runProgramPathInput.Text(szFile);
         }