Add bundle option for command line variables to always be uppercase.

Fixes #3777

2 files changed, 47 insertions, 0 deletions

diff --git a/src/api/burn/balutil/balinfo.cpp b/src/api/burn/balutil/balinfo.cpp
index 5927ef72..f71784a5 100644
--- a/src/api/burn/balutil/balinfo.cpp
+++ b/src/api/burn/balutil/balinfo.cpp
@@ -292,6 +292,7 @@ DAPI_(HRESULT) BalSetOverridableVariablesFromEngine(
     )
 {
     HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
     BAL_INFO_OVERRIDABLE_VARIABLE* pOverridableVariable = NULL;
 
     for (DWORD i = 0; i < pCommand->cVariables; ++i)
@@ -299,6 +300,14 @@ DAPI_(HRESULT) BalSetOverridableVariablesFromEngine(
         LPCWSTR wzVariableName = pCommand->rgVariableNames[i];
         LPCWSTR wzVariableValue = pCommand->rgVariableValues[i];
 
+        if (BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_UPPER_CASE == pOverridableVariables->commandLineType)
+        {
+            hr = StrAllocStringToUpperInvariant(&sczKey, wzVariableName, 0);
+            ExitOnFailure(hr, "Failed to upper case variable name.");
+
+            wzVariableName = sczKey;
+        }
+
         hr = DictGetValue(pOverridableVariables->sdVariables, wzVariableName, reinterpret_cast<void**>(&pOverridableVariable));
         if (E_NOTFOUND == hr)
         {
@@ -313,6 +322,8 @@ DAPI_(HRESULT) BalSetOverridableVariablesFromEngine(
     }
 
 LExit:
+    ReleaseStr(sczKey);
+
     return hr;
 }
 
@@ -527,10 +538,37 @@ static HRESULT ParseOverridableVariablesFromXml(
     )
 {
     HRESULT hr = S_OK;
+    IXMLDOMNode* pCommandLineNode = NULL;
+    LPWSTR scz = NULL;
     IXMLDOMNode* pNode = NULL;
     IXMLDOMNodeList* pNodes = NULL;
     BAL_INFO_OVERRIDABLE_VARIABLE* pOverridableVariable = NULL;
 
+    hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/CommandLine", &pCommandLineNode);
+    if (S_FALSE == hr)
+    {
+        hr = E_NOTFOUND;
+    }
+    ExitOnFailure(hr, "Failed to select command line information.");
+
+    // @Variables
+    hr = XmlGetAttributeEx(pCommandLineNode, L"Variables", &scz);
+    ExitOnFailure(hr, "Failed to get command line variable type.");
+
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"upperCase", -1))
+    {
+        pOverridableVariables->commandLineType = BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_UPPER_CASE;
+    }
+    else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"caseSensitive", -1))
+    {
+        pOverridableVariables->commandLineType = BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_CASE_SENSITIVE;
+    }
+    else
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Invalid value for CommandLine/@Variables: %ls", scz);
+    }
+
     // Get the list of variables users can override on the command line.
     hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOverridableVariable", &pNodes);
     if (S_FALSE == hr)
@@ -570,6 +608,8 @@ static HRESULT ParseOverridableVariablesFromXml(
     }
 
 LExit:
+    ReleaseStr(scz);
+    ReleaseObject(pCommandLineNode);
     ReleaseObject(pNode);
     ReleaseObject(pNodes);
     return hr;
diff --git a/src/api/burn/balutil/inc/balinfo.h b/src/api/burn/balutil/inc/balinfo.h
index 0fce35ec..07a1cbb7 100644
--- a/src/api/burn/balutil/inc/balinfo.h
+++ b/src/api/burn/balutil/inc/balinfo.h
@@ -18,6 +18,12 @@ typedef enum BAL_INFO_PACKAGE_TYPE
     BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH,
 } BAL_INFO_PACKAGE_TYPE;
 
+typedef enum _BAL_INFO_VARIABLE_COMMAND_LINE_TYPE
+{
+    BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_UPPER_CASE,
+    BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_CASE_SENSITIVE,
+} BAL_INFO_VARIABLE_COMMAND_LINE_TYPE;
+
 
 typedef struct _BAL_INFO_PACKAGE
 {
@@ -58,6 +64,7 @@ typedef struct _BAL_INFO_OVERRIDABLE_VARIABLES
     BAL_INFO_OVERRIDABLE_VARIABLE* rgVariables;
     DWORD cVariables;
     STRINGDICT_HANDLE sdVariables;
+    BAL_INFO_VARIABLE_COMMAND_LINE_TYPE commandLineType;
 } BAL_INFO_OVERRIDABLE_VARIABLES;