Side by Side Diff: installer/src/msi/adblockplusie.wxs
Issue 6689082285490176:
Issue 1598 - The set up was unable to automatically close IE while uninstall
Patch Set: Treat Basic UI as interactive mode
Created March 19, 2015, 2:15 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/src/custom-action/close_application.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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 176 Id="Close_IE" | 176 Id="Close_IE" |
| 177 BinaryKey="installer_ca" | 177 BinaryKey="installer_ca" |
| 178 DllEntry="AbpCloseIe" | 178 DllEntry="AbpCloseIe" |
| 179 Return="check" | 179 Return="check" |
| 180 /> | 180 /> |
| 181 <!-- | 181 <!-- |
| 182 We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. | 182 We require a 32-bit DLL for the 32-bit installer, and likewise for 64-bit. |
| 183 The 64-bit Close_IE action needs to examine 64-bit processes on the system , which are invisible to 32-bit processes. | 183 The 64-bit Close_IE action needs to examine 64-bit processes on the system , which are invisible to 32-bit processes. |
| 184 --> | 184 --> |
| 185 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/> | 185 <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build _dir)\$(var.CA_Configuration)\installer-ca.dll"/> |
| 186 <InstallUISequence> | 186 <InstallExecuteSequence> |
| 187 <!-- | 187 <!-- |
| 188 The LaunchConditions action occurs near the beginning, before any of the expensive operations. | 188 The LaunchConditions action occurs near the beginning, before any of the expensive operations. |
| 189 --> | 189 --> |
| 190 <Custom | 190 <Custom |
| 191 Action="Close_IE" | 191 Action="Close_IE" |
| 192 After="LaunchConditions" | 192 After="LaunchConditions" |
| 193 /> | 193 /> |
| 194 </InstallUISequence> | 194 |
| 195 </InstallExecuteSequence> | |
| 195 | 196 |
| 196 <!-- | 197 <!-- |
| 197 We have only a single feature, since there aren't any optional parts. | 198 We have only a single feature, since there aren't any optional parts. |
| 198 The display is hidden for the same reason; there's nothing to choose from. | 199 The display is hidden for the same reason; there's nothing to choose from. |
| 199 --> | 200 --> |
| 200 <Feature Id="ProductFeature" | 201 <Feature Id="ProductFeature" |
| 201 Title="!(loc.Title)" Description="!(loc.UI_Description)" | 202 Title="!(loc.Title)" Description="!(loc.UI_Description)" |
| 202 Display="hidden"> | 203 Display="hidden"> |
| 203 <ComponentGroupRef Id="Installation_Folders"/> | 204 <ComponentGroupRef Id="Installation_Folders"/> |
| 204 <ComponentGroupRef Id="Binaries"/> | 205 <ComponentGroupRef Id="Binaries"/> |
| (...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 828 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> | 829 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> |
| 829 <File Name="settings.ini"/> | 830 <File Name="settings.ini"/> |
| 830 </Component> | 831 </Component> |
| 831 </Directory> | 832 </Directory> |
| 832 </DirectoryRef> | 833 </DirectoryRef> |
| 833 | 834 |
| 834 <?include ../installer-lib/custom-i18n.wxi ?> | 835 <?include ../installer-lib/custom-i18n.wxi ?> |
| 835 <?include ../custom-action/close_ie.wxi ?> | 836 <?include ../custom-action/close_ie.wxi ?> |
| 836 </Product> | 837 </Product> |
| 837 </Wix> | 838 </Wix> |
| OLD | NEW |
« no previous file with comments
|
« installer/src/custom-action/close_application.cpp ('k')
|
no next file »
|
no next file with comments »
