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

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

Issue 5219280069066752: Issue #1186 - Change names that appear in the custom action (Closed)
Patch Set: Created Oct. 2, 2014, 6:51 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component. 148 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component.
149 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. 149 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables.
150 150
151 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, 151 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero,
152 which indicates to block the installer until the action completes 152 which indicates to block the installer until the action completes
153 and to treat a non-zero return value from the action as an error. 153 and to treat a non-zero return value from the action as an error.
154 --> 154 -->
155 <CustomAction 155 <CustomAction
156 Id="Close_IE" 156 Id="Close_IE"
157 BinaryKey="installer_ca" 157 BinaryKey="installer_ca"
158 DllEntry="abp_close_ie" 158 DllEntry="AbpCloseIe"
159 Return="check" 159 Return="check"
160 /> 160 />
161 <!-- 161 <!--
162 We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. 162 We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit.
163 The 64-bit Close_IE action needs to examine 64-bit processes on the system , which are invisible to 32-bit processes. 163 The 64-bit Close_IE action needs to examine 64-bit processes on the system , which are invisible to 32-bit processes.
164 --> 164 -->
165 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/> 165 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/>
166 <InstallUISequence> 166 <InstallUISequence>
167 <!-- 167 <!--
168 The LaunchConditions action occurs near the beginning, before any of the expensive operations. 168 The LaunchConditions action occurs near the beginning, before any of the expensive operations.
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 820 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
821 <File Name="settings.ini"/> 821 <File Name="settings.ini"/>
822 </Component> 822 </Component>
823 </Directory> 823 </Directory>
824 </DirectoryRef> 824 </DirectoryRef>
825 825
826 <?include ../installer-lib/custom-i18n.wxi ?> 826 <?include ../installer-lib/custom-i18n.wxi ?>
827 <?include ../custom-action/close_ie.wxi ?> 827 <?include ../custom-action/close_ie.wxi ?>
828 </Product> 828 </Product>
829 </Wix> 829 </Wix>
OLDNEW

Powered by Google App Engine
This is Rietveld