diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-12 14:41:26 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-05-12 23:25:04 -0700 |
| commit | c9c347bfb659878ce43c60daadac490e230ee17a (patch) | |
| tree | 6fafc3f635bdbe474d6f9988e2c3d4fa802f5228 /src/WixToolset.Core.WindowsInstaller | |
| parent | 32b691d23c76fbe12790808d65b0b615640ebebe (diff) | |
| download | wix-c9c347bfb659878ce43c60daadac490e230ee17a.tar.gz wix-c9c347bfb659878ce43c60daadac490e230ee17a.tar.bz2 wix-c9c347bfb659878ce43c60daadac490e230ee17a.zip | |
Fix inscript CA bit handling
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 1b29fc9c..4b02b3aa 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | |||
| @@ -250,10 +250,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 250 | private void AddCustomActionTuple(CustomActionTuple tuple, Output output) | 250 | private void AddCustomActionTuple(CustomActionTuple tuple, Output output) |
| 251 | { | 251 | { |
| 252 | var type = tuple.Win64 ? WindowsInstallerConstants.MsidbCustomActionType64BitScript : 0; | 252 | var type = tuple.Win64 ? WindowsInstallerConstants.MsidbCustomActionType64BitScript : 0; |
| 253 | type |= tuple.TSAware ? WindowsInstallerConstants.MsidbCustomActionTypeTSAware : 0; | ||
| 254 | type |= tuple.Impersonate ? 0 : WindowsInstallerConstants.MsidbCustomActionTypeNoImpersonate; | ||
| 255 | type |= tuple.IgnoreResult ? WindowsInstallerConstants.MsidbCustomActionTypeContinue : 0; | 253 | type |= tuple.IgnoreResult ? WindowsInstallerConstants.MsidbCustomActionTypeContinue : 0; |
| 256 | type |= tuple.Hidden ? 0 : WindowsInstallerConstants.MsidbCustomActionTypeHideTarget; | 254 | type |= tuple.Hidden ? WindowsInstallerConstants.MsidbCustomActionTypeHideTarget : 0; |
| 257 | type |= tuple.Async ? WindowsInstallerConstants.MsidbCustomActionTypeAsync : 0; | 255 | type |= tuple.Async ? WindowsInstallerConstants.MsidbCustomActionTypeAsync : 0; |
| 258 | type |= CustomActionExecutionType.FirstSequence == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeFirstSequence : 0; | 256 | type |= CustomActionExecutionType.FirstSequence == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeFirstSequence : 0; |
| 259 | type |= CustomActionExecutionType.OncePerProcess == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeOncePerProcess : 0; | 257 | type |= CustomActionExecutionType.OncePerProcess == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeOncePerProcess : 0; |
| @@ -270,6 +268,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 270 | type |= CustomActionTargetType.JScript == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeJScript : 0; | 268 | type |= CustomActionTargetType.JScript == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeJScript : 0; |
| 271 | type |= CustomActionTargetType.VBScript == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeVBScript : 0; | 269 | type |= CustomActionTargetType.VBScript == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeVBScript : 0; |
| 272 | 270 | ||
| 271 | if (WindowsInstallerConstants.MsidbCustomActionTypeInScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeInScript)) | ||
| 272 | { | ||
| 273 | type |= tuple.Impersonate ? 0 : WindowsInstallerConstants.MsidbCustomActionTypeNoImpersonate; | ||
| 274 | type |= tuple.TSAware ? WindowsInstallerConstants.MsidbCustomActionTypeTSAware : 0; | ||
| 275 | } | ||
| 276 | |||
| 273 | var table = output.EnsureTable(this.TableDefinitions["CustomAction"]); | 277 | var table = output.EnsureTable(this.TableDefinitions["CustomAction"]); |
| 274 | var row = table.CreateRow(tuple.SourceLineNumbers); | 278 | var row = table.CreateRow(tuple.SourceLineNumbers); |
| 275 | row[0] = tuple.Id.Id; | 279 | row[0] = tuple.Id.Id; |
