mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[Setup] Better prevent FileInUse errors during install (#12512)

Browse Source
This commit is contained in:
Andrey Nekrasov 2021-07-27 01:23:34 +03:00 committed by GitHub
parent b2a86db6de
commit 5e4f50fa45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/expect.txt vendored
View File

@ -1301,6 +1301,7 @@ MSDN
msedge msedge
mshtmdid mshtmdid
msi msi
MSIFASTINSTALL
MSIHANDLE MSIHANDLE
MSIINSTALLER MSIINSTALLER
MSIL MSIL

3
installer/PowerToysSetup/Product.wxs
View File

@ -197,7 +197,8 @@
/> />
<!-- Close 'PowerToys.exe' before uninstall--> <!-- Close 'PowerToys.exe' before uninstall-->
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
<Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
<util:CloseApplication CloseMessage="yes" Target="PowerToys.exe" ElevatedCloseMessage="yes" RebootPrompt="no" TerminateProcess="0" /> <util:CloseApplication CloseMessage="yes" Target="PowerToys.exe" ElevatedCloseMessage="yes" RebootPrompt="no" TerminateProcess="0" />
</Product> </Product>

6
installer/PowerToysSetupCustomActions/CustomAction.cpp
View File

@ -774,10 +774,14 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
} }
processes.resize(bytes / sizeof(processes[0])); processes.resize(bytes / sizeof(processes[0]));
std::array<std::wstring_view, 4> processesToTerminate = { std::array<std::wstring_view, 8> processesToTerminate = {
L"PowerLauncher.exe", L"PowerLauncher.exe",
L"PowerToys.Settings.exe", L"PowerToys.Settings.exe",
L"PowerToys.Awake.exe",
L"PowerToys.FancyZones.exe",
L"Microsoft.PowerToys.Settings.UI.exe", L"Microsoft.PowerToys.Settings.UI.exe",
L"FancyZonesEditor.exe",
L"ColorPickerUI.exe",
L"PowerToys.exe" L"PowerToys.exe"
}; };