WIXFEAT:6164 Update BAL_INFO_PACKAGE with bal specific data.

5 files changed, 105 insertions, 12 deletions

diff --git a/src/balutil/balinfo.cpp b/src/balutil/balinfo.cpp
index b36e3741..492c8e08 100644
--- a/src/balutil/balinfo.cpp
+++ b/src/balutil/balinfo.cpp
@@ -7,6 +7,10 @@ static HRESULT ParsePackagesFromXml(
     __in BAL_INFO_PACKAGES* pPackages,
     __in IXMLDOMDocument* pixdManifest
     );
+static HRESULT ParseBalPackageInfoFromXml(
+    __in BAL_INFO_PACKAGES* pPackages,
+    __in IXMLDOMDocument* pixdManifest
+    );
 
 
 DAPI_(HRESULT) BalInfoParseFromXml(
@@ -44,6 +48,9 @@ DAPI_(HRESULT) BalInfoParseFromXml(
     hr = ParsePackagesFromXml(&pBundle->packages, pixdManifest);
     BalExitOnFailure(hr, "Failed to parse package information from bootstrapper application data.");
 
+    hr = ParseBalPackageInfoFromXml(&pBundle->packages, pixdManifest);
+    BalExitOnFailure(hr, "Failed to parse bal package information from bootstrapper application data.");
+
 LExit:
     ReleaseObject(pNode);
 
@@ -55,7 +62,8 @@ DAPI_(HRESULT) BalInfoAddRelatedBundleAsPackage(
     __in BAL_INFO_PACKAGES* pPackages,
     __in LPCWSTR wzId,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
-    __in BOOL /*fPerMachine*/
+    __in BOOL /*fPerMachine*/,
+    __out_opt BAL_INFO_PACKAGE** ppPackage
     )
 {
     HRESULT hr = S_OK;
@@ -104,6 +112,11 @@ DAPI_(HRESULT) BalInfoAddRelatedBundleAsPackage(
 
     // TODO: try to look up the DisplayName and Description in Add/Remove Programs with the wzId.
 
+    if (ppPackage)
+    {
+        *ppPackage = pPackage;
+    }
+
 LExit:
     return hr;
 }
@@ -139,10 +152,13 @@ DAPI_(void) BalInfoUninitialize(
         ReleaseStr(pBundle->packages.rgPackages[i].sczDisplayName);
         ReleaseStr(pBundle->packages.rgPackages[i].sczDescription);
         ReleaseStr(pBundle->packages.rgPackages[i].sczId);
+        ReleaseStr(pBundle->packages.rgPackages[i].sczDisplayInternalUICondition);
         ReleaseStr(pBundle->packages.rgPackages[i].sczProductCode);
         ReleaseStr(pBundle->packages.rgPackages[i].sczUpgradeCode);
         ReleaseStr(pBundle->packages.rgPackages[i].sczVersion);
         ReleaseStr(pBundle->packages.rgPackages[i].sczInstallCondition);
+        ReleaseStr(pBundle->packages.rgPackages[i].sczPrereqLicenseFile);
+        ReleaseStr(pBundle->packages.rgPackages[i].sczPrereqLicenseUrl);
     }
 
     ReleaseMem(pBundle->packages.rgPackages);
@@ -218,12 +234,6 @@ static HRESULT ParsePackagesFromXml(
         hr = XmlGetYesNoAttribute(pNode, L"Vital", &prgPackages[iPackage].fVital);
         ExitOnFailure(hr, "Failed to get vital setting for package.");
 
-        hr = XmlGetYesNoAttribute(pNode, L"DisplayInternalUI", &prgPackages[iPackage].fDisplayInternalUI);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get DisplayInternalUI setting for package.");
-        }
-
         hr = XmlGetAttributeEx(pNode, L"ProductCode", &prgPackages[iPackage].sczProductCode);
         if (E_NOTFOUND != hr)
         {
@@ -286,3 +296,78 @@ LExit:
 
     return hr;
 }
+
+
+static HRESULT ParseBalPackageInfoFromXml(
+    __in BAL_INFO_PACKAGES* pPackages,
+    __in IXMLDOMDocument* pixdManifest
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList* pNodeList = NULL;
+    IXMLDOMNode* pNode = NULL;
+    LPWSTR scz = NULL;
+    BAL_INFO_PACKAGE* pPackage = NULL;
+
+    hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixBalPackageInfo", &pNodeList);
+    ExitOnFailure(hr, "Failed to select all packages.");
+
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
+    {
+        hr = XmlGetAttributeEx(pNode, L"PackageId", &scz);
+        ExitOnFailure(hr, "Failed to get package identifier for WixBalPackageInfo.");
+
+        hr = BalInfoFindPackageById(pPackages, scz, &pPackage);
+        ExitOnFailure(hr, "Failed to find package specified in WixBalPackageInfo: %ls", scz);
+
+        hr = XmlGetAttributeEx(pNode, L"DisplayInternalUICondition", &pPackage->sczDisplayInternalUICondition);
+        if (E_NOTFOUND != hr)
+        {
+            ExitOnFailure(hr, "Failed to get DisplayInternalUICondition setting for package.");
+        }
+
+        ReleaseNullObject(pNode);
+    }
+    ExitOnFailure(hr, "Failed to parse all WixBalPackageInfo elements.");
+
+    hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixMbaPrereqInformation", &pNodeList);
+    ExitOnFailure(hr, "Failed to select all packages.");
+
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
+    {
+        hr = XmlGetAttributeEx(pNode, L"PackageId", &scz);
+        ExitOnFailure(hr, "Failed to get package identifier for WixMbaPrereqInformation.");
+
+        hr = BalInfoFindPackageById(pPackages, scz, &pPackage);
+        ExitOnFailure(hr, "Failed to find package specified in WixMbaPrereqInformation: %ls", scz);
+
+        pPackage->fPrereqPackage = TRUE;
+
+        hr = XmlGetAttributeEx(pNode, L"LicenseFile", &pPackage->sczPrereqLicenseFile);
+        if (E_NOTFOUND != hr)
+        {
+            ExitOnFailure(hr, "Failed to get LicenseFile setting for prereq package.");
+        }
+
+        hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &pPackage->sczPrereqLicenseUrl);
+        if (E_NOTFOUND != hr)
+        {
+            ExitOnFailure(hr, "Failed to get LicenseUrl setting for prereq package.");
+        }
+
+        ReleaseNullObject(pNode);
+    }
+    ExitOnFailure(hr, "Failed to parse all WixMbaPrereqInformation elements.");
+
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+
+LExit:
+    ReleaseStr(scz);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+
+    return hr;
+}
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index f37fde17..31f0a9f7 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -3,7 +3,7 @@
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -91,7 +91,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.22\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/src/balutil/inc/balinfo.h b/src/balutil/inc/balinfo.h
index be4b75d0..0d838ae3 100644
--- a/src/balutil/inc/balinfo.h
+++ b/src/balutil/inc/balinfo.h
@@ -34,12 +34,16 @@ typedef struct _BAL_INFO_PACKAGE
     BAL_INFO_PACKAGE_TYPE type;
     BOOL fPermanent;
     BOOL fVital;
-    BOOL fDisplayInternalUI;
+    LPWSTR sczDisplayInternalUICondition;
     LPWSTR sczProductCode;
     LPWSTR sczUpgradeCode;
     LPWSTR sczVersion;
     LPWSTR sczInstallCondition;
     BAL_INFO_CACHE_TYPE cacheType;
+    BOOL fPrereqPackage;
+    LPWSTR sczPrereqLicenseFile;
+    LPWSTR sczPrereqLicenseUrl;
+    LPVOID pvCustomData;
 } BAL_INFO_PACKAGE;
 
 
@@ -78,7 +82,8 @@ DAPI_(HRESULT) BalInfoAddRelatedBundleAsPackage(
     __in BAL_INFO_PACKAGES* pPackages,
     __in LPCWSTR wzId,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
-    __in BOOL fPerMachine
+    __in BOOL fPerMachine,
+    __out_opt BAL_INFO_PACKAGE** ppPackage
     );
 
 
diff --git a/src/balutil/inc/balutil.h b/src/balutil/inc/balutil.h
index b2d50752..bbfb16a2 100644
--- a/src/balutil/inc/balutil.h
+++ b/src/balutil/inc/balutil.h
@@ -11,7 +11,10 @@ extern "C" {
 
 #define BalExitOnFailure(x, f, ...) if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
 #define BalExitOnRootFailure(x, f, ...) if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); Dutil_RootFailure(__FILE__, __LINE__, x); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
+#define BalExitOnLastError(x, f, ...) { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } }
+#define BalExitOnNull(p, x, e, f, ...) if (NULL == p) { x = e; BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
 #define BalExitOnNullWithLastError(p, x, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
+#define BalExitWithLastError(x, f, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
 
 #ifndef FACILITY_WIX
 #define FACILITY_WIX 500
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 7fb53719..251df9d0 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
   <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.22" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
 </packages>
\ No newline at end of file