diff --git a/doc/devdocs/modules/newplus.md b/doc/devdocs/modules/newplus.md index 51aba0e913ec..a1d5be0ca0f7 100644 --- a/doc/devdocs/modules/newplus.md +++ b/doc/devdocs/modules/newplus.md @@ -141,3 +141,10 @@ Note: The DllHost process loads the DLL only when the context menu is triggered - A signature issue with the MSIX package - For development and testing, using the Windows 10 handler can be easier since it doesn't require signing. + +## Restoring Built-in Windows New context menu +If the Windows 11 built-in New context menu doesn't reappear on uninstalling PowerToys, some issue with settings etc. here's how to restore the built-in New context menu. + +1. Open Registry Editor +1. Go to the key "Computer\HKEY_CURRENT_USER\Software\Classes\Directory\background\ShellEx\ContextMenuHandlers" +1. Delete the "New" subkey (i.e. fullpath "Computer\HKEY_CURRENT_USER\Software\Classes\Directory\background\ShellEx\ContextMenuHandlers\New") \ No newline at end of file diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp index 73af14ca0ed4..39786a16d886 100644 --- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp +++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp @@ -1119,6 +1119,35 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall) return WcaFinalize(er); } +UINT __stdcall RestoreBuiltInNewContextMenuCA(MSIHANDLE hInstall) +{ + HRESULT hr = S_OK; + hr = WcaInitialize(hInstall, "RestoreBuiltInNewContextMenuCA"); + + constexpr wchar_t built_in_new_registry_path[] = LR"(Software\Classes\Directory\Background\ShellEx\ContextMenuHandlers\New)"; + + HKEY key{}; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + built_in_new_registry_path, + 0, + KEY_ALL_ACCESS, + &key) != ERROR_SUCCESS) + { + return WcaFinalize(ERROR_SUCCESS); + } + + if (RegDeleteValueW(key, nullptr) != ERROR_SUCCESS) + { + RegCloseKey(key); + return WcaFinalize(ERROR_SUCCESS); + } + + RegCloseKey(key); + + return WcaFinalize(ERROR_SUCCESS); +} + UINT __stdcall TelemetryLogInstallSuccessCA(MSIHANDLE hInstall) { HRESULT hr = S_OK; diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def index 4bad107f1601..86efe34aa6b9 100644 --- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def +++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def @@ -7,6 +7,7 @@ EXPORTS ApplyModulesRegistryChangeSetsCA DetectPrevInstallPathCA RemoveScheduledTasksCA + RestoreBuiltInNewContextMenuCA TelemetryLogInstallSuccessCA TelemetryLogInstallCancelCA TelemetryLogInstallFailCA diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs index 7e89a35ac41a..584d61c4497f 100644 --- a/installer/PowerToysSetupVNext/Product.wxs +++ b/installer/PowerToysSetupVNext/Product.wxs @@ -161,6 +161,9 @@ + + + @@ -262,6 +265,8 @@ + + diff --git a/src/common/GPOWrapper/GPOWrapper.cpp b/src/common/GPOWrapper/GPOWrapper.cpp index 1132df959940..1b035a9a7ebf 100644 --- a/src/common/GPOWrapper/GPOWrapper.cpp +++ b/src/common/GPOWrapper/GPOWrapper.cpp @@ -292,4 +292,8 @@ namespace winrt::PowerToys::GPOWrapper::implementation { return static_cast(powertoys_gpo::getConfiguredRunAtStartupValue()); } + GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusHideBuiltInNewContextMenuValue() + { + return static_cast(powertoys_gpo::getConfiguredNewPlusHideBuiltInNewContextMenuValue()); + } } diff --git a/src/common/GPOWrapper/GPOWrapper.h b/src/common/GPOWrapper/GPOWrapper.h index aceb3bf75661..e5d8fa9884c3 100644 --- a/src/common/GPOWrapper/GPOWrapper.h +++ b/src/common/GPOWrapper/GPOWrapper.h @@ -78,6 +78,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation static GpoRuleConfigured GetAllowDataDiagnosticsValue(); static GpoRuleConfigured GetConfiguredRunAtStartupValue(); static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue(); + static GpoRuleConfigured GetConfiguredNewPlusHideBuiltInNewContextMenuValue(); }; } diff --git a/src/common/GPOWrapper/GPOWrapper.idl b/src/common/GPOWrapper/GPOWrapper.idl index 58c35cd97734..6f60761b6670 100644 --- a/src/common/GPOWrapper/GPOWrapper.idl +++ b/src/common/GPOWrapper/GPOWrapper.idl @@ -82,6 +82,7 @@ namespace PowerToys static GpoRuleConfigured GetAllowDataDiagnosticsValue(); static GpoRuleConfigured GetConfiguredRunAtStartupValue(); static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue(); + static GpoRuleConfigured GetConfiguredNewPlusHideBuiltInNewContextMenuValue(); } } } diff --git a/src/common/utils/gpo.h b/src/common/utils/gpo.h index 0b2611b0762c..4a5a48eb7a34 100644 --- a/src/common/utils/gpo.h +++ b/src/common/utils/gpo.h @@ -103,6 +103,7 @@ namespace powertoys_gpo const std::wstring POLICY_MWB_POLICY_DEFINED_IP_MAPPING_RULES = L"MwbPolicyDefinedIpMappingRules"; const std::wstring POLICY_NEW_PLUS_HIDE_TEMPLATE_FILENAME_EXTENSION = L"NewPlusHideTemplateFilenameExtension"; const std::wstring POLICY_NEW_PLUS_REPLACE_VARIABLES = L"NewPlusReplaceVariablesInTemplateFilenames"; + const std::wstring POLICY_NEW_PLUS_HIDE_BUILT_IN_NEW_CONTEXT_MENU = L"NewPlusHideBuiltInNewContextMenu"; // Methods used for reading the registry #pragma region ReadRegistryMethods @@ -700,5 +701,10 @@ namespace powertoys_gpo return getConfiguredValue(POLICY_NEW_PLUS_REPLACE_VARIABLES); } + inline gpo_rule_configured_t getConfiguredNewPlusHideBuiltInNewContextMenuValue() + { + return getConfiguredValue(POLICY_NEW_PLUS_HIDE_BUILT_IN_NEW_CONTEXT_MENU); + } + #pragma endregion IndividualModuleSettingPolicies } diff --git a/src/gpo/assets/PowerToys.admx b/src/gpo/assets/PowerToys.admx index be7d07fabd5b..aed7ab9ad75c 100644 --- a/src/gpo/assets/PowerToys.admx +++ b/src/gpo/assets/PowerToys.admx @@ -1,11 +1,11 @@ - + - + @@ -28,6 +28,7 @@ + @@ -826,5 +827,15 @@ + + + + + + + + + + diff --git a/src/gpo/assets/en-US/PowerToys.adml b/src/gpo/assets/en-US/PowerToys.adml index fa5db5ed093f..bd7465326a18 100644 --- a/src/gpo/assets/en-US/PowerToys.adml +++ b/src/gpo/assets/en-US/PowerToys.adml @@ -35,6 +35,7 @@ PowerToys version 0.90.0 or later PowerToys version 0.96.0 or later PowerToys version 0.97.0 or later + PowerToys version 0.98.0 or later From PowerToys version 0.64.0 until PowerToys version 0.87.1 This policy configures the enabled state for all PowerToys utilities. @@ -238,7 +239,7 @@ If you disable this policy, the setting is disabled and variables in filenames w If you don't configure this policy, the user will be able to control the setting and can enable or disable it. - + Configure global utility enabled state Advanced Paste: Configure enabled state Always On Top: Configure enabled state @@ -356,6 +357,15 @@ If you disable this policy, users will not be able to select or use Foundry Loca Allow sending diagnostic data Configure the run at startup setting Replace variables in template filenames + Hide the built-in "New" context menu + This policy configures if Windows' built-in New context menu should be hidden on the context menu. + +If you enable this policy, then the built-in New context menu will be hidden, and user can only create new files and folders using New+ and the explorer toolbar New button. + +If you disable this policy, then the build-in New context menu will be displayed as normal in Windows. + +If you don't configure this policy, the user will be able to control the setting and can enable or disable it. + @@ -369,4 +379,3 @@ If you disable this policy, users will not be able to select or use Foundry Loca - diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/constants.h b/src/modules/NewPlus/NewShellExtensionContextMenu/constants.h index aa9fcee88ca8..262b6709856a 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu/constants.h +++ b/src/modules/NewPlus/NewShellExtensionContextMenu/constants.h @@ -18,6 +18,8 @@ namespace newplus::constants::non_localizable constexpr WCHAR settings_json_key_template_location[] = L"TemplateLocation"; + constexpr WCHAR settings_json_key_hide_built_in_new[] = L"BuiltInNewHidePreference"; + constexpr WCHAR context_menu_package_name[] = L"NewPlusContextMenu"; constexpr WCHAR msix_package_name[] = L"NewPlusPackage.msix"; diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h b/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h index 02874ab8f312..a2e6d7e03673 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h +++ b/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h @@ -446,4 +446,69 @@ namespace newplus::utilities return hr; } + + constexpr wchar_t built_in_new_registry_path[] = LR"(Software\Classes\Directory\Background\ShellEx\ContextMenuHandlers\New)"; + constexpr wchar_t built_in_new_registry_disabled_value_prefix[] = L"disabled_"; + + inline bool disable_built_in_new_via_registry() + { + // This is implemented to support where New+ GPO is configured to + // hide the built-in New context menu but Settings UI hasn't been launched + // Mirrors the logic in DisableBuiltInNewViaRegistry in .cs + + HKEY key{}; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, + built_in_new_registry_path, + 0, + nullptr, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + nullptr, + &key, + nullptr) != ERROR_SUCCESS) + { + return false; + } + + const auto built_in_new_registry_disabled_value_prefix_len = lstrlenW(built_in_new_registry_disabled_value_prefix); + + if (RegSetValueExW(key, nullptr, 0, REG_SZ, reinterpret_cast(&built_in_new_registry_disabled_value_prefix), built_in_new_registry_disabled_value_prefix_len) != ERROR_SUCCESS) + { + RegCloseKey(key); + return true; + } + + RegCloseKey(key); + return false; + + } + + inline bool enable_built_in_new_via_registry() + { + // This is implemented to support where New+ GPO is configured to + // display the built-in New context menu but Settings UI hasn't been launched + // Mirrors the logic in EnableBuiltInNewViaRegistry in .cs + + HKEY key{}; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + built_in_new_registry_path, + 0, + KEY_ALL_ACCESS, + &key) != ERROR_SUCCESS) + { + return true; + } + + if (RegDeleteValueW(key, nullptr) != ERROR_SUCCESS) + { + RegCloseKey(key); + return true; + } + + RegCloseKey(key); + return false; + + } } diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp b/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp index b63b755d8650..b25d8213c636 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp +++ b/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp @@ -172,7 +172,22 @@ class NewModule : public PowertoyModuleIface void init_settings() { powertoy_new_enabled = NewSettingsInstance().GetEnabled(); + UpdateRegistration(powertoy_new_enabled); + + if (powertoy_new_enabled) + { + // NOTE: This requires that the runner is running and have loaded the new plus module. + // It's not enough for user to just invoke the context menu. + if (NewSettingsInstance().GetHideBuiltInNew()) + { + newplus::utilities::disable_built_in_new_via_registry(); + } + else + { + newplus::utilities::enable_built_in_new_via_registry(); + } + } } }; diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/settings.cpp b/src/modules/NewPlus/NewShellExtensionContextMenu/settings.cpp index cb2d1b4c3c47..9aba8da4ca7e 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu/settings.cpp +++ b/src/modules/NewPlus/NewShellExtensionContextMenu/settings.cpp @@ -45,6 +45,7 @@ void NewSettings::Save() values.add_property(newplus::constants::non_localizable::settings_json_key_hide_starting_digits, new_settings.hide_starting_digits); values.add_property(newplus::constants::non_localizable::settings_json_key_replace_variables, new_settings.replace_variables); values.add_property(newplus::constants::non_localizable::settings_json_key_template_location, new_settings.template_location); + values.add_property(newplus::constants::non_localizable::settings_json_key_hide_built_in_new, new_settings.hide_built_in_new_preference); values.save_to_settings_file(); @@ -75,6 +76,9 @@ void NewSettings::InitializeWithDefaultSettings() SetReplaceVariables(false); SetTemplateLocation(GetTemplateLocationDefaultPath()); + + // By default we show the built-in New context menu + SetHideBuiltInNew(false); } void NewSettings::RefreshEnabledState() @@ -149,6 +153,12 @@ void NewSettings::ParseJson() new_settings.replace_variables = resolveVariables.value(); } + const auto hideBuiltInNewValue = settings.get_bool_value(newplus::constants::non_localizable::settings_json_key_hide_built_in_new); + if (hideBuiltInNewValue.has_value()) + { + new_settings.hide_built_in_new_preference = hideBuiltInNewValue.value(); + } + GetSystemTimeAsFileTime(&new_settings_last_loaded_timestamp); } @@ -239,6 +249,26 @@ std::wstring NewSettings::GetTemplateLocationDefaultPath() const return full_path; } +bool NewSettings::GetHideBuiltInNew() +{ + const auto gpoSetting = powertoys_gpo::getConfiguredNewPlusHideBuiltInNewContextMenuValue(); + if (gpoSetting == powertoys_gpo::gpo_rule_configured_enabled) + { + return true; + } + else if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled) + { + return false; + } + + return new_settings.hide_built_in_new_preference; +} + +void NewSettings::SetHideBuiltInNew(const bool hide_built_in_new) +{ + new_settings.hide_built_in_new_preference = hide_built_in_new; +} + NewSettings& NewSettingsInstance() { static NewSettings instance; diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/settings.h b/src/modules/NewPlus/NewShellExtensionContextMenu/settings.h index 10ebd96a4d44..fb8447eb7db5 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu/settings.h +++ b/src/modules/NewPlus/NewShellExtensionContextMenu/settings.h @@ -16,6 +16,8 @@ class NewSettings void SetReplaceVariables(const bool resolve_variables); std::wstring GetTemplateLocation() const; void SetTemplateLocation(const std::wstring template_location); + bool GetHideBuiltInNew(); + void SetHideBuiltInNew(const bool hide_built_in_new); void Save(); void Load(); @@ -29,6 +31,7 @@ class NewSettings bool hide_starting_digits{ true }; bool replace_variables{ true }; std::wstring template_location; + bool hide_built_in_new_preference{ false }; }; void RefreshEnabledState(); diff --git a/src/settings-ui/Settings.UI.Library/NewPlusProperties.cs b/src/settings-ui/Settings.UI.Library/NewPlusProperties.cs index c2ad8cc32833..4399d72738f8 100644 --- a/src/settings-ui/Settings.UI.Library/NewPlusProperties.cs +++ b/src/settings-ui/Settings.UI.Library/NewPlusProperties.cs @@ -19,6 +19,7 @@ public NewPlusProperties() HideStartingDigits = new BoolProperty(true); TemplateLocation = new StringProperty(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "PowerToys", "NewPlus", "Templates")); ReplaceVariables = new BoolProperty(false); + BuiltInNewHidePreference = new BoolProperty(false); } [JsonPropertyName("HideFileExtension")] @@ -33,6 +34,9 @@ public NewPlusProperties() [JsonPropertyName("ReplaceVariables")] public BoolProperty ReplaceVariables { get; set; } + [JsonPropertyName("BuiltInNewHidePreference")] + public BoolProperty BuiltInNewHidePreference { get; set; } + public override string ToString() => JsonSerializer.Serialize(this, SettingsSerializationContext.Default.NewPlusProperties); } } diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml index d837f35c3f08..b9e524868928 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml @@ -69,8 +69,8 @@ IsOn="{x:Bind ViewModel.HideFileExtension, Mode=TwoWay}" /> - + + + + + + + diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index 6b2fd3646f17..cffb5372be83 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -4382,6 +4382,10 @@ Activate by holding the key for the character you want to add an accent to, then Ignores digits, spaces, and dots at the start of filenames—useful for sorting templates without showing those characters Template filename starting digits settings toggle + + Hide the built-in "New" context menu + Localize New in accordance with Windows New + Behavior New+ behavior related settings label diff --git a/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs index ffb10883bdb4..b34d5c600c40 100644 --- a/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs @@ -9,6 +9,7 @@ using System.Text.Json; using System.Threading.Tasks; using System.Windows; + using global::PowerToys.GPOWrapper; using ManagedCommon; using Microsoft.PowerToys.Settings.UI.Library; @@ -17,7 +18,7 @@ using Microsoft.PowerToys.Settings.UI.Library.Utilities; using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands; using Microsoft.PowerToys.Settings.UI.SerializationContext; - +using Microsoft.Win32; using static Microsoft.PowerToys.Settings.UI.Helpers.ShellGetFolder; namespace Microsoft.PowerToys.Settings.UI.ViewModels @@ -32,6 +33,10 @@ public partial class NewPlusViewModel : Observable private const string ModuleName = NewPlusSettings.ModuleName; + private const string BuiltInNewRegistryPath = @"Software\Classes\Directory\Background\ShellEx\ContextMenuHandlers\New"; + private const string BuiltNewCOMGuid = "{D969A300-E7FF-11d0-A93B-00A0C90F2719}"; + private const string NewDisabledValuePrefix = "disabled_"; + public NewPlusViewModel(SettingsUtils settingsUtils, ISettingsRepository settingsRepository, Func ipcMSGCallBackFunc) { _settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils)); @@ -51,6 +56,8 @@ public NewPlusViewModel(SettingsUtils settingsUtils, ISettingsRepository _isNewPlusEnabled && _replaceVariablesIsGPOConfigured; + public bool IsDisableBuiltInNewSettingsCardEnabled => _isNewPlusEnabled && !_hideBuiltInNewContextMenuToggleSettingGPOConfigured; + + public bool IsNewPlusHideBuiltInNewToggleSettingGPOConfigured => _isNewPlusEnabled && _hideBuiltInNewContextMenuToggleSettingGPOConfigured; + public bool HideStartingDigits { get => _hideStartingDigits; @@ -206,6 +231,48 @@ public bool ReplaceVariables } } + public bool HideBuiltInNew + { + get + { + if (IsNewPlusHideBuiltInNewToggleSettingGPOConfigured) + { + return GPOWrapper.GetConfiguredNewPlusHideBuiltInNewContextMenuValue() == GpoRuleConfigured.Enabled; + } + + return _disableBuiltInNew; + } + + set + { + if (IsNewPlusHideBuiltInNewToggleSettingGPOConfigured) + { + value = GPOWrapper.GetConfiguredNewPlusHideBuiltInNewContextMenuValue() == GpoRuleConfigured.Enabled; + } + + if (_disableBuiltInNew != value) + { + // Update New visibility right now + if (_disableBuiltInNew) + { + EnableBuiltInNewViaRegistry(); + } + else + { + DisableBuiltInNewViaRegistry(); + } + + _disableBuiltInNew = value; + OnPropertyChanged(nameof(HideBuiltInNew)); + + // Set the user preference for New visibility, which we then also use in powertoys_module.cpp to ensure + // that backup/restore of settings work without having to update settings + Settings.Properties.BuiltInNewHidePreference.Value = value; + NotifySettingsChanged(); + } + } + } + public bool IsEnabledGpoConfigured { get => _enabledStateIsGPOConfigured; @@ -271,12 +338,14 @@ public static void CopyTemplateExamples(string templateLocation) private bool _hideFileExtension; private bool _hideStartingDigits; private bool _replaceVariables; + private bool _disableBuiltInNew; // reflects the current state of New visibility private GpoRuleConfigured _enabledGpoRuleConfiguration; private bool _enabledStateIsGPOConfigured; private GpoRuleConfigured _hideFileExtensionGpoRuleConfiguration; private bool _hideFileExtensionIsGPOConfigured; private bool _replaceVariablesIsGPOConfigured; + private bool _hideBuiltInNewContextMenuToggleSettingGPOConfigured; public void RefreshEnabledState() { @@ -317,5 +386,87 @@ private async Task PickFolderDialog() var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.GetSettingsWindow()); return await Task.FromResult(GetFolderDialogWithFlags(hwnd, FolderDialogFlags._BIF_NEWDIALOGSTYLE)); } + + private bool IsBuiltInNewEnabled() + { + try + { + using (var newKey = Registry.CurrentUser.OpenSubKey(BuiltInNewRegistryPath, writable: false)) + { + string builtInNewHandlerValue = newKey.GetValue(null, null) as string; + + if (builtInNewHandlerValue is null || string.Equals(builtInNewHandlerValue, BuiltNewCOMGuid, StringComparison.OrdinalIgnoreCase)) + { + // If no default value for key, or GUID is BuiltNewCOMGuid then built-in New is enabled + return true; + } + + return false; + } + } + catch (Exception ex) + { + Logger.LogError("Failed to determine built-in New enablement status.", ex); + } + + return false; + } + + private void DisableBuiltInNewViaRegistry() + { + try + { + using (var newKey = Registry.CurrentUser.OpenSubKey(BuiltInNewRegistryPath, writable: true)) + { + string builtInNewHandlerValue = newKey.GetValue(null, null) as string; + + if (!string.IsNullOrEmpty(builtInNewHandlerValue) && builtInNewHandlerValue.StartsWith(NewDisabledValuePrefix, StringComparison.OrdinalIgnoreCase)) + { + // Already disabled + return; + } + + // Any string value will disable the built-in New handler + string newDisabledValue = NewDisabledValuePrefix + builtInNewHandlerValue; + newKey.SetValue(string.Empty, newDisabledValue); + } + + HideBuiltInNew = true; + OnPropertyChanged(nameof(HideBuiltInNew)); + } + catch (Exception ex) + { + Logger.LogError("Failed to disable built-in New in the registry.", ex); + MessageBox.Show(ex.Message); + } + } + + private void EnableBuiltInNewViaRegistry() + { + try + { + using (var newKey = Registry.CurrentUser.OpenSubKey(BuiltInNewRegistryPath, writable: true)) + { + string builtInNewHandlerValue = newKey.GetValue(null, null) as string; + + if (builtInNewHandlerValue is null) + { + // Already enabled + return; + } + + // Null key default value enables built-in New handler + newKey.DeleteValue(null, true); + } + + HideBuiltInNew = false; + OnPropertyChanged(nameof(HideBuiltInNew)); + } + catch (Exception ex) + { + Logger.LogError("Failed to enable built-in New in the registry.", ex); + MessageBox.Show(ex.Message); + } + } } }