diff options
| -rw-r--r-- | src/burn/engine/elevation.cpp | 8 | ||||
| -rw-r--r-- | src/burn/engine/plan.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp index acaa8276..ef87841f 100644 --- a/src/burn/engine/elevation.cpp +++ b/src/burn/engine/elevation.cpp | |||
| @@ -1452,9 +1452,9 @@ extern "C" HRESULT ElevationExecutePackageDependencyAction( | |||
| 1452 | ExitOnFailure(hr, "Failed to write bundle dependency key to message buffer."); | 1452 | ExitOnFailure(hr, "Failed to write bundle dependency key to message buffer."); |
| 1453 | 1453 | ||
| 1454 | // Dependent actions. | 1454 | // Dependent actions. |
| 1455 | for (DWORD i = 0; i < pExecuteAction->packageProvider.pPackage->cDependencyProviders; ++i) | 1455 | for (DWORD i = 0; i < pExecuteAction->packageDependency.pPackage->cDependencyProviders; ++i) |
| 1456 | { | 1456 | { |
| 1457 | BURN_DEPENDENCY_PROVIDER* pProvider = pExecuteAction->packageProvider.pPackage->rgDependencyProviders + i; | 1457 | BURN_DEPENDENCY_PROVIDER* pProvider = pExecuteAction->packageDependency.pPackage->rgDependencyProviders + i; |
| 1458 | BURN_DEPENDENCY_ACTION* pAction = fRollback ? &pProvider->dependentRollback : &pProvider->dependentExecute; | 1458 | BURN_DEPENDENCY_ACTION* pAction = fRollback ? &pProvider->dependentRollback : &pProvider->dependentExecute; |
| 1459 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)*pAction); | 1459 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)*pAction); |
| 1460 | ExitOnFailure(hr, "Failed to write dependent action to message buffer."); | 1460 | ExitOnFailure(hr, "Failed to write dependent action to message buffer."); |
| @@ -3486,9 +3486,9 @@ static HRESULT OnExecutePackageDependencyAction( | |||
| 3486 | ExitOnFailure(hr, "Failed to read bundle dependency key from message buffer."); | 3486 | ExitOnFailure(hr, "Failed to read bundle dependency key from message buffer."); |
| 3487 | 3487 | ||
| 3488 | // Read dependent actions. | 3488 | // Read dependent actions. |
| 3489 | for (DWORD i = 0; i < executeAction.packageProvider.pPackage->cDependencyProviders; ++i) | 3489 | for (DWORD i = 0; i < executeAction.packageDependency.pPackage->cDependencyProviders; ++i) |
| 3490 | { | 3490 | { |
| 3491 | BURN_DEPENDENCY_PROVIDER* pProvider = executeAction.packageProvider.pPackage->rgDependencyProviders + i; | 3491 | BURN_DEPENDENCY_PROVIDER* pProvider = executeAction.packageDependency.pPackage->rgDependencyProviders + i; |
| 3492 | BURN_DEPENDENCY_ACTION* pAction = fRollback ? &pProvider->dependentRollback : &pProvider->dependentExecute; | 3492 | BURN_DEPENDENCY_ACTION* pAction = fRollback ? &pProvider->dependentRollback : &pProvider->dependentExecute; |
| 3493 | hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)pAction); | 3493 | hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)pAction); |
| 3494 | ExitOnFailure(hr, "Failed to read dependent action."); | 3494 | ExitOnFailure(hr, "Failed to read dependent action."); |
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp index 9feb56ff..edc09033 100644 --- a/src/burn/engine/plan.cpp +++ b/src/burn/engine/plan.cpp | |||
| @@ -2951,9 +2951,9 @@ static void ExecuteActionLog( | |||
| 2951 | 2951 | ||
| 2952 | case BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY: | 2952 | case BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY: |
| 2953 | LogStringLine(PlanDumpLevel, "%ls action[%u]: PACKAGE_DEPENDENCY package id: %ls, bundle provider key: %ls", wzBase, iAction, pAction->packageDependency.pPackage->sczId, pAction->packageDependency.sczBundleProviderKey); | 2953 | LogStringLine(PlanDumpLevel, "%ls action[%u]: PACKAGE_DEPENDENCY package id: %ls, bundle provider key: %ls", wzBase, iAction, pAction->packageDependency.pPackage->sczId, pAction->packageDependency.sczBundleProviderKey); |
| 2954 | for (DWORD j = 0; j < pAction->packageProvider.pPackage->cDependencyProviders; ++j) | 2954 | for (DWORD j = 0; j < pAction->packageDependency.pPackage->cDependencyProviders; ++j) |
| 2955 | { | 2955 | { |
| 2956 | const BURN_DEPENDENCY_PROVIDER* pProvider = pAction->packageProvider.pPackage->rgDependencyProviders + j; | 2956 | const BURN_DEPENDENCY_PROVIDER* pProvider = pAction->packageDependency.pPackage->rgDependencyProviders + j; |
| 2957 | LogStringLine(PlanDumpLevel, " Provider[%u]: key: %ls, action: %hs", j, pProvider->sczKey, LoggingDependencyActionToString(fRollback ? pProvider->dependentRollback : pProvider->dependentExecute)); | 2957 | LogStringLine(PlanDumpLevel, " Provider[%u]: key: %ls, action: %hs", j, pProvider->sczKey, LoggingDependencyActionToString(fRollback ? pProvider->dependentRollback : pProvider->dependentExecute)); |
| 2958 | } | 2958 | } |
| 2959 | break; | 2959 | break; |
