WIXFEAT:6164 Update BAL_INFO_PACKAGE with bal specific data.

2 files changed, 10 insertions, 2 deletions

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