Fix 32/64-bit bitness handling in Burn and BUtil.

- Take advantage of RegOpenEx.
- Always look for related bundles in both 32 and 64 hives.
- BundleEnumRelatedBundle requires caller to specify bitness.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
index a515ed69..6d81252e 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
@@ -49,5 +49,22 @@ namespace WixToolsetTest.BurnE2E
 
             bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
         }
+
+        [Fact]
+        public void Bundle32UpgradesBundle64()
+        {
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var packageAv2 = this.CreatePackageInstaller("PackageAv2");
+            var bundleAv1x64 = this.CreateBundleInstaller("BundleAv1x64");
+            var bundleAv2 = this.CreateBundleInstaller("BundleAv2");
+
+            bundleAv1x64.Install();
+            bundleAv1x64.VerifyRegisteredAndInPackageCache();
+
+            bundleAv2.Install();
+            bundleAv2.VerifyRegisteredAndInPackageCache();
+             
+            bundleAv1x64.VerifyUnregisteredAndRemovedFromPackageCache();
+        }
     }
 }