7 files changed, 37 insertions, 26 deletions

diff --git a/src/balutil/inc/BalBaseBAFunctions.h b/src/balutil/inc/BalBaseBAFunctions.h
index 054bfb26..ee2e452f 100644
--- a/src/balutil/inc/BalBaseBAFunctions.h
+++ b/src/balutil/inc/BalBaseBAFunctions.h
@@ -222,7 +222,8 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectPackageComplete(
         __in_z LPCWSTR /*wzPackageId*/,
         __in HRESULT /*hrStatus*/,
-        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/
+        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
+        __in BOOL /*fCached*/
         )
     {
         return S_OK;
@@ -257,9 +258,12 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
-        __in BOOL /*fInstallCondition*/,
+        __in BOOL /*fCached*/,
+        __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT /*installCondition*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
+        __in BOOTSTRAPPER_CACHE_TYPE /*recommendedCacheType*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestState*/,
+        __inout BOOTSTRAPPER_CACHE_TYPE* /*pRequestedCacheType*/,
         __inout BOOL* /*pfCancel*/
         )
     {
@@ -313,7 +317,9 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlannedPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_ACTION_STATE /*execute*/,
-        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/
+        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/,
+        __in BOOL /*fPlannedCache*/,
+        __in BOOL /*fPlannedUncache*/
         )
     {
         return S_OK;
diff --git a/src/balutil/inc/BalBaseBootstrapperApplication.h b/src/balutil/inc/BalBaseBootstrapperApplication.h
index 812025eb..bf21c4a5 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplication.h
@@ -228,7 +228,8 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectPackageComplete(
         __in_z LPCWSTR /*wzPackageId*/,
         __in HRESULT /*hrStatus*/,
-        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/
+        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
+        __in BOOL /*fCached*/
         )
     {
         return S_OK;
@@ -265,9 +266,12 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
-        __in BOOL /*fInstallCondition*/,
+        __in BOOL /*fCached*/,
+        __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT /*installCondition*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
+        __in BOOTSTRAPPER_CACHE_TYPE /*recommendedCacheType*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestState*/,
+        __inout BOOTSTRAPPER_CACHE_TYPE* /*pRequestedCacheType*/,
         __inout BOOL* pfCancel
         )
     {
@@ -325,7 +329,9 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlannedPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_ACTION_STATE /*execute*/,
-        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/
+        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/,
+        __in BOOL /*fPlannedCache*/,
+        __in BOOL /*fPlannedUncache*/
         )
     {
         return S_OK;
diff --git a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
index 10769529..7fe3ffd8 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -159,7 +159,7 @@ static HRESULT BalBaseBAProcOnDetectPackageComplete(
     __inout BA_ONDETECTPACKAGECOMPLETE_RESULTS* /*pResults*/
     )
 {
-    return pBA->OnDetectPackageComplete(pArgs->wzPackageId, pArgs->hrStatus, pArgs->state);
+    return pBA->OnDetectPackageComplete(pArgs->wzPackageId, pArgs->hrStatus, pArgs->state, pArgs->fCached);
 }
 
 static HRESULT BalBaseBAProcOnPlanRelatedBundle(
@@ -177,7 +177,7 @@ static HRESULT BalBaseBAProcOnPlanPackageBegin(
     __inout BA_ONPLANPACKAGEBEGIN_RESULTS* pResults
     )
 {
-    return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->state, pArgs->fInstallCondition, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->state, pArgs->fCached, pArgs->installCondition, pArgs->recommendedState, pArgs->recommendedCacheType, &pResults->requestedState, &pResults->requestedCacheType, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnPlanPatchTarget(
@@ -213,7 +213,7 @@ static HRESULT BalBaseBAProcOnPlannedPackage(
     __inout BA_ONPLANNEDPACKAGE_RESULTS* /*pResults*/
     )
 {
-    return pBA->OnPlannedPackage(pArgs->wzPackageId, pArgs->execute, pArgs->rollback);
+    return pBA->OnPlannedPackage(pArgs->wzPackageId, pArgs->execute, pArgs->rollback, pArgs->fPlannedCache, pArgs->fPlannedUncache);
 }
 
 static HRESULT BalBaseBAProcOnApplyBegin(
diff --git a/src/balutil/inc/IBootstrapperApplication.h b/src/balutil/inc/IBootstrapperApplication.h
index 7d6a7164..c284cb49 100644
--- a/src/balutil/inc/IBootstrapperApplication.h
+++ b/src/balutil/inc/IBootstrapperApplication.h
@@ -135,7 +135,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnDetectPackageComplete)(
         __in_z LPCWSTR wzPackageId,
         __in HRESULT hrStatus,
-        __in BOOTSTRAPPER_PACKAGE_STATE state
+        __in BOOTSTRAPPER_PACKAGE_STATE state,
+        __in BOOL fCached
         ) = 0;
 
     // OnDetectPackageComplete - called after the engine completes detection.
@@ -164,9 +165,12 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnPlanPackageBegin)(
         __in_z LPCWSTR wzPackageId,
         __in BOOTSTRAPPER_PACKAGE_STATE state,
-        __in BOOL fInstallCondition,
+        __in BOOL fCached,
+        __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
+        __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
+        __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType,
         __inout BOOL* pfCancel
         ) = 0;
 
@@ -214,7 +218,9 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnPlannedPackage)(
         __in_z LPCWSTR wzPackageId,
         __in BOOTSTRAPPER_ACTION_STATE execute,
-        __in BOOTSTRAPPER_ACTION_STATE rollback
+        __in BOOTSTRAPPER_ACTION_STATE rollback,
+        __in BOOL fPlannedCache,
+        __in BOOL fPlannedUncache
         ) = 0;
 
     // OnPlanComplete - called when the engine completes planning.
diff --git a/src/balutil/inc/IBootstrapperEngine.h b/src/balutil/inc/IBootstrapperEngine.h
index af6379f4..ccb07f4f 100644
--- a/src/balutil/inc/IBootstrapperEngine.h
+++ b/src/balutil/inc/IBootstrapperEngine.h
@@ -16,25 +16,25 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
     STDMETHOD(GetVariableString)(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T* pcchValue
         ) = 0;
 
     STDMETHOD(GetVariableVersion)(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T * pcchValue
         ) = 0;
 
     STDMETHOD(FormatString)(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T * pcchOut
         ) = 0;
 
     STDMETHOD(EscapeString)(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T * pcchOut
         ) = 0;
 
     STDMETHOD(EvaluateCondition)(
@@ -114,7 +114,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
         ) = 0;
 
     STDMETHOD(Apply)(
-        __in_opt HWND hwndParent
+        __in HWND hwndParent
         ) = 0;
 
     STDMETHOD(Quit)(
diff --git a/src/balutil/inc/balinfo.h b/src/balutil/inc/balinfo.h
index 0d838ae3..8c2155e9 100644
--- a/src/balutil/inc/balinfo.h
+++ b/src/balutil/inc/balinfo.h
@@ -18,13 +18,6 @@ typedef enum BAL_INFO_PACKAGE_TYPE
     BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH,
 } BAL_INFO_PACKAGE_TYPE;
 
-typedef enum BAL_INFO_CACHE_TYPE
-{
-    BAL_INFO_CACHE_TYPE_NO,
-    BAL_INFO_CACHE_TYPE_YES,
-    BAL_INFO_CACHE_TYPE_ALWAYS,
-} BAL_INFO_CACHE_TYPE;
-
 
 typedef struct _BAL_INFO_PACKAGE
 {
@@ -39,7 +32,7 @@ typedef struct _BAL_INFO_PACKAGE
     LPWSTR sczUpgradeCode;
     LPWSTR sczVersion;
     LPWSTR sczInstallCondition;
-    BAL_INFO_CACHE_TYPE cacheType;
+    BOOTSTRAPPER_CACHE_TYPE cacheType;
     BOOL fPrereqPackage;
     LPWSTR sczPrereqLicenseFile;
     LPWSTR sczPrereqLicenseUrl;
diff --git a/src/balutil/inc/balutil.h b/src/balutil/inc/balutil.h
index affa4925..fad8a471 100644
--- a/src/balutil/inc/balutil.h
+++ b/src/balutil/inc/balutil.h
@@ -51,7 +51,7 @@ DAPI_(void) BalInitialize(
 ********************************************************************/
 DAPI_(HRESULT) BalInitializeFromCreateArgs(
     __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __out IBootstrapperEngine** ppEngine
+    __out_opt IBootstrapperEngine** ppEngine
     );
 
 /*******************************************************************