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, 1 insertions, 12 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/monutil.cpp b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
index 6a7f0596..6ad75b56 100644
--- a/src/libs/dutil/WixToolset.DUtil/monutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
@@ -1677,18 +1677,7 @@ static REGSAM GetRegKeyBitness(
     __in MON_REQUEST *pRequest
     )
 {
-    if (REG_KEY_32BIT == pRequest->regkey.kbKeyBitness)
-    {
-        return KEY_WOW64_32KEY;
-    }
-    else if (REG_KEY_64BIT == pRequest->regkey.kbKeyBitness)
-    {
-        return KEY_WOW64_64KEY;
-    }
-    else
-    {
-        return 0;
-    }
+    return RegTranslateKeyBitness(pRequest->regkey.kbKeyBitness);
 }
 
 static HRESULT DuplicateRemoveMessage(