aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Decompile
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-02-11 13:46:45 -0800
committerRob Mensching <rob@firegiant.com>2021-02-11 13:52:29 -0800
commitc6e2213e818b869c44c1af7355fc06f45ebf1a1f (patch)
treedb01cac18404c9be74c95183956b1ceb517ef5c8 /src/WixToolset.Core.WindowsInstaller/Decompile
parent0fcb0cb1d0a2f741f83feb76bc276926f499686d (diff)
downloadwix-c6e2213e818b869c44c1af7355fc06f45ebf1a1f.tar.gz
wix-c6e2213e818b869c44c1af7355fc06f45ebf1a1f.tar.bz2
wix-c6e2213e818b869c44c1af7355fc06f45ebf1a1f.zip
Replace Win64 attribute with Bitness attribute
Closes wixtoolset/#4707
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Decompile')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 29e15c91..c62e8153 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -3950,12 +3950,12 @@ namespace WixToolset.Core.WindowsInstaller
3950 3950
3951 if (WindowsInstallerConstants.MsidbCustomActionType64BitScript == (type & WindowsInstallerConstants.MsidbCustomActionType64BitScript)) 3951 if (WindowsInstallerConstants.MsidbCustomActionType64BitScript == (type & WindowsInstallerConstants.MsidbCustomActionType64BitScript))
3952 { 3952 {
3953 xCustomAction.SetAttributeValue("Win64", "yes"); 3953 xCustomAction.SetAttributeValue("Bitness", "always64");
3954 } 3954 }
3955 else if (WindowsInstallerConstants.MsidbCustomActionTypeVBScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeVBScript) || 3955 else if (WindowsInstallerConstants.MsidbCustomActionTypeVBScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeVBScript) ||
3956 WindowsInstallerConstants.MsidbCustomActionTypeJScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeJScript)) 3956 WindowsInstallerConstants.MsidbCustomActionTypeJScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeJScript))
3957 { 3957 {
3958 xCustomAction.SetAttributeValue("Win64", "no"); 3958 xCustomAction.SetAttributeValue("Bitness", "always32");
3959 } 3959 }
3960 3960
3961 switch (type & WindowsInstallerConstants.MsidbCustomActionTypeExecuteBits) 3961 switch (type & WindowsInstallerConstants.MsidbCustomActionTypeExecuteBits)
@@ -4191,11 +4191,11 @@ namespace WixToolset.Core.WindowsInstaller
4191 4191
4192 if (WindowsInstallerConstants.MsidbComponentAttributes64bit == (attributes & WindowsInstallerConstants.MsidbComponentAttributes64bit)) 4192 if (WindowsInstallerConstants.MsidbComponentAttributes64bit == (attributes & WindowsInstallerConstants.MsidbComponentAttributes64bit))
4193 { 4193 {
4194 xComponent.SetAttributeValue("Win64", "yes"); 4194 xComponent.SetAttributeValue("Bitness", "always64");
4195 } 4195 }
4196 else 4196 else
4197 { 4197 {
4198 xComponent.SetAttributeValue("Win64", "no"); 4198 xComponent.SetAttributeValue("Bitness", "always32");
4199 } 4199 }
4200 4200
4201 if (WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection == (attributes & WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection)) 4201 if (WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection == (attributes & WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection))
@@ -6479,12 +6479,12 @@ namespace WixToolset.Core.WindowsInstaller
6479 6479
6480 if (WindowsInstallerConstants.MsidbLocatorType64bit == (type & WindowsInstallerConstants.MsidbLocatorType64bit)) 6480 if (WindowsInstallerConstants.MsidbLocatorType64bit == (type & WindowsInstallerConstants.MsidbLocatorType64bit))
6481 { 6481 {
6482 xRegistrySearch.SetAttributeValue("Win64", "yes"); 6482 xRegistrySearch.SetAttributeValue("Bitness", "always64");
6483 type &= ~WindowsInstallerConstants.MsidbLocatorType64bit; 6483 type &= ~WindowsInstallerConstants.MsidbLocatorType64bit;
6484 } 6484 }
6485 else 6485 else
6486 { 6486 {
6487 xRegistrySearch.SetAttributeValue("Win64", "no"); 6487 xRegistrySearch.SetAttributeValue("Bitness", "always32");
6488 } 6488 }
6489 6489
6490 switch (type) 6490 switch (type)