mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 11:17:53 +01:00
[PTRun]Remove unneeded registry key from installer (#27011)
This commit is contained in:
@@ -106,14 +106,6 @@
|
|||||||
<?define PowerToysImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\PowerToys\Images\?>
|
<?define PowerToysImagesCmpFilesPath=$(var.BinDir)modules\launcher\Plugins\PowerToys\Images\?>
|
||||||
|
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<Component Id="launcherShortcutComponent" Directory="LauncherInstallFolder" >
|
|
||||||
<!-- Toast Notification AUMID -->
|
|
||||||
<RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AppUserModelId\PowerToysRun">
|
|
||||||
<RegistryValue Type="string" Name="DisplayName" Value="PowerToys Run" />
|
|
||||||
<RegistryValue Type="string" Name="IconUri" Value="[LauncherImagesFolder]RunAsset.ico" />
|
|
||||||
</RegistryKey>
|
|
||||||
</Component>
|
|
||||||
|
|
||||||
<DirectoryRef Id="LauncherInstallFolder" FileSource="$(var.launcherFilesPath)">
|
<DirectoryRef Id="LauncherInstallFolder" FileSource="$(var.launcherFilesPath)">
|
||||||
<!-- Generated by generateFileComponents.ps1 -->
|
<!-- Generated by generateFileComponents.ps1 -->
|
||||||
<!--launcherFiles_Component_Def-->
|
<!--launcherFiles_Component_Def-->
|
||||||
@@ -374,7 +366,6 @@
|
|||||||
<RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
|
<RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
|
||||||
<RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
|
<RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
|
||||||
</Component>
|
</Component>
|
||||||
<ComponentRef Id="launcherShortcutComponent" />
|
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
</Wix>
|
</Wix>
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ namespace // Strings in this namespace should not be localized
|
|||||||
constexpr std::wstring_view TASK_NAME = L"PowerToysBackgroundNotificationsHandler";
|
constexpr std::wstring_view TASK_NAME = L"PowerToysBackgroundNotificationsHandler";
|
||||||
constexpr std::wstring_view TASK_ENTRYPOINT = L"BackgroundActivator.BackgroundHandler";
|
constexpr std::wstring_view TASK_ENTRYPOINT = L"BackgroundActivator.BackgroundHandler";
|
||||||
constexpr std::wstring_view PACKAGED_APPLICATION_ID = L"PowerToys";
|
constexpr std::wstring_view PACKAGED_APPLICATION_ID = L"PowerToys";
|
||||||
constexpr std::wstring_view APPIDS_REGISTRY = LR"(Software\Classes\AppUserModelId\)";
|
|
||||||
|
|
||||||
std::wstring APPLICATION_ID = L"Microsoft.PowerToysWin32";
|
std::wstring APPLICATION_ID = L"Microsoft.PowerToysWin32";
|
||||||
constexpr std::wstring_view DEFAULT_TOAST_GROUP = L"PowerToysToastTag";
|
constexpr std::wstring_view DEFAULT_TOAST_GROUP = L"PowerToysToastTag";
|
||||||
@@ -132,68 +131,6 @@ void notifications::run_desktop_app_activator_loop()
|
|||||||
CoRevokeClassObject(token);
|
CoRevokeClassObject(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool notifications::register_application_id(const std::wstring_view appName, const std::wstring_view iconPath)
|
|
||||||
{
|
|
||||||
std::wstring aumidPath{ APPIDS_REGISTRY };
|
|
||||||
aumidPath += APPLICATION_ID;
|
|
||||||
wil::unique_hkey aumidKey;
|
|
||||||
if (FAILED(RegCreateKeyW(HKEY_CURRENT_USER, aumidPath.c_str(), &aumidKey)))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (FAILED(RegSetKeyValueW(aumidKey.get(),
|
|
||||||
nullptr,
|
|
||||||
L"DisplayName",
|
|
||||||
REG_SZ,
|
|
||||||
appName.data(),
|
|
||||||
static_cast<DWORD>((size(appName) + 1) * sizeof(wchar_t)))))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(RegSetKeyValueW(aumidKey.get(),
|
|
||||||
nullptr,
|
|
||||||
L"IconUri",
|
|
||||||
REG_SZ,
|
|
||||||
iconPath.data(),
|
|
||||||
static_cast<DWORD>((size(iconPath) + 1) * sizeof(wchar_t)))))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::wstring_view iconColor = L"FFDDDDDD";
|
|
||||||
if (FAILED(RegSetKeyValueW(aumidKey.get(),
|
|
||||||
nullptr,
|
|
||||||
L"IconBackgroundColor",
|
|
||||||
REG_SZ,
|
|
||||||
iconColor.data(),
|
|
||||||
static_cast<DWORD>((size(iconColor) + 1) * sizeof(wchar_t)))))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void notifications::unregister_application_id()
|
|
||||||
{
|
|
||||||
std::wstring aumidPath{ APPIDS_REGISTRY };
|
|
||||||
aumidPath += APPLICATION_ID;
|
|
||||||
wil::unique_hkey registryRoot;
|
|
||||||
RegOpenKeyW(HKEY_CURRENT_USER, aumidPath.c_str(), ®istryRoot);
|
|
||||||
if (!registryRoot)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
RegDeleteTreeW(registryRoot.get(), nullptr);
|
|
||||||
registryRoot.reset();
|
|
||||||
RegOpenKeyW(HKEY_CURRENT_USER, APPIDS_REGISTRY.data(), ®istryRoot);
|
|
||||||
if (!registryRoot)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
RegDeleteKeyW(registryRoot.get(), APPLICATION_ID.data());
|
|
||||||
}
|
|
||||||
|
|
||||||
void notifications::override_application_id(const std::wstring_view appID)
|
void notifications::override_application_id(const std::wstring_view appID)
|
||||||
{
|
{
|
||||||
APPLICATION_ID = appID;
|
APPLICATION_ID = appID;
|
||||||
|
|||||||
@@ -14,9 +14,6 @@ namespace notifications
|
|||||||
void override_application_id(const std::wstring_view appID);
|
void override_application_id(const std::wstring_view appID);
|
||||||
void run_desktop_app_activator_loop();
|
void run_desktop_app_activator_loop();
|
||||||
|
|
||||||
bool register_application_id(const std::wstring_view appName, const std::wstring_view iconPath);
|
|
||||||
void unregister_application_id();
|
|
||||||
|
|
||||||
struct snooze_duration
|
struct snooze_duration
|
||||||
{
|
{
|
||||||
std::wstring label;
|
std::wstring label;
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ namespace
|
|||||||
{ HKEY_CLASSES_ROOT, L"CLSID\\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\\InprocServer32" },
|
{ HKEY_CLASSES_ROOT, L"CLSID\\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\\InprocServer32" },
|
||||||
{ HKEY_CLASSES_ROOT, L"CLSID\\{0440049F-D1DC-4E46-B27B-98393D79486B}" },
|
{ HKEY_CLASSES_ROOT, L"CLSID\\{0440049F-D1DC-4E46-B27B-98393D79486B}" },
|
||||||
{ HKEY_CLASSES_ROOT, L"AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\PowerRenameExt" },
|
{ HKEY_CLASSES_ROOT, L"AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\PowerRenameExt" },
|
||||||
{ HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\AppUserModelId\\PowerToysRun" },
|
|
||||||
{ HKEY_CLASSES_ROOT, L".svg\\shellex\\{8895b1c6-b41f-4c1c-a562-0d564250836f}" },
|
{ HKEY_CLASSES_ROOT, L".svg\\shellex\\{8895b1c6-b41f-4c1c-a562-0d564250836f}" },
|
||||||
{ HKEY_CLASSES_ROOT, L".svg\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}" },
|
{ HKEY_CLASSES_ROOT, L".svg\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}" },
|
||||||
{ HKEY_CLASSES_ROOT, L".md\\shellex\\{8895b1c6-b41f-4c1c-a562-0d564250836f}" },
|
{ HKEY_CLASSES_ROOT, L".md\\shellex\\{8895b1c6-b41f-4c1c-a562-0d564250836f}" },
|
||||||
|
|||||||
Reference in New Issue
Block a user