mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 11:48:06 +01:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This PR fixes an issue where context menu runtime registration wasn't properly cleaned up when GPO (Group Policy Object) policies disabled the module. The problem occurred because the module constructor didn't consider GPO policies when determining its initial enabled state. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #41387 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed This pull request refactors how context menu registration and unregistration are handled across several PowerToys modules. The main improvement is the introduction of a new `UpdateRegistration` helper method in each module, which centralizes and simplifies the logic for registering or unregistering context menus when the module is enabled or disabled. This reduces code duplication and ensures consistent behavior. **Context menu registration logic refactor:** * Added a private `UpdateRegistration` method to each of the following modules to handle context menu registration and unregistration based on the enabled state: - `FileLocksmithModule` in `PowerToysModule.cpp` - `NewModule` in `powertoys_module.cpp` - `ImageResizerModule` in `dllmain.cpp` - `PowerRenameModule` in `dllmain.cpp` * Replaced direct calls to registration/unregistration functions in `enable`, `disable`, and `init_settings` methods with calls to the new `UpdateRegistration` method in all affected modules, ensuring consistent and centralized handling [[1]](diffhunk://#diff-256ed936dafec1bf6ff17849b4797dd276f5b07bebe2e483bc1580c8f06e92d9L91-R122) [[2]](diffhunk://#diff-256ed936dafec1bf6ff17849b4797dd276f5b07bebe2e483bc1580c8f06e92d9R155) [[3]](diffhunk://#diff-4a3942d548f3daec02a833983ed9b2b69f75e2cd1b74a8ce1b874f3fd33fde55L101-R125) [[4]](diffhunk://#diff-4a3942d548f3daec02a833983ed9b2b69f75e2cd1b74a8ce1b874f3fd33fde55L153-R177) [[5]](diffhunk://#diff-0c0a89e812ff4625d165417da14f1c3f203e5ac7907555ae4fde122f3dddcf7aL115-L130) [[6]](diffhunk://#diff-34581ec47c37b0d2e1d9b59696225c47342930694e732db06cbdf653ceb2c2d7L205-R234) [[7]](diffhunk://#diff-34581ec47c37b0d2e1d9b59696225c47342930694e732db06cbdf653ceb2c2d7R334). These changes improve maintainability and reduce the risk of inconsistent registration behavior across modules. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
172 lines
5.0 KiB
C++
172 lines
5.0 KiB
C++
#include "pch.h"
|
|
|
|
#include <interface/powertoy_module_interface.h>
|
|
#include <common/SettingsAPI/settings_objects.h>
|
|
#include <common/logger/logger.h>
|
|
#include <common/logger/logger_settings.h>
|
|
#include <common/utils/logger_helper.h>
|
|
#include <common/utils/package.h>
|
|
#include <common/utils/process_path.h>
|
|
#include <optional>
|
|
|
|
#include "FileLocksmithLib/Constants.h"
|
|
#include "FileLocksmithLib/Settings.h"
|
|
#include "FileLocksmithLib/Trace.h"
|
|
#include "RuntimeRegistration.h"
|
|
|
|
#include "dllmain.h"
|
|
#include "Generated Files/resource.h"
|
|
|
|
class FileLocksmithModule : public PowertoyModuleIface
|
|
{
|
|
private:
|
|
// Update registration based on enabled state
|
|
void UpdateRegistration(bool enabled)
|
|
{
|
|
if (enabled)
|
|
{
|
|
#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
|
|
FileLocksmithRuntimeRegistration::EnsureRegistered();
|
|
Logger::info(L"File Locksmith context menu registered");
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
|
|
FileLocksmithRuntimeRegistration::Unregister();
|
|
Logger::info(L"File Locksmith context menu unregistered");
|
|
#endif
|
|
}
|
|
}
|
|
|
|
public:
|
|
FileLocksmithModule()
|
|
{
|
|
LoggerHelpers::init_logger(constants::nonlocalizable::PowerToyName, L"ModuleInterface", LogSettings::fileLocksmithLoggerName);
|
|
init_settings();
|
|
}
|
|
|
|
virtual const wchar_t* get_name() override
|
|
{
|
|
static WCHAR buffer[128];
|
|
LoadStringW(globals::instance, IDS_FILELOCKSMITH_POWERTOYNAME, buffer, ARRAYSIZE(buffer));
|
|
return buffer;
|
|
}
|
|
|
|
virtual const wchar_t* get_key() override
|
|
{
|
|
return constants::nonlocalizable::PowerToyKey;
|
|
}
|
|
|
|
// Return the configured status for the gpo policy for the module
|
|
virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
|
|
{
|
|
return powertoys_gpo::getConfiguredFileLocksmithEnabledValue();
|
|
}
|
|
|
|
// Return JSON with the configuration options.
|
|
// These are the settings shown on the settings page along with their current values.
|
|
virtual bool get_config(_Out_ PWSTR buffer, _Out_ int* buffer_size) override
|
|
{
|
|
HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
|
|
|
|
// Create a Settings object.
|
|
PowerToysSettings::Settings settings(hinstance, get_name());
|
|
|
|
return settings.serialize_to_buffer(buffer, buffer_size);
|
|
}
|
|
|
|
// Passes JSON with the configuration settings for the powertoy.
|
|
// This is called when the user hits Save on the settings page.
|
|
virtual void set_config(PCWSTR config) override
|
|
{
|
|
try
|
|
{
|
|
// Parse the input JSON string.
|
|
PowerToysSettings::PowerToyValues values =
|
|
PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
|
|
|
|
toggle_extended_only(values.get_bool_value(L"bool_show_extended_menu").value());
|
|
save_settings();
|
|
}
|
|
catch (std::exception& e)
|
|
{
|
|
Logger::error("Configuration parsing failed: {}", std::string{ e.what() });
|
|
}
|
|
}
|
|
|
|
virtual void enable() override
|
|
{
|
|
Logger::info(L"File Locksmith enabled");
|
|
|
|
if (package::IsWin11OrGreater())
|
|
{
|
|
std::wstring path = get_module_folderpath(globals::instance);
|
|
std::wstring packageUri = path + L"\\FileLocksmithContextMenuPackage.msix";
|
|
if (!package::IsPackageRegisteredWithPowerToysVersion(constants::nonlocalizable::ContextMenuPackageName))
|
|
{
|
|
package::RegisterSparsePackage(path, packageUri);
|
|
}
|
|
}
|
|
|
|
m_enabled = true;
|
|
UpdateRegistration(m_enabled);
|
|
}
|
|
|
|
virtual void disable() override
|
|
{
|
|
Logger::info(L"File Locksmith disabled");
|
|
m_enabled = false;
|
|
UpdateRegistration(m_enabled);
|
|
}
|
|
|
|
virtual bool is_enabled() override
|
|
{
|
|
return m_enabled;
|
|
}
|
|
|
|
virtual void toggle_extended_only(bool extended_only)
|
|
{
|
|
Logger::info(L"File Locksmith toggle extended only");
|
|
m_extended_only = extended_only;
|
|
save_settings();
|
|
}
|
|
|
|
virtual bool is_extended_only()
|
|
{
|
|
return m_extended_only;
|
|
}
|
|
|
|
virtual void destroy() override
|
|
{
|
|
delete this;
|
|
}
|
|
|
|
private:
|
|
bool m_enabled = false;
|
|
bool m_extended_only;
|
|
|
|
void init_settings()
|
|
{
|
|
m_enabled = FileLocksmithSettingsInstance().GetEnabled();
|
|
m_extended_only = FileLocksmithSettingsInstance().GetShowInExtendedContextMenu();
|
|
UpdateRegistration(m_enabled);
|
|
Trace::EnableFileLocksmith(m_enabled);
|
|
}
|
|
|
|
void save_settings()
|
|
{
|
|
auto& settings = FileLocksmithSettingsInstance();
|
|
m_enabled = FileLocksmithSettingsInstance().GetEnabled();
|
|
settings.SetExtendedContextMenuOnly(m_extended_only);
|
|
|
|
settings.Save();
|
|
Trace::EnableFileLocksmith(m_enabled);
|
|
}
|
|
};
|
|
|
|
extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
|
|
{
|
|
return new FileLocksmithModule();
|
|
}
|