Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: installer/src/msi/adblockplusie.wxs

Issue 4805711393456128: Remove the Repair button from Programs and Features. Fix the CA. (Closed)
Patch Set: Created June 30, 2014, 4:28 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 Compilation Note: 3 Compilation Note:
4 You may see linking errors that look like these: 4 You may see linking errors that look like these:
5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote> 5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote>
6 The documentation for this error code talks about custom actions, 6 The documentation for this error code talks about custom actions,
7 even though the CustomAction keyword does not appear in this source. 7 even though the CustomAction keyword does not appear in this source.
8 Certain WiX elements are implemented by MSI custom actions, 8 Certain WiX elements are implemented by MSI custom actions,
9 which means this source implicitly declares some insofar as the Windows Inst aller sees it. 9 which means this source implicitly declares some insofar as the Windows Inst aller sees it.
10 These errors are benign and can be avoided by some fiddling with the registry on the development machine. 10 These errors are benign and can be avoided by some fiddling with the registry on the development machine.
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 Title="!(loc.Title)" Description="!(loc.UI_Description)" 181 Title="!(loc.Title)" Description="!(loc.UI_Description)"
182 Display="hidden"> 182 Display="hidden">
183 <ComponentGroupRef Id="Installation_Folders"/> 183 <ComponentGroupRef Id="Installation_Folders"/>
184 <ComponentGroupRef Id="Binaries"/> 184 <ComponentGroupRef Id="Binaries"/>
185 <ComponentGroupRef Id="HTML_Tree"/> 185 <ComponentGroupRef Id="HTML_Tree"/>
186 <ComponentGroupRef Id="Locale_Files"/> 186 <ComponentGroupRef Id="Locale_Files"/>
187 <ComponentGroupRef Id="INI_Files"/> 187 <ComponentGroupRef Id="INI_Files"/>
188 </Feature> 188 </Feature>
189 189
190 <!-- 190 <!--
191 Remove the "Modify" button from our control panel entry.
192 Since we only have a single feature, there's only a single way of installi ng the plugin,
193 and thus modifying the installation can't possibly do anything.
194 This is currently set by the WiXUI property WIXUI_INSTALLDIR, so it's comm ented out now.
195 <Property Id="ARPNOMODIFY" Value="1"/>
196 -->
197
198 <!--
199 The application data folder has to vary by operating system version. 191 The application data folder has to vary by operating system version.
200 With Vista and later, we have to use an application data folder suitable f or low-integrity applications. 192 With Vista and later, we have to use an application data folder suitable f or low-integrity applications.
201 XP and earlier don't have UAC and we use the regular application data fold er. 193 XP and earlier don't have UAC and we use the regular application data fold er.
202 --> 194 -->
203 <Property Id="LOCAL_LOW_APP_DATA_FOLDER"> 195 <Property Id="LOCAL_LOW_APP_DATA_FOLDER">
204 <!-- There's no built-in property with this name, so we need to extract it s value from the registry. --> 196 <!-- There's no built-in property with this name, so we need to extract it s value from the registry. -->
205 <RegistrySearch Id="RUMK" 197 <RegistrySearch Id="RUMK"
206 Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\Explorer\Shel l Folders" 198 Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\Explorer\Shel l Folders"
207 Name="{A520A1A4-1780-4FF6-BD18-167343C5AF16}" 199 Name="{A520A1A4-1780-4FF6-BD18-167343C5AF16}"
208 Type="raw"/> 200 Type="raw"/>
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 816 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
825 <File Name="settings.ini"/> 817 <File Name="settings.ini"/>
826 </Component> 818 </Component>
827 </Directory> 819 </Directory>
828 </DirectoryRef> 820 </DirectoryRef>
829 821
830 <?include ../installer-lib/custom-i18n.wxi ?> 822 <?include ../installer-lib/custom-i18n.wxi ?>
831 <?include ../custom-action/close_ie.wxi ?> 823 <?include ../custom-action/close_ie.wxi ?>
832 </Product> 824 </Product>
833 </Wix> 825 </Wix>
OLDNEW

Powered by Google App Engine
This is Rietveld