diff options
Diffstat (limited to 'src/engine/apply.cpp')
-rw-r--r-- | src/engine/apply.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp index 0cef9ac8..ee11cdee 100644 --- a/src/engine/apply.cpp +++ b/src/engine/apply.cpp | |||
@@ -2064,7 +2064,7 @@ static HRESULT ExecuteExePackage( | |||
2064 | fBeginCalled = TRUE; | 2064 | fBeginCalled = TRUE; |
2065 | 2065 | ||
2066 | // Send package execute begin to BA. | 2066 | // Send package execute begin to BA. |
2067 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->exePackage.pPackage->sczId, !fRollback); | 2067 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->exePackage.pPackage->sczId, !fRollback, pExecuteAction->exePackage.action); |
2068 | ExitOnRootFailure(hr, "BA aborted execute EXE package begin."); | 2068 | ExitOnRootFailure(hr, "BA aborted execute EXE package begin."); |
2069 | 2069 | ||
2070 | message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS; | 2070 | message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS; |
@@ -2072,7 +2072,7 @@ static HRESULT ExecuteExePackage( | |||
2072 | message.progress.dwPercentage = fRollback ? 100 : 0; | 2072 | message.progress.dwPercentage = fRollback ? 100 : 0; |
2073 | nResult = GenericExecuteMessageHandler(&message, pContext); | 2073 | nResult = GenericExecuteMessageHandler(&message, pContext); |
2074 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); | 2074 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); |
2075 | ExitOnRootFailure(hr, "UX aborted EXE progress."); | 2075 | ExitOnRootFailure(hr, "BA aborted EXE progress."); |
2076 | 2076 | ||
2077 | // Execute package. | 2077 | // Execute package. |
2078 | if (pExecuteAction->exePackage.pPackage->fPerMachine) | 2078 | if (pExecuteAction->exePackage.pPackage->fPerMachine) |
@@ -2091,13 +2091,13 @@ static HRESULT ExecuteExePackage( | |||
2091 | message.progress.dwPercentage = fRollback ? 0 : 100; | 2091 | message.progress.dwPercentage = fRollback ? 0 : 100; |
2092 | nResult = GenericExecuteMessageHandler(&message, pContext); | 2092 | nResult = GenericExecuteMessageHandler(&message, pContext); |
2093 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); | 2093 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); |
2094 | ExitOnRootFailure(hr, "UX aborted EXE progress."); | 2094 | ExitOnRootFailure(hr, "BA aborted EXE progress."); |
2095 | 2095 | ||
2096 | pContext->cExecutedPackages += fRollback ? -1 : 1; | 2096 | pContext->cExecutedPackages += fRollback ? -1 : 1; |
2097 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; | 2097 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; |
2098 | 2098 | ||
2099 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); | 2099 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); |
2100 | ExitOnRootFailure(hr, "UX aborted EXE package execute progress."); | 2100 | ExitOnRootFailure(hr, "BA aborted EXE package execute progress."); |
2101 | 2101 | ||
2102 | LExit: | 2102 | LExit: |
2103 | if (fBeginCalled) | 2103 | if (fBeginCalled) |
@@ -2133,7 +2133,7 @@ static HRESULT ExecuteMsiPackage( | |||
2133 | fBeginCalled = TRUE; | 2133 | fBeginCalled = TRUE; |
2134 | 2134 | ||
2135 | // Send package execute begin to BA. | 2135 | // Send package execute begin to BA. |
2136 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->msiPackage.pPackage->sczId, !fRollback); | 2136 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->msiPackage.pPackage->sczId, !fRollback, pExecuteAction->msiPackage.action); |
2137 | ExitOnRootFailure(hr, "BA aborted execute MSI package begin."); | 2137 | ExitOnRootFailure(hr, "BA aborted execute MSI package begin."); |
2138 | 2138 | ||
2139 | // execute package | 2139 | // execute package |
@@ -2152,7 +2152,7 @@ static HRESULT ExecuteMsiPackage( | |||
2152 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; | 2152 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; |
2153 | 2153 | ||
2154 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); | 2154 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); |
2155 | ExitOnRootFailure(hr, "UX aborted MSI package execute progress."); | 2155 | ExitOnRootFailure(hr, "BA aborted MSI package execute progress."); |
2156 | 2156 | ||
2157 | LExit: | 2157 | LExit: |
2158 | if (fBeginCalled) | 2158 | if (fBeginCalled) |
@@ -2188,7 +2188,7 @@ static HRESULT ExecuteMspPackage( | |||
2188 | fBeginCalled = TRUE; | 2188 | fBeginCalled = TRUE; |
2189 | 2189 | ||
2190 | // Send package execute begin to BA. | 2190 | // Send package execute begin to BA. |
2191 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->mspTarget.pPackage->sczId, !fRollback); | 2191 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->mspTarget.pPackage->sczId, !fRollback, pExecuteAction->mspTarget.action); |
2192 | ExitOnRootFailure(hr, "BA aborted execute MSP package begin."); | 2192 | ExitOnRootFailure(hr, "BA aborted execute MSP package begin."); |
2193 | 2193 | ||
2194 | // Now send all the patches that target this product code. | 2194 | // Now send all the patches that target this product code. |
@@ -2216,7 +2216,7 @@ static HRESULT ExecuteMspPackage( | |||
2216 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; | 2216 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; |
2217 | 2217 | ||
2218 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); | 2218 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); |
2219 | ExitOnRootFailure(hr, "UX aborted MSP package execute progress."); | 2219 | ExitOnRootFailure(hr, "BA aborted MSP package execute progress."); |
2220 | 2220 | ||
2221 | LExit: | 2221 | LExit: |
2222 | if (fBeginCalled) | 2222 | if (fBeginCalled) |
@@ -2255,7 +2255,7 @@ static HRESULT ExecuteMsuPackage( | |||
2255 | fBeginCalled = TRUE; | 2255 | fBeginCalled = TRUE; |
2256 | 2256 | ||
2257 | // Send package execute begin to BA. | 2257 | // Send package execute begin to BA. |
2258 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->msuPackage.pPackage->sczId, !fRollback); | 2258 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->msuPackage.pPackage->sczId, !fRollback, pExecuteAction->msuPackage.action); |
2259 | ExitOnRootFailure(hr, "BA aborted execute MSU package begin."); | 2259 | ExitOnRootFailure(hr, "BA aborted execute MSU package begin."); |
2260 | 2260 | ||
2261 | message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS; | 2261 | message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS; |
@@ -2263,7 +2263,7 @@ static HRESULT ExecuteMsuPackage( | |||
2263 | message.progress.dwPercentage = fRollback ? 100 : 0; | 2263 | message.progress.dwPercentage = fRollback ? 100 : 0; |
2264 | nResult = GenericExecuteMessageHandler(&message, pContext); | 2264 | nResult = GenericExecuteMessageHandler(&message, pContext); |
2265 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); | 2265 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); |
2266 | ExitOnRootFailure(hr, "UX aborted MSU progress."); | 2266 | ExitOnRootFailure(hr, "BA aborted MSU progress."); |
2267 | 2267 | ||
2268 | // execute package | 2268 | // execute package |
2269 | if (pExecuteAction->msuPackage.pPackage->fPerMachine) | 2269 | if (pExecuteAction->msuPackage.pPackage->fPerMachine) |
@@ -2282,13 +2282,13 @@ static HRESULT ExecuteMsuPackage( | |||
2282 | message.progress.dwPercentage = fRollback ? 0 : 100; | 2282 | message.progress.dwPercentage = fRollback ? 0 : 100; |
2283 | nResult = GenericExecuteMessageHandler(&message, pContext); | 2283 | nResult = GenericExecuteMessageHandler(&message, pContext); |
2284 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); | 2284 | hr = UserExperienceInterpretExecuteResult(&pEngineState->userExperience, fRollback, message.dwAllowedResults, nResult); |
2285 | ExitOnRootFailure(hr, "UX aborted MSU progress."); | 2285 | ExitOnRootFailure(hr, "BA aborted MSU progress."); |
2286 | 2286 | ||
2287 | pContext->cExecutedPackages += fRollback ? -1 : 1; | 2287 | pContext->cExecutedPackages += fRollback ? -1 : 1; |
2288 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; | 2288 | (*pContext->pcOverallProgressTicks) += fRollback ? -1 : 1; |
2289 | 2289 | ||
2290 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); | 2290 | hr = ReportOverallProgressTicks(&pEngineState->userExperience, fRollback, pEngineState->plan.cOverallProgressTicksTotal, *pContext->pcOverallProgressTicks); |
2291 | ExitOnRootFailure(hr, "UX aborted MSU package execute progress."); | 2291 | ExitOnRootFailure(hr, "BA aborted MSU package execute progress."); |
2292 | 2292 | ||
2293 | LExit: | 2293 | LExit: |
2294 | if (fBeginCalled) | 2294 | if (fBeginCalled) |