nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Windows installer: restore InstallScope setting.

Browse Source 
This reverts commit 0615767224
("Windows installer: remove explicit InstallScope setting"), albeit
with different comments.

The original change worked around a Windows security vulnerability
(CVE-2023-21800), but also resulted in a rather broken installer.

(cherry picked from commit cedeb75d59)
This commit is contained in:
Jacob Nevins 2023-03-17 16:48:19 +00:00 committed by Simon Tatham
parent bdf7f73d3d
commit 4d92ca80de
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
windows/installer.wxs
View File

@ -121,6 +121,16 @@
Language="1033" Codepage="1252" Version="$(var.Winver)"> Language="1033" Codepage="1252" Version="$(var.Winver)">
<!-- <!--
We force the install scope to perMachine, largely because I
don't really understand how to make it usefully switchable
between the two. If anyone is a WiX expert and does want to
install PuTTY locally in a user account, I hope they'll send a
well explained patch!
(Leaving InstallScope unset produces an installer that
superficially appears to work in some cases, but often fails
to do some of its work.)
$(var.Puttytextver) is again defined on the candle command $(var.Puttytextver) is again defined on the candle command
line, and describes the version of PuTTY in human-readable line, and describes the version of PuTTY in human-readable
form, e.g. "PuTTY 0.67" or "PuTTY development snapshot [foo]". form, e.g. "PuTTY 0.67" or "PuTTY development snapshot [foo]".
@ -129,7 +139,8 @@
Description="$(var.Puttytextver) installer" Description="$(var.Puttytextver) installer"
Manufacturer="Simon Tatham" Manufacturer="Simon Tatham"
InstallerVersion="$(var.InstallerVersion)" Languages="1033" InstallerVersion="$(var.InstallerVersion)" Languages="1033"
Compressed="yes" SummaryCodepage="1252" /> Compressed="yes" SummaryCodepage="1252"
InstallScope="perMachine" />
<!-- <!--
Permit installing an arbitrary one of these PuTTY installers Permit installing an arbitrary one of these PuTTY installers