Plan each dependency provider individually.

Refactoring for #6510

8 files changed, 146 insertions, 81 deletions

diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp
index 9185e33a..2168cba6 100644
--- a/src/burn/engine/apply.cpp
+++ b/src/burn/engine/apply.cpp
@@ -252,7 +252,8 @@ static HRESULT ExecuteMsuPackage(
 static HRESULT ExecutePackageProviderAction(
     __in BURN_ENGINE_STATE* pEngineState,
     __in BURN_EXECUTE_ACTION* pAction,
-    __in BURN_EXECUTE_CONTEXT* pContext
+    __in BURN_EXECUTE_CONTEXT* pContext,
+    __in BOOL fRollback
     );
 static HRESULT ExecuteDependencyAction(
     __in BURN_ENGINE_STATE* pEngineState,
@@ -2351,7 +2352,7 @@ static HRESULT DoExecuteAction(
             break;
 
         case BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER:
-            hr = ExecutePackageProviderAction(pEngineState, pExecuteAction, pContext);
+            hr = ExecutePackageProviderAction(pEngineState, pExecuteAction, pContext, FALSE);
             ExitOnFailure(hr, "Failed to execute package provider registration action.");
             break;
 
@@ -2474,7 +2475,7 @@ static HRESULT DoRollbackActions(
                 break;
 
             case BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER:
-                hr = ExecutePackageProviderAction(pEngineState, pRollbackAction, pContext);
+                hr = ExecutePackageProviderAction(pEngineState, pRollbackAction, pContext, TRUE);
                 IgnoreRollbackError(hr, "Failed to rollback package provider action.");
                 break;
 
@@ -2887,19 +2888,23 @@ LExit:
 static HRESULT ExecutePackageProviderAction(
     __in BURN_ENGINE_STATE* pEngineState,
     __in BURN_EXECUTE_ACTION* pAction,
-    __in BURN_EXECUTE_CONTEXT* /*pContext*/
+    __in BURN_EXECUTE_CONTEXT* pContext,
+    __in BOOL fRollback
     )
 {
     HRESULT hr = S_OK;
 
+    Assert(pContext->fRollback == fRollback);
+    UNREFERENCED_PARAMETER(pContext);
+
     if (pAction->packageProvider.pPackage->fPerMachine)
     {
-        hr = ElevationExecutePackageProviderAction(pEngineState->companionConnection.hPipe, pAction);
+        hr = ElevationExecutePackageProviderAction(pEngineState->companionConnection.hPipe, pAction, fRollback);
         ExitOnFailure(hr, "Failed to register the package provider on per-machine package.");
     }
     else
     {
-        hr = DependencyExecutePackageProviderAction(pAction);
+        hr = DependencyExecutePackageProviderAction(pAction, fRollback);
         ExitOnFailure(hr, "Failed to register the package provider on per-user package.");
     }
 
diff --git a/src/burn/engine/dependency.cpp b/src/burn/engine/dependency.cpp
index e94b0e93..8f568f28 100644
--- a/src/burn/engine/dependency.cpp
+++ b/src/burn/engine/dependency.cpp
@@ -59,11 +59,17 @@ static LPCWSTR GetPackageProviderId(
     );
 
 static HRESULT RegisterPackageProvider(
-    __in const BURN_PACKAGE* pPackage
+    __in const BURN_DEPENDENCY_PROVIDER* pProvider,
+    __in LPCWSTR wzPackageId,
+    __in LPCWSTR wzPackageProviderId,
+    __in HKEY hkRoot,
+    __in BOOL fVital
     );
 
 static void UnregisterPackageProvider(
-    __in const BURN_PACKAGE* pPackage
+    __in const BURN_DEPENDENCY_PROVIDER* pProvider,
+    __in LPCWSTR wzPackageId,
+    __in HKEY hkRoot
     );
 
 static HRESULT RegisterPackageDependency(
@@ -489,6 +495,8 @@ extern "C" HRESULT DependencyPlanPackageBegin(
     {
         pPackage->execute = BOOTSTRAPPER_ACTION_STATE_NONE;
         pPackage->rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
+
+        // Assume the compatible package has the same exact providers.
         pPackage->compatiblePackage.fRemove = FALSE;
     }
     else
@@ -511,8 +519,22 @@ extern "C" HRESULT DependencyPlanPackageBegin(
 
             if (!fAllImportedProviders)
             {
-                pPackage->providerExecute = dependencyExecuteAction;
-                pPackage->providerRollback = dependencyRollbackAction;
+                for (DWORD i = 0; i < pPackage->cDependencyProviders; ++i)
+                {
+                    BURN_DEPENDENCY_PROVIDER* pProvider = &pPackage->rgDependencyProviders[i];
+                    pProvider->providerExecute = dependencyExecuteAction;
+                    pProvider->providerRollback = dependencyRollbackAction;
+                }
+
+                if (BURN_DEPENDENCY_ACTION_NONE != dependencyExecuteAction)
+                {
+                    pPackage->fProviderExecute = TRUE;
+                }
+
+                if (BURN_DEPENDENCY_ACTION_NONE != dependencyRollbackAction)
+                {
+                    pPackage->fProviderRollback = TRUE;
+                }
             }
         }
 
@@ -556,14 +578,13 @@ extern "C" HRESULT DependencyPlanPackage(
     }
 
     // Add the provider rollback plan.
-    if (BURN_DEPENDENCY_ACTION_NONE != pPackage->providerRollback)
+    if (pPackage->fProviderRollback)
     {
         hr = PlanAppendRollbackAction(pPlan, &pAction);
         ExitOnFailure(hr, "Failed to append provider rollback action.");
 
         pAction->type = BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER;
         pAction->packageProvider.pPackage = const_cast<BURN_PACKAGE*>(pPackage);
-        pAction->packageProvider.action = pPackage->providerRollback;
 
         // Put a checkpoint before the execute action so that rollback happens
         // if execute fails.
@@ -573,7 +594,7 @@ extern "C" HRESULT DependencyPlanPackage(
 
     // Add the provider execute plan. This comes after rollback so if something goes wrong
     // rollback will try to clean up after us.
-    if (BURN_DEPENDENCY_ACTION_NONE != pPackage->providerExecute)
+    if (pPackage->fProviderExecute)
     {
         if (NULL != pdwInsertSequence)
         {
@@ -592,7 +613,6 @@ extern "C" HRESULT DependencyPlanPackage(
 
         pAction->type = BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER;
         pAction->packageProvider.pPackage = const_cast<BURN_PACKAGE*>(pPackage);
-        pAction->packageProvider.action = pPackage->providerExecute;
     }
 
 LExit:
@@ -627,26 +647,39 @@ LExit:
 }
 
 extern "C" HRESULT DependencyExecutePackageProviderAction(
-    __in const BURN_EXECUTE_ACTION* pAction
+    __in const BURN_EXECUTE_ACTION* pAction,
+    __in BOOL fRollback
     )
 {
     AssertSz(BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER == pAction->type, "Execute action type not supported by this function.");
 
     HRESULT hr = S_OK;
     const BURN_PACKAGE* pPackage = pAction->packageProvider.pPackage;
+    HKEY hkRoot = pPackage->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+    LPCWSTR wzId = GetPackageProviderId(pPackage);
 
-    // Register or unregister the package provider(s).
-    if (BURN_DEPENDENCY_ACTION_REGISTER == pAction->packageProvider.action)
-    {
-        hr = RegisterPackageProvider(pPackage);
-        ExitOnFailure(hr, "Failed to register the package providers.");
-    }
-    else if (BURN_DEPENDENCY_ACTION_UNREGISTER == pAction->packageProvider.action)
+    for (DWORD i = 0; i < pPackage->cDependencyProviders; ++i)
     {
-        UnregisterPackageProvider(pPackage);
+        const BURN_DEPENDENCY_PROVIDER* pProvider = pPackage->rgDependencyProviders + i;
+        BURN_DEPENDENCY_ACTION action = fRollback ? pProvider->providerRollback : pProvider->providerExecute;
+        HRESULT hrProvider = S_OK;
+
+        // Register or unregister the package provider.
+        switch (action)
+        {
+        case BURN_DEPENDENCY_ACTION_REGISTER:
+            hrProvider = RegisterPackageProvider(pProvider, pPackage->sczId, wzId, hkRoot, pPackage->fVital);
+            if (SUCCEEDED(hr) && FAILED(hrProvider))
+            {
+                hr = hrProvider;
+            }
+            break;
+        case BURN_DEPENDENCY_ACTION_UNREGISTER:
+            UnregisterPackageProvider(pProvider, pPackage->sczId, hkRoot);
+            break;
+        }
     }
 
-LExit:
     if (!pPackage->fVital)
     {
         hr = S_OK;
@@ -1175,7 +1208,7 @@ static void CalculateDependencyActionStates(
         case BOOTSTRAPPER_ACTION_STATE_INSTALL: __fallthrough;
         case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
         case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
-        case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough;
+        case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
             *pDependencyExecuteAction = BURN_DEPENDENCY_ACTION_REGISTER;
             break;
         }
@@ -1188,7 +1221,7 @@ static void CalculateDependencyActionStates(
         switch (pPackage->currentState)
         {
         case BOOTSTRAPPER_PACKAGE_STATE_OBSOLETE: __fallthrough;
-        case BOOTSTRAPPER_PACKAGE_STATE_ABSENT: __fallthrough;
+        case BOOTSTRAPPER_PACKAGE_STATE_ABSENT:
             *pDependencyRollbackAction = BURN_DEPENDENCY_ACTION_UNREGISTER;
             break;
         }
@@ -1291,32 +1324,25 @@ static LPCWSTR GetPackageProviderId(
 }
 
 static HRESULT RegisterPackageProvider(
-    __in const BURN_PACKAGE* pPackage
+    __in const BURN_DEPENDENCY_PROVIDER* pProvider,
+    __in LPCWSTR wzPackageId,
+    __in LPCWSTR wzPackageProviderId,
+    __in HKEY hkRoot,
+    __in BOOL fVital
     )
 {
     HRESULT hr = S_OK;
 
-    if (pPackage->rgDependencyProviders)
+    if (!pProvider->fImported)
     {
-        HKEY hkRoot = pPackage->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-        LPCWSTR wzId = GetPackageProviderId(pPackage);
-
-        for (DWORD i = 0; i < pPackage->cDependencyProviders; ++i)
-        {
-            const BURN_DEPENDENCY_PROVIDER* pProvider = &pPackage->rgDependencyProviders[i];
-
-            if (!pProvider->fImported)
-            {
-                LogId(REPORT_VERBOSE, MSG_DEPENDENCY_PACKAGE_REGISTER, pProvider->sczKey, pProvider->sczVersion, pPackage->sczId);
+        LogId(REPORT_VERBOSE, MSG_DEPENDENCY_PACKAGE_REGISTER, pProvider->sczKey, pProvider->sczVersion, wzPackageId);
 
-                hr = DepRegisterDependency(hkRoot, pProvider->sczKey, pProvider->sczVersion, pProvider->sczDisplayName, wzId, 0);
-                ExitOnFailure(hr, "Failed to register the package dependency provider: %ls", pProvider->sczKey);
-            }
-        }
+        hr = DepRegisterDependency(hkRoot, pProvider->sczKey, pProvider->sczVersion, pProvider->sczDisplayName, wzPackageProviderId, 0);
+        ExitOnFailure(hr, "Failed to register the package dependency provider: %ls", pProvider->sczKey);
     }
 
 LExit:
-    if (!pPackage->fVital)
+    if (!fVital)
     {
         hr = S_OK;
     }
@@ -1325,36 +1351,28 @@ LExit:
 }
 
 /********************************************************************
- UnregisterPackageProvider - Removes each dependency provider
-  for the package (if not imported from the package itself).
+ UnregisterPackageProvider - Removes the dependency provider.
 
  Note: Does not check for existing dependents before removing the key.
 *********************************************************************/
 static void UnregisterPackageProvider(
-    __in const BURN_PACKAGE* pPackage
+    __in const BURN_DEPENDENCY_PROVIDER* pProvider,
+    __in LPCWSTR wzPackageId,
+    __in HKEY hkRoot
     )
 {
     HRESULT hr = S_OK;
-    HKEY hkRoot = pPackage->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
-    if (pPackage->rgDependencyProviders)
+    if (!pProvider->fImported)
     {
-        for (DWORD i = 0; i < pPackage->cDependencyProviders; ++i)
+        hr = DepUnregisterDependency(hkRoot, pProvider->sczKey);
+        if (SUCCEEDED(hr))
         {
-            const BURN_DEPENDENCY_PROVIDER* pProvider = &pPackage->rgDependencyProviders[i];
-
-            if (!pProvider->fImported)
-            {
-                hr = DepUnregisterDependency(hkRoot, pProvider->sczKey);
-                if (SUCCEEDED(hr))
-                {
-                    LogId(REPORT_VERBOSE, MSG_DEPENDENCY_PACKAGE_UNREGISTERED, pProvider->sczKey, pPackage->sczId);
-                }
-                else if (FAILED(hr) && E_FILENOTFOUND != hr)
-                {
-                    LogId(REPORT_VERBOSE, MSG_DEPENDENCY_PACKAGE_UNREGISTERED_FAILED, pProvider->sczKey, pPackage->sczId, hr);
-                }
-            }
+            LogId(REPORT_VERBOSE, MSG_DEPENDENCY_PACKAGE_UNREGISTERED, pProvider->sczKey, wzPackageId);
+        }
+        else if (FAILED(hr) && E_FILENOTFOUND != hr)
+        {
+            LogId(REPORT_VERBOSE, MSG_DEPENDENCY_PACKAGE_UNREGISTERED_FAILED, pProvider->sczKey, wzPackageId, hr);
         }
     }
 }
diff --git a/src/burn/engine/dependency.h b/src/burn/engine/dependency.h
index 41718066..0e558554 100644
--- a/src/burn/engine/dependency.h
+++ b/src/burn/engine/dependency.h
@@ -150,7 +150,8 @@ HRESULT DependencyPlanPackageComplete(
 
 *********************************************************************/
 HRESULT DependencyExecutePackageProviderAction(
-    __in const BURN_EXECUTE_ACTION* pAction
+    __in const BURN_EXECUTE_ACTION* pAction,
+    __in BOOL fRollback
     );
 
 /********************************************************************
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index eafc08ee..75679acd 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -1305,7 +1305,8 @@ LExit:
 
 extern "C" HRESULT ElevationExecutePackageProviderAction(
     __in HANDLE hPipe,
-    __in BURN_EXECUTE_ACTION* pExecuteAction
+    __in BURN_EXECUTE_ACTION* pExecuteAction,
+    __in BOOL fRollback
     )
 {
     HRESULT hr = S_OK;
@@ -1318,8 +1319,17 @@ extern "C" HRESULT ElevationExecutePackageProviderAction(
     hr = BuffWriteString(&pbData, &cbData, pExecuteAction->packageProvider.pPackage->sczId);
     ExitOnFailure(hr, "Failed to write package id to message buffer.");
 
-    hr = BuffWriteNumber(&pbData, &cbData, pExecuteAction->packageProvider.action);
-    ExitOnFailure(hr, "Failed to write action to message buffer.");
+    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)fRollback);
+    ExitOnFailure(hr, "Failed to write rollback flag to message buffer.");
+
+    // Provider actions.
+    for (DWORD i = 0; i < pExecuteAction->packageProvider.pPackage->cDependencyProviders; ++i)
+    {
+        BURN_DEPENDENCY_PROVIDER* pProvider = pExecuteAction->packageProvider.pPackage->rgDependencyProviders + i;
+        BURN_DEPENDENCY_ACTION* pAction = fRollback ? &pProvider->providerRollback : &pProvider->providerExecute;
+        hr = BuffWriteNumber(&pbData, &cbData, (DWORD)*pAction);
+        ExitOnFailure(hr, "Failed to write provider action to message buffer.");
+    }
 
     // Send the message.
     hr = PipeSendMessage(hPipe, BURN_ELEVATION_MESSAGE_TYPE_EXECUTE_PACKAGE_PROVIDER, pbData, cbData, NULL, NULL, &dwResult);
@@ -2840,7 +2850,7 @@ static HRESULT OnExecuteMsiPackage(
     SIZE_T iData = 0;
     LPWSTR sczPackage = NULL;
     HWND hwndParent = NULL;
-    BOOL fRollback = 0;
+    BOOL fRollback = FALSE;
     BURN_EXECUTE_ACTION executeAction = { };
     BOOTSTRAPPER_APPLY_RESTART msiRestart = BOOTSTRAPPER_APPLY_RESTART_NONE;
 
@@ -2946,7 +2956,7 @@ static HRESULT OnExecuteMspPackage(
     SIZE_T iData = 0;
     LPWSTR sczPackage = NULL;
     HWND hwndParent = NULL;
-    BOOL fRollback = 0;
+    BOOL fRollback = FALSE;
     BURN_EXECUTE_ACTION executeAction = { };
     BOOTSTRAPPER_APPLY_RESTART restart = BOOTSTRAPPER_APPLY_RESTART_NONE;
 
@@ -3117,7 +3127,7 @@ static HRESULT OnUninstallMsiCompatiblePackage(
     LPWSTR sczPackageId = NULL;
     LPWSTR sczCompatiblePackageId = NULL;
     HWND hwndParent = NULL;
-    BOOL fRollback = 0;
+    BOOL fRollback = FALSE;
     BURN_EXECUTE_ACTION executeAction = { };
     BURN_PACKAGE* pPackage = NULL;
     BURN_COMPATIBLE_PACKAGE* pCompatiblePackage = NULL;
@@ -3195,6 +3205,7 @@ static HRESULT OnExecutePackageProviderAction(
     HRESULT hr = S_OK;
     SIZE_T iData = 0;
     LPWSTR sczPackage = NULL;
+    BOOL fRollback = FALSE;
     BURN_EXECUTE_ACTION executeAction = { };
 
     executeAction.type = BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER;
@@ -3203,9 +3214,6 @@ static HRESULT OnExecutePackageProviderAction(
     hr = BuffReadString(pbData, cbData, &iData, &sczPackage);
     ExitOnFailure(hr, "Failed to read package id from message buffer.");
 
-    hr = BuffReadNumber(pbData, cbData, &iData, reinterpret_cast<DWORD*>(&executeAction.packageProvider.action));
-    ExitOnFailure(hr, "Failed to read action.");
-
     // Find the package again.
     hr = PackageFindById(pPackages, sczPackage, &executeAction.packageProvider.pPackage);
     if (E_NOTFOUND == hr)
@@ -3214,8 +3222,25 @@ static HRESULT OnExecutePackageProviderAction(
     }
     ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
 
+    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&fRollback);
+    ExitOnFailure(hr, "Failed to read rollback flag.");
+
+    // Read provider actions.
+    for (DWORD i = 0; i < executeAction.packageProvider.pPackage->cDependencyProviders; ++i)
+    {
+        BURN_DEPENDENCY_PROVIDER* pProvider = executeAction.packageProvider.pPackage->rgDependencyProviders + i;
+        BURN_DEPENDENCY_ACTION* pAction = fRollback ? &pProvider->providerRollback : &pProvider->providerExecute;
+        hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)pAction);
+        ExitOnFailure(hr, "Failed to read provider action.");
+    }
+
+    if (!executeAction.packageProvider.pPackage->fPerMachine)
+    {
+        ExitWithRootFailure(hr, E_INVALIDARG, "ExecutePackageProviderAction called for per-user package.");
+    }
+
     // Execute the package provider action.
-    hr = DependencyExecutePackageProviderAction(&executeAction);
+    hr = DependencyExecutePackageProviderAction(&executeAction, fRollback);
     ExitOnFailure(hr, "Failed to execute package provider action.");
 
 LExit:
diff --git a/src/burn/engine/elevation.h b/src/burn/engine/elevation.h
index 9659ef89..f5b56f02 100644
--- a/src/burn/engine/elevation.h
+++ b/src/burn/engine/elevation.h
@@ -139,7 +139,8 @@ HRESULT ElevationUninstallMsiCompatiblePackage(
     );
 HRESULT ElevationExecutePackageProviderAction(
     __in HANDLE hPipe,
-    __in BURN_EXECUTE_ACTION* pExecuteAction
+    __in BURN_EXECUTE_ACTION* pExecuteAction,
+    __in BOOL fRollback
     );
 HRESULT ElevationExecutePackageDependencyAction(
     __in HANDLE hPipe,
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index eb812e20..6fae0c10 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -195,6 +195,9 @@ typedef struct _BURN_DEPENDENCY_PROVIDER
 
     DEPENDENCY* rgDependents; // only valid after Detect.
     UINT cDependents;         // only valid after Detect.
+
+    BURN_DEPENDENCY_ACTION providerExecute;    // only valid during Plan.
+    BURN_DEPENDENCY_ACTION providerRollback;   // only valid during Plan.
 } BURN_DEPENDENCY_PROVIDER;
 
 typedef struct _BURN_ROLLBACK_BOUNDARY
@@ -267,8 +270,8 @@ typedef struct _BURN_PACKAGE
     BOOL fPlannedUncache;                       // only valid during Plan.
     BOOTSTRAPPER_ACTION_STATE execute;          // only valid during Plan.
     BOOTSTRAPPER_ACTION_STATE rollback;         // only valid during Plan.
-    BURN_DEPENDENCY_ACTION providerExecute;     // only valid during Plan.
-    BURN_DEPENDENCY_ACTION providerRollback;    // only valid during Plan.
+    BOOL fProviderExecute;                      // only valid during Plan.
+    BOOL fProviderRollback;                     // only valid during Plan.
     BURN_DEPENDENCY_ACTION dependencyExecute;   // only valid during Plan.
     BURN_DEPENDENCY_ACTION dependencyRollback;  // only valid during Plan.
     BOOL fDependencyManagerWasHere;             // only valid during Plan.
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index a25b17d7..27eee3fb 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -1922,8 +1922,8 @@ static void ResetPlannedPackageState(
     pPackage->fPlannedUncache = FALSE;
     pPackage->execute = BOOTSTRAPPER_ACTION_STATE_NONE;
     pPackage->rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
-    pPackage->providerExecute = BURN_DEPENDENCY_ACTION_NONE;
-    pPackage->providerRollback = BURN_DEPENDENCY_ACTION_NONE;
+    pPackage->fProviderExecute = FALSE;
+    pPackage->fProviderRollback = FALSE;
     pPackage->dependencyExecute = BURN_DEPENDENCY_ACTION_NONE;
     pPackage->dependencyRollback = BURN_DEPENDENCY_ACTION_NONE;
     pPackage->fDependencyManagerWasHere = FALSE;
@@ -1969,6 +1969,14 @@ static void ResetPlannedPackageState(
         }
     }
 
+    for (DWORD i = 0; i < pPackage->cDependencyProviders; ++i)
+    {
+        BURN_DEPENDENCY_PROVIDER* pProvider = &pPackage->rgDependencyProviders[i];
+
+        pProvider->providerExecute = BURN_DEPENDENCY_ACTION_NONE;
+        pProvider->providerRollback = BURN_DEPENDENCY_ACTION_NONE;
+    }
+
     ResetPlannedPayloadGroupState(&pPackage->payloads);
 }
 
@@ -2637,7 +2645,12 @@ static void ExecuteActionLog(
         break;
 
     case BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER:
-        LogStringLine(PlanDumpLevel, "%ls action[%u]: PACKAGE_PROVIDER package id: %ls, action: %hs", wzBase, iAction, pAction->packageProvider.pPackage->sczId, LoggingDependencyActionToString(pAction->packageProvider.action));
+        LogStringLine(PlanDumpLevel, "%ls action[%u]: PACKAGE_PROVIDER package id: %ls", wzBase, iAction, pAction->packageProvider.pPackage->sczId);
+        for (DWORD j = 0; j < pAction->packageProvider.pPackage->cDependencyProviders; ++j)
+        {
+            const BURN_DEPENDENCY_PROVIDER* pProvider = pAction->packageProvider.pPackage->rgDependencyProviders + j;
+            LogStringLine(PlanDumpLevel, "      Provider[%u]: key: %ls, action: %hs", j, pProvider->sczKey, LoggingDependencyActionToString(fRollback ? pProvider->providerRollback : pProvider->providerExecute));
+        }
         break;
 
     case BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY:
diff --git a/src/burn/engine/plan.h b/src/burn/engine/plan.h
index 15092210..61953168 100644
--- a/src/burn/engine/plan.h
+++ b/src/burn/engine/plan.h
@@ -208,7 +208,6 @@ typedef struct _BURN_EXECUTE_ACTION
         struct
         {
             BURN_PACKAGE* pPackage;
-            BURN_DEPENDENCY_ACTION action;
         } packageProvider;
         struct
         {