Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 19:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Setup] Always elevate bootstrapper to avoid multiple UAC prompts on upgrade

Browse Source
This commit is contained in:
yuyoyuppe
2021-10-22 03:55:46 +03:00
committed by Andrey Nekrasov
parent 092ee49139
commit 59108365f1
7 changed files with 88 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installer/PowerToysSetupCustomActions/CustomAction.cpp
View File

@@ -52,11 +52,11 @@ UINT __stdcall ApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
ExitOnFailure(hr, "Failed to initialize");
hr = getInstallFolder(hInstall, installationFolder);
ExitOnFailure(hr, "Failed to get installfolder.");
for (const auto& changeset : getAllModulesChangesets(installationFolder, false))
for (const auto& changeSet : getAllModulesChangeSets(installationFolder, false))
{
if (!changeset.apply())
if (!changeSet.apply())
{
WcaLog(LOGMSG_STANDARD, "Couldn't apply registry changeset");
WcaLog(LOGMSG_STANDARD, "Couldn't apply registry changeSet");
}
}
@@ -77,9 +77,9 @@ UINT __stdcall UnApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
ExitOnFailure(hr, "Failed to initialize");
hr = getInstallFolder(hInstall, installationFolder);
ExitOnFailure(hr, "Failed to get installfolder.");
for (const auto& changeset : getAllModulesChangesets(installationFolder, false))
for (const auto& changeSet : getAllModulesChangeSets(installationFolder, false))
{
changeset.unapply();
changeSet.unApply();
}
ExitOnFailure(hr, "Failed to extract msix");