Treat failing to load SCD like mbahost treats .NET 4.5.2 on Win7 RTM.

1 files changed, 25 insertions, 1 deletions

diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp
index 88a26534..826c4386 100644
--- a/src/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -2892,6 +2892,23 @@ private: // privates
                                 }
                             }
                         }
+                        else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal)
+                        {
+                            HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.SCDRUNTIMEFAILUREErrorMessage)", 0);
+                            if (FAILED(hr))
+                            {
+                                BalLogError(hr, "Failed to initialize SCDRUNTIMEFAILUREErrorMessage loc identifier.");
+                            }
+                            else
+                            {
+                                hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText);
+                                if (FAILED(hr))
+                                {
+                                    BalLogError(hr, "Failed to localize SCDRUNTIMEFAILUREErrorMessage: %ls", sczUnformattedText);
+                                    ReleaseNullStr(sczUnformattedText);
+                                }
+                            }
+                        }
                         else // try to get the error message from the error code.
                         {
                             StrAllocFromError(&sczUnformattedText, m_hrFinal, NULL);
@@ -2915,6 +2932,13 @@ private: // privates
                                 BalFormatString(sczUnformattedText, &sczText);
                             }
                         }
+                        else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal)
+                        {
+                            if (sczUnformattedText)
+                            {
+                                BalFormatString(sczUnformattedText, &sczText);
+                            }
+                        }
                         else
                         {
                             StrAllocFormatted(&sczText, L"0x%08x - %ls", m_hrFinal, sczUnformattedText);
@@ -3754,7 +3778,7 @@ HRESULT CreateBootstrapperApplication(
 
     if (BOOTSTRAPPER_DISPLAY_UNKNOWN == pArgs->pCommand->display)
     {
-        ExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type.");
+        BalExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type.");
     }
 
     pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine, pArgs);