Add InProgressDisplayName for bundles.

#6296

4 files changed, 18 insertions, 12 deletions

diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
index ee2e452f..c5771efc 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -379,7 +379,9 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnRegisterBegin(
-        __inout BOOL* /*pfCancel*/
+        __in BOOTSTRAPPER_REGISTRATION_TYPE /*recommendedRegistrationType*/,
+        __inout BOOL* /*pfCancel*/,
+        __inout BOOTSTRAPPER_REGISTRATION_TYPE* /*pRegistrationType*/
         )
     {
         return S_OK;
@@ -597,8 +599,8 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnUnregisterBegin(
-        __in BOOL /*fKeepRegistration*/,
-        __inout BOOL* /*pfForceKeepRegistration*/
+        __in BOOTSTRAPPER_REGISTRATION_TYPE /*recommendedRegistrationType*/,
+        __inout BOOTSTRAPPER_REGISTRATION_TYPE* /*pRegistrationType*/
         )
     {
         return S_OK;
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index bf21c4a5..393987ba 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -435,7 +435,9 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnRegisterBegin(
-        __inout BOOL* pfCancel
+        __in BOOTSTRAPPER_REGISTRATION_TYPE /*recommendedRegistrationType*/,
+        __inout BOOL* pfCancel,
+        __inout BOOTSTRAPPER_REGISTRATION_TYPE* /*pRegistrationType*/
         )
     {
         *pfCancel |= CheckCanceled();
@@ -769,8 +771,8 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnUnregisterBegin(
-        __in BOOL /*fKeepRegistration*/,
-        __inout BOOL* /*pfForceKeepRegistration*/
+        __in BOOTSTRAPPER_REGISTRATION_TYPE /*recommendedRegistrationType*/,
+        __inout BOOTSTRAPPER_REGISTRATION_TYPE* /*pRegistrationType*/
         )
     {
         return S_OK;
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
index 7fe3ffd8..69031d62 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -263,11 +263,11 @@ static HRESULT BalBaseBAProcOnError(
 
 static HRESULT BalBaseBAProcOnRegisterBegin(
     __in IBootstrapperApplication* pBA,
-    __in BA_ONREGISTERBEGIN_ARGS* /*pArgs*/,
+    __in BA_ONREGISTERBEGIN_ARGS* pArgs,
     __inout BA_ONREGISTERBEGIN_RESULTS* pResults
     )
 {
-    return pBA->OnRegisterBegin(&pResults->fCancel);
+    return pBA->OnRegisterBegin(pArgs->recommendedRegistrationType, &pResults->fCancel, &pResults->registrationType);
 }
 
 static HRESULT BalBaseBAProcOnRegisterComplete(
@@ -456,7 +456,7 @@ static HRESULT BalBaseBAProcOnUnregisterBegin(
     __inout BA_ONUNREGISTERBEGIN_RESULTS* pResults
     )
 {
-    return pBA->OnUnregisterBegin(pArgs->fKeepRegistration, &pResults->fForceKeepRegistration);
+    return pBA->OnUnregisterBegin(pArgs->recommendedRegistrationType, &pResults->registrationType);
 }
 
 static HRESULT BalBaseBAProcOnUnregisterComplete(
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index c284cb49..98b88f44 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -280,7 +280,9 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     // OnRegisterBegin - called when the engine registers the bundle.
     //
     STDMETHOD(OnRegisterBegin)(
-        __inout BOOL* pfCancel
+        __in BOOTSTRAPPER_REGISTRATION_TYPE recommendedRegistrationType,
+        __inout BOOL* pfCancel,
+        __inout BOOTSTRAPPER_REGISTRATION_TYPE* pRegistrationType
         ) = 0;
 
     // OnRegisterComplete - called when the engine registration is
@@ -519,8 +521,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     // OnUnregisterBegin - called when the engine unregisters the bundle.
     //
     STDMETHOD(OnUnregisterBegin)(
-        __in BOOL fKeepRegistration,
-        __inout BOOL* pfForceKeepRegistration
+        __in BOOTSTRAPPER_REGISTRATION_TYPE recommendedRegistrationType,
+        __inout BOOTSTRAPPER_REGISTRATION_TYPE* pRegistrationType
         ) = 0;
 
     // OnUnregisterComplete - called when the engine unregistration is complete.