WIXFEAT:4763 Change "string" variable type to literal and add "formatted".

1 files changed, 9 insertions, 2 deletions

diff --git a/src/engine/condition.cpp b/src/engine/condition.cpp
index 28391d2d..cd346680 100644
--- a/src/engine/condition.cpp
+++ b/src/engine/condition.cpp
@@ -439,6 +439,13 @@ static HRESULT ParseValue(
         {
             ExitOnRootFailure(hr, "Failed to find variable.");
         }
+
+        if (BURN_VARIANT_TYPE_FORMATTED == pValue->Type)
+        {
+            // TODO: actually format the value?
+            hr = BVariantChangeType(pValue, BURN_VARIANT_TYPE_STRING);
+            ExitOnRootFailure(hr, "Failed to change variable '%ls' type for condition '%ls'", pContext->NextSymbol.Value.sczValue, pContext->wzCondition);
+        }
         break;
 
     case BURN_SYMBOL_TYPE_NUMBER: __fallthrough;
@@ -642,7 +649,7 @@ static HRESULT NextSymbol(
         ++n; // terminating '"'
 
         pContext->NextSymbol.Type = BURN_SYMBOL_TYPE_LITERAL;
-        hr = BVariantSetString(&pContext->NextSymbol.Value, &pContext->wzRead[1], n - 2);
+        hr = BVariantSetString(&pContext->NextSymbol.Value, &pContext->wzRead[1], n - 2, FALSE);
         ExitOnFailure(hr, "Failed to set symbol value.");
         break;
     default:
@@ -746,7 +753,7 @@ static HRESULT NextSymbol(
                 {
                     // identifier
                     pContext->NextSymbol.Type = BURN_SYMBOL_TYPE_IDENTIFIER;
-                    hr = BVariantSetString(&pContext->NextSymbol.Value, pContext->wzRead, n);
+                    hr = BVariantSetString(&pContext->NextSymbol.Value, pContext->wzRead, n, FALSE);
                     ExitOnFailure(hr, "Failed to set symbol value.");
                 }
             }