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

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

Issue 5675960980471808: Updated installer with custom action (Closed)
Patch Set: Created March 8, 2014, 5:06 a.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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component. 146 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component.
147 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. 147 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables.
148 148
149 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, 149 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero,
150 which indicates to block the installer until the action completes 150 which indicates to block the installer until the action completes
151 and to treat a non-zero return value from the action as an error. 151 and to treat a non-zero return value from the action as an error.
152 --> 152 -->
153 <CustomAction 153 <CustomAction
154 Id="Close_IE" 154 Id="Close_IE"
155 BinaryKey="installer_ca" 155 BinaryKey="installer_ca"
156 DllEntry="abp_close_applications" 156 DllEntry="abp_close_ie"
157 Return="check" 157 Return="check"
158 /> 158 />
159 <!-- 159 <!--
160 Note that we're using a 32-bit custom action library for both 32- and 64-b it installers. 160 Note that we're using a 32-bit custom action library for both 32- and 64-b it installers.
161 --> 161 -->
162 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\ia32\$(var. CA_Configuration)\installer-ca.dll"/> 162 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\ia32\$(var. CA_Configuration)\installer-ca.dll"/>
163 <InstallUISequence> 163 <InstallUISequence>
164 <!-- 164 <!--
165 The LaunchConditions action occurs near the beginning, before any of the expensive operations. 165 The LaunchConditions action occurs near the beginning, before any of the expensive operations.
166 --> 166 -->
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 --> 292 -->
293 <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER"> 293 <ComponentGroup Id="Binaries" Directory="INSTALLFOLDER">
294 <!-- 294 <!--
295 The 32-bit version of the DLL is included in both 32- and 64-bit install ers. 295 The 32-bit version of the DLL is included in both 32- and 64-bit install ers.
296 We need an explicit value for attribute @Win64 so that the ARCH argument does not override its implicit value. 296 We need an explicit value for attribute @Win64 so that the ARCH argument does not override its implicit value.
297 --> 297 -->
298 <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a 66" Win64="no"> 298 <Component Id="AdblockPlus32.dll" Guid="d9a35780-d712-11e2-8b8b-0800200c9a 66" Win64="no">
299 <File Id="AdblockPlus32.dll" Name="AdblockPlus32.dll" Source="$(var.plug in_dir)\build\ia32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum= "yes"> 299 <File Id="AdblockPlus32.dll" Name="AdblockPlus32.dll" Source="$(var.plug in_dir)\build\ia32\$(var.Configuration)\AdblockPlus.dll" KeyPath="yes" Checksum= "yes">
300 <?include dll_class.wxi ?> 300 <?include dll_class.wxi ?>
301 </File> 301 </File>
302 <?include bho_registry_value.wxi ?> 302 <?include bho_registry_value.wxi ?>
Oleksandr 2014/03/12 19:26:04 This isn't directly related to this codereview, bu
Eric 2014/03/17 12:26:46 This is for Windows 8?
303 </Component> 303 </Component>
304 <!-- 304 <!--
305 The 64-bit version of the DLL is only included in the 64-bit installer. 305 The 64-bit version of the DLL is only included in the 64-bit installer.
306 We don't really need an explicit value for attribute @Win64, but it's th ere for resilience. 306 We don't really need an explicit value for attribute @Win64, but it's th ere for resilience.
307 307
308 Note that the <Class> element and the <RegistryKey> element are duplicat ed from the 32-bit version. 308 Note that the <Class> element and the <RegistryKey> element are duplicat ed from the 32-bit version.
309 We use "include" directives to ensure that they are identical. 309 We use "include" directives to ensure that they are identical.
310 They have to be the same to support both the 32- and 64-bit versions of Internet Explorer on a 64-bit system. 310 They have to be the same to support both the 32- and 64-bit versions of Internet Explorer on a 64-bit system.
311 IE uses the same algorithm to search for BHO regardless of platform, 311 IE uses the same algorithm to search for BHO regardless of platform,
312 so with two versions of IE, we need two identical registrations. 312 so with two versions of IE, we need two identical registrations.
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 </ComponentGroup> 818 </ComponentGroup>
819 <DirectoryRef Id="ABP_APPDATA_FOLDER"> 819 <DirectoryRef Id="ABP_APPDATA_FOLDER">
820 <Directory Id="ini" FileSource="$(var.plugin_dir)\files"> 820 <Directory Id="ini" FileSource="$(var.plugin_dir)\files">
821 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 821 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
822 <File Name="settings.ini"/> 822 <File Name="settings.ini"/>
823 </Component> 823 </Component>
824 </Directory> 824 </Directory>
825 </DirectoryRef> 825 </DirectoryRef>
826 </Product> 826 </Product>
827 </Wix> 827 </Wix>
OLDNEW

Powered by Google App Engine
This is Rietveld