From 135dad52ea93d65e9cfe1490f34d12bec510c836 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 14 Nov 2018 20:23:35 -0500 Subject: Explicitly mark bitness of entities that support 64-bit attribute. This ensures that you can build a 64-bit package with 32-bit entities and not lose the "forced" 32-bit-ness in the decompiled output. --- .../Decompile/Decompiler.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/WixToolset.Core.WindowsInstaller/Decompile') diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index 26e1f399..3b193a4a 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -4663,6 +4663,11 @@ namespace WixToolset.Core.WindowsInstaller { customAction.Win64 = Wix.YesNoType.yes; } + else if (MsiInterop.MsidbCustomActionTypeVBScript == (type & MsiInterop.MsidbCustomActionTypeVBScript) || + MsiInterop.MsidbCustomActionTypeJScript == (type & MsiInterop.MsidbCustomActionTypeJScript)) + { + customAction.Win64 = Wix.YesNoType.no; + } switch (type & MsiInterop.MsidbCustomActionTypeExecuteBits) { @@ -4903,6 +4908,10 @@ namespace WixToolset.Core.WindowsInstaller { component.Win64 = Wix.YesNoType.yes; } + else + { + component.Win64 = Wix.YesNoType.no; + } if (MsiInterop.MsidbComponentAttributesDisableRegistryReflection == (attributes & MsiInterop.MsidbComponentAttributesDisableRegistryReflection)) { @@ -7810,6 +7819,10 @@ namespace WixToolset.Core.WindowsInstaller registrySearch.Win64 = Wix.YesNoType.yes; type &= ~MsiInterop.MsidbLocatorType64bit; } + else + { + registrySearch.Win64 = Wix.YesNoType.no; + } switch (type) { -- cgit v1.2.3-55-g6feb