From bfba90f1714724ab661e43af5cc48bc148bdef70 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 11 Feb 2021 15:22:03 -0800
Subject: Replace Win64 attribute with Bitness attribute

---
 .../TestData/BundleWithSearches/Bundle.wxs         | 14 +++++++++++-
 .../WixToolsetTest.Util/UtilExtensionFixture.cs    |  4 +++-
 src/wixext/UtilCompiler.cs                         | 25 +++++++++++++++++-----
 3 files changed, 36 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
index 3c40b09a..7fef0725 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
@@ -1,10 +1,11 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <BootstrapperApplication>
             <BootstrapperApplicationDll SourceFile="fakeba.dll" />
         </BootstrapperApplication>
 
         <util:RegistrySearchRef Id="RegistrySearchId" />
+        <util:RegistrySearchRef Id="RegistrySearchId64" />
         <util:ProductSearchRef Id="ProductSearchId" />
         <util:FileSearchRef Id="FileSearchId" />
         <util:WindowsFeatureSearchRef Id="DetectSHA2SupportId" />
@@ -26,6 +27,17 @@
             Result="value" />
     </Fragment>
 
+    <Fragment>
+        <util:RegistrySearch
+            Id="RegistrySearchId64"
+            Variable="RegistrySearchVariable64"
+            Root="HKLM"
+            Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
+            Value="Release"
+            Result="value"
+            Bitness="always64" />
+    </Fragment>
+
     <Fragment>
         <util:ProductSearch Id="ProductSearchId" Variable="ProductSearchVariable" UpgradeCode="738D02BF-E231-4370-8209-E9FD4E1BE2A1" Condition="1 &amp; 2 &lt; 3" Result="version" />
     </Fragment>
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index d9440614..e1a608d3 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -243,7 +243,7 @@ namespace WixToolsetTest.Util
                     "</BundleExtension>", bundleExtensionDatas[0].GetTestXml());
 
                 var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]");
-                Assert.Equal(4, utilSearches.Count);
+                Assert.Equal(5, utilSearches.Count);
                 Assert.Equal("<ExtensionSearch Id='DetectSHA2SupportId' Variable='IsSHA2Supported' " +
                     "ExtensionId='Wix4UtilBundleExtension_X86' />", utilSearches[0].GetTestXml());
                 Assert.Equal("<FileSearch Id='FileSearchId' Variable='FileSearchVariable' " +
@@ -252,6 +252,8 @@ namespace WixToolsetTest.Util
                     "UpgradeCode='{738D02BF-E231-4370-8209-E9FD4E1BE2A1}' Type='version' />", utilSearches[2].GetTestXml());
                 Assert.Equal("<RegistrySearch Id='RegistrySearchId' Variable='RegistrySearchVariable' " +
                     @"Root='HKLM' Key='SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full' Value='Release' Type='value' VariableType='string' />", utilSearches[3].GetTestXml());
+                Assert.Equal("<RegistrySearch Id='RegistrySearchId64' Variable='RegistrySearchVariable64' " +
+                    @"Root='HKLM' Key='SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full' Value='Release' Type='value' Win64='yes' VariableType='string' />", utilSearches[4].GetTestXml());
             }
         }
 
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 7314570e..183f286b 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -2684,7 +2684,7 @@ namespace WixToolset.Util
             string key = null;
             string value = null;
             var expand = YesNoType.NotSet;
-            var win64 = YesNoType.NotSet;
+            var win64 = this.Context.IsCurrentPlatform64Bit;
             var attributes = WixRegistrySearchAttributes.Raw | WixRegistrySearchAttributes.WantValue;
 
             foreach (var attrib in element.Attributes())
@@ -2699,6 +2699,24 @@ namespace WixToolset.Util
                         case "After":
                             this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after);
                             break;
+                        case "Bitness":
+                            var bitnessValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (bitnessValue)
+                            {
+                            case "always32":
+                                win64 = false;
+                                break;
+                            case "always64":
+                                win64 = true;
+                                break;
+                            case "default":
+                            case "":
+                                break;
+                            default:
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, attrib.Name.LocalName, attrib.Name.LocalName, bitnessValue, "default", "always32", "always64"));
+                                break;
+                            }
+                            break;
                         case "Root":
                             root = this.ParseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, false);
                             break;
@@ -2741,9 +2759,6 @@ namespace WixToolset.Util
                                     break;
                             }
                             break;
-                        case "Win64":
-                            win64 = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
-                            break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
@@ -2780,7 +2795,7 @@ namespace WixToolset.Util
                 attributes |= WixRegistrySearchAttributes.ExpandEnvironmentVariables;
             }
 
-            if (win64 == YesNoType.Yes)
+            if (win64)
             {
                 attributes |= WixRegistrySearchAttributes.Win64;
             }
-- 
cgit v1.2.3-55-g6feb