diff --git a/src/runner/auto_start_helper.cpp b/src/runner/auto_start_helper.cpp index e437cb484f..47e47804da 100644 --- a/src/runner/auto_start_helper.cpp +++ b/src/runner/auto_start_helper.cpp @@ -33,7 +33,7 @@ const DWORD USERNAME_DOMAIN_LEN = DNLEN + UNLEN + 2; // Domain Name + '\' + User Name + '\0' const DWORD USERNAME_LEN = UNLEN + 1; // User Name + '\0' -bool create_auto_start_task_for_this_user(bool runEvelvated) +bool create_auto_start_task_for_this_user(bool runElevated) { HRESULT hr = S_OK; @@ -215,7 +215,7 @@ bool create_auto_start_task_for_this_user(bool runEvelvated) hr = pPrincipal->put_LogonType(TASK_LOGON_INTERACTIVE_TOKEN); - if (runEvelvated) + if (runElevated) { hr = pPrincipal->put_RunLevel(_TASK_RUNLEVEL::TASK_RUNLEVEL_HIGHEST); } diff --git a/src/runner/auto_start_helper.h b/src/runner/auto_start_helper.h index fbadab553e..fb2b68fadf 100644 --- a/src/runner/auto_start_helper.h +++ b/src/runner/auto_start_helper.h @@ -1,5 +1,5 @@ #pragma once bool is_auto_start_task_active_for_this_user(); -bool create_auto_start_task_for_this_user(bool runEvelvated); +bool create_auto_start_task_for_this_user(bool runElevated); bool delete_auto_start_task_for_this_user(); diff --git a/src/runner/main.cpp b/src/runner/main.cpp index d1c20fd438..cb8e46f38b 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -346,7 +346,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { // Singletons initialization order needs to be preserved, first events and // then modules to guarantee the reverse destruction order. - SystemMenuHelperInstace(); + SystemMenuHelperInstance(); powertoys_events(); modules(); diff --git a/src/runner/powertoy_module.cpp b/src/runner/powertoy_module.cpp index f141bcaa14..73df324d02 100644 --- a/src/runner/powertoy_module.cpp +++ b/src/runner/powertoy_module.cpp @@ -22,7 +22,7 @@ PowertoyModule load_powertoy(const std::wstring& filename) FreeLibrary(handle); winrt::throw_last_error(); } - module->register_system_menu_helper(&SystemMenuHelperInstace()); + module->register_system_menu_helper(&SystemMenuHelperInstance()); return PowertoyModule(module, handle); } @@ -51,7 +51,7 @@ PowertoyModule::PowertoyModule(PowertoyModuleIface* module, HMODULE handle) : powertoys_events().register_receiver(*want_signals, module); } } - if (SystemMenuHelperInstace().HasCustomConfig(module)) + if (SystemMenuHelperInstance().HasCustomConfig(module)) { powertoys_events().register_system_menu_action(module); } diff --git a/src/runner/powertoys_events.cpp b/src/runner/powertoys_events.cpp index f5680b6b7a..a557c4832d 100644 --- a/src/runner/powertoys_events.cpp +++ b/src/runner/powertoys_events.cpp @@ -62,7 +62,7 @@ void PowertoysEvents::unregister_system_menu_action(PowertoyModuleIface* module) auto it = system_menu_receivers.find(module); if (it != system_menu_receivers.end()) { - SystemMenuHelperInstace().Reset(module); + SystemMenuHelperInstance().Reset(module); system_menu_receivers.erase(it); } } @@ -73,18 +73,18 @@ void PowertoysEvents::handle_system_menu_action(const WinHookEvent& data) { for (auto& module : system_menu_receivers) { - SystemMenuHelperInstace().Customize(module, data.hwnd); + SystemMenuHelperInstance().Customize(module, data.hwnd); } } else if (data.event == EVENT_OBJECT_INVOKED) { - if (PowertoyModuleIface * module{ SystemMenuHelperInstace().ModuleFromItemId(data.idChild) }) + if (PowertoyModuleIface * module{ SystemMenuHelperInstance().ModuleFromItemId(data.idChild) }) { - std::wstring itemName = SystemMenuHelperInstace().ItemNameFromItemId(data.idChild); + std::wstring itemName = SystemMenuHelperInstance().ItemNameFromItemId(data.idChild); // Process event on specified system menu item by responsible module. module->signal_system_menu_action(itemName.c_str()); // Process event on specified system menu item by system menu helper (check/uncheck if needed). - SystemMenuHelperInstace().ProcessSelectedItem(module, GetForegroundWindow(), itemName.c_str()); + SystemMenuHelperInstance().ProcessSelectedItem(module, GetForegroundWindow(), itemName.c_str()); } } } diff --git a/src/runner/system_menu_helper.cpp b/src/runner/system_menu_helper.cpp index 18026c014d..c8da06860f 100644 --- a/src/runner/system_menu_helper.cpp +++ b/src/runner/system_menu_helper.cpp @@ -15,7 +15,7 @@ namespace } } -SystemMenuHelper& SystemMenuHelperInstace() +SystemMenuHelper& SystemMenuHelperInstance() { static SystemMenuHelper instance; return instance; diff --git a/src/runner/system_menu_helper.h b/src/runner/system_menu_helper.h index 09e4c0b931..e2c125a4b5 100644 --- a/src/runner/system_menu_helper.h +++ b/src/runner/system_menu_helper.h @@ -40,4 +40,4 @@ private: std::unordered_map> Configurations{}; }; -SystemMenuHelper& SystemMenuHelperInstace(); +SystemMenuHelper& SystemMenuHelperInstance(); diff --git a/src/settings/main.cpp b/src/settings/main.cpp index 4f304449e4..35dcea4bc8 100644 --- a/src/settings/main.cpp +++ b/src/settings/main.cpp @@ -511,7 +511,7 @@ bool initialize_com_security_policy_for_webview() return false; } - on_scope_exit free_realtive_sd([&] { + on_scope_exit free_relative_sd([&] { LocalFree(self_relative_sd); }); diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs index 3e2927e295..9c8ceec813 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs @@ -316,7 +316,7 @@ namespace PowerToysTests public void TestCleanup() { CloseEditor(); - ResetDefautZoneSettings(false); + ResetDefaultZoneSettings(false); } } } \ No newline at end of file diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs index a74b1d43bc..345c628f1c 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs @@ -158,7 +158,7 @@ namespace PowerToysTests { Setup(context, false); ResetDefaultFancyZonesSettings(false); - ResetDefautZoneSettings(true); + ResetDefaultZoneSettings(true); } [ClassCleanup] @@ -195,7 +195,7 @@ namespace PowerToysTests //editor has already closed } - ResetDefautZoneSettings(false); + ResetDefaultZoneSettings(false); } } } \ No newline at end of file diff --git a/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs b/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs index beb8dd3694..678897e83d 100644 --- a/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs +++ b/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs @@ -11,7 +11,7 @@ namespace PowerToysTests protected static void ResetSettings() { ResetDefaultFancyZonesSettings(false); - ResetDefautZoneSettings(true); + ResetDefaultZoneSettings(true); } protected static void OpenEditor() diff --git a/src/tests/win-app-driver/PowerToysSession.cs b/src/tests/win-app-driver/PowerToysSession.cs index 23c4caa8b2..8977269a08 100644 --- a/src/tests/win-app-driver/PowerToysSession.cs +++ b/src/tests/win-app-driver/PowerToysSession.cs @@ -213,7 +213,7 @@ namespace PowerToysTests ResetSettings(_settingsFolderPath, _settingsPath, _defaultSettings, relaunch); } - public static void ResetDefautZoneSettings(bool relaunch) + public static void ResetDefaultZoneSettings(bool relaunch) { ResetSettings(_settingsFolderPath, _zoneSettingsPath, _defaultZoneSettings, relaunch); }