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 Jan. 4, 2015, 7 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« installer/src/installer-lib/interaction.cpp ('K')
|
« installer/src/installer-lib/test/test-installer-lib-sandbox.cpp ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component. | 154 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component. |
| 155 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. | 155 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. |
| 156 | 156 |
| 157 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, | 157 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, |
| 158 which indicates to block the installer until the action completes | 158 which indicates to block the installer until the action completes |
| 159 and to treat a non-zero return value from the action as an error. | 159 and to treat a non-zero return value from the action as an error. |
| 160 --> | 160 --> |
| 161 <CustomAction | 161 <CustomAction |
| 162 Id="Close_IE" | 162 Id="Close_IE" |
| 163 BinaryKey="installer_ca" | 163 BinaryKey="installer_ca" |
| 164 DllEntry="abp_close_ie" | 164 DllEntry="AbpCloseIe" |
| 165 Return="check" | 165 Return="check" |
| 166 /> | 166 /> |
| 167 <!-- | 167 <!-- |
| 168 We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. | 168 We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. |
| 169 The 64-bit Close_IE action needs to examine 64-bit processes on the system , which are invisible to 32-bit processes. | 169 The 64-bit Close_IE action needs to examine 64-bit processes on the system , which are invisible to 32-bit processes. |
| 170 --> | 170 --> |
| 171 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/> | 171 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/> |
| 172 <InstallUISequence> | 172 <InstallUISequence> |
| 173 <!-- | 173 <!-- |
| 174 The LaunchConditions action occurs near the beginning, before any of the expensive operations. | 174 The LaunchConditions action occurs near the beginning, before any of the expensive operations. |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 814 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> | 814 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> |
| 815 <File Name="settings.ini"/> | 815 <File Name="settings.ini"/> |
| 816 </Component> | 816 </Component> |
| 817 </Directory> | 817 </Directory> |
| 818 </DirectoryRef> | 818 </DirectoryRef> |
| 819 | 819 |
| 820 <?include ../installer-lib/custom-i18n.wxi ?> | 820 <?include ../installer-lib/custom-i18n.wxi ?> |
| 821 <?include ../custom-action/close_ie.wxi ?> | 821 <?include ../custom-action/close_ie.wxi ?> |
| 822 </Product> | 822 </Product> |
| 823 </Wix> | 823 </Wix> |
| OLD | NEW |
« installer/src/installer-lib/interaction.cpp ('K')
|
« installer/src/installer-lib/test/test-installer-lib-sandbox.cpp ('k')
|
no next file »
|
no next file with comments »
