Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

installer

Browse Source
This commit is contained in:
seraphima
2024-06-13 22:55:36 +02:00
parent 07ab6191d0
commit 73146e844e
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/PowerToysSetup/Common.wxi
View File

@@ -18,6 +18,7 @@
<?define AdvancedPasteProjectName="AdvancedPaste"?> <?define AdvancedPasteProjectName="AdvancedPaste"?>
<?define RegistryPreviewProjectName="RegistryPreview"?> <?define RegistryPreviewProjectName="RegistryPreview"?>
<?define PeekProjectName="Peek"?> <?define PeekProjectName="Peek"?>
<?define ProjectsProjectName="Projects"?>
<?define RepoDir="$(var.ProjectDir)..\..\" ?> <?define RepoDir="$(var.ProjectDir)..\..\" ?>
<?if $(var.Platform) = x64?> <?if $(var.Platform) = x64?>

9
installer/PowerToysSetup/Resources.wxs
View File

@@ -449,6 +449,15 @@
</RegistryKey> </RegistryKey>
<File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" /> <File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
</Component> </Component>
<Component
Id="ProjectsEditor_$(var.IdSafeLanguage)_Component"
Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
Guid="$(var.CompGUIDPrefix)01">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="ProjectsEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
</RegistryKey>
<File Id="ProjectsEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ProjectsEditor.resources.dll" />
</Component>
<?undef IdSafeLanguage?> <?undef IdSafeLanguage?>
<?undef CompGUIDPrefix?> <?undef CompGUIDPrefix?>
<?endforeach?> <?endforeach?>

5
installer/PowerToysSetupCustomActions/CustomAction.cpp
View File

@@ -1077,7 +1077,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
} }
processes.resize(bytes / sizeof(processes[0])); processes.resize(bytes / sizeof(processes[0]));
std::array<std::wstring_view, 32> processesToTerminate = { std::array<std::wstring_view, 35> processesToTerminate = {
L"PowerToys.PowerLauncher.exe", L"PowerToys.PowerLauncher.exe",
L"PowerToys.Settings.exe", L"PowerToys.Settings.exe",
L"PowerToys.AdvancedPaste.exe", L"PowerToys.AdvancedPaste.exe",
@@ -1109,6 +1109,9 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
L"PowerToys.MouseWithoutBordersService.exe", L"PowerToys.MouseWithoutBordersService.exe",
L"PowerToys.CropAndLock.exe", L"PowerToys.CropAndLock.exe",
L"PowerToys.EnvironmentVariables.exe", L"PowerToys.EnvironmentVariables.exe",
L"PowerToys.ProjectsSnapshotTool.exe",
L"PowerToys.ProjectsLauncher.exe",
L"PowerToys.ProjectsEditor.exe",
L"PowerToys.exe", L"PowerToys.exe",
}; };