diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-14 19:59:06 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 21:42:51 +1000 |
commit | 50cb451bcee148afd9768086c1bb5ed4f75562df (patch) | |
tree | b4a28ef01446f2afd02b803af28ee6c628816cee /src/engine/apply.cpp | |
parent | d232c5621fe336b1f563b69be7637c93e795e151 (diff) | |
download | wix-50cb451bcee148afd9768086c1bb5ed4f75562df.tar.gz wix-50cb451bcee148afd9768086c1bb5ed4f75562df.tar.bz2 wix-50cb451bcee148afd9768086c1bb5ed4f75562df.zip |
WIXFEAT:6164 Give BA control over UI level and handler.
Diffstat (limited to 'src/engine/apply.cpp')
-rw-r--r-- | src/engine/apply.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp index ee11cdee..eae7c681 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, pExecuteAction->exePackage.action); | 2067 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->exePackage.pPackage->sczId, !fRollback, pExecuteAction->exePackage.action, INSTALLUILEVEL_NOCHANGE, false); |
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; |
@@ -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, pExecuteAction->msiPackage.action); | 2136 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->msiPackage.pPackage->sczId, !fRollback, pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.uiLevel, pExecuteAction->msiPackage.fDisableExternalUiHandler); |
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 |
@@ -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, pExecuteAction->mspTarget.action); | 2191 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->mspTarget.pPackage->sczId, !fRollback, pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.uiLevel, pExecuteAction->mspTarget.fDisableExternalUiHandler); |
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. |
@@ -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, pExecuteAction->msuPackage.action); | 2258 | hr = UserExperienceOnExecutePackageBegin(&pEngineState->userExperience, pExecuteAction->msuPackage.pPackage->sczId, !fRollback, pExecuteAction->msuPackage.action, INSTALLUILEVEL_NOCHANGE, false); |
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; |