diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-05 15:27:42 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-05 16:22:04 -0600 |
commit | 5a6c681b28c953d809292b4b85c80af300d7902f (patch) | |
tree | dd4f3706c427a0ebaed9b307c222ee9ac40804e1 /src/burn/engine/core.cpp | |
parent | e027c6c571a4bc8c818244e2b0c5015eb4ef3110 (diff) | |
download | wix-5a6c681b28c953d809292b4b85c80af300d7902f.tar.gz wix-5a6c681b28c953d809292b4b85c80af300d7902f.tar.bz2 wix-5a6c681b28c953d809292b4b85c80af300d7902f.zip |
Ensure WixBundleInstalled and RebootPending are set in elevated engine.
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r-- | src/burn/engine/core.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index ca4d607b..43f79133 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
@@ -264,10 +264,6 @@ extern "C" HRESULT CoreQueryRegistration( | |||
264 | SIZE_T cbBuffer = 0; | 264 | SIZE_T cbBuffer = 0; |
265 | SIZE_T iBuffer = 0; | 265 | SIZE_T iBuffer = 0; |
266 | 266 | ||
267 | // Detect if bundle is already installed. | ||
268 | hr = RegistrationDetectInstalled(&pEngineState->registration); | ||
269 | ExitOnFailure(hr, "Failed to detect bundle install state."); | ||
270 | |||
271 | // detect resume type | 267 | // detect resume type |
272 | hr = RegistrationDetectResumeType(&pEngineState->registration, &pEngineState->command.resumeType); | 268 | hr = RegistrationDetectResumeType(&pEngineState->registration, &pEngineState->command.resumeType); |
273 | ExitOnFailure(hr, "Failed to detect resume type."); | 269 | ExitOnFailure(hr, "Failed to detect resume type."); |
@@ -315,14 +311,6 @@ extern "C" HRESULT CoreDetect( | |||
315 | DetectReset(&pEngineState->registration, &pEngineState->packages); | 311 | DetectReset(&pEngineState->registration, &pEngineState->packages); |
316 | PlanReset(&pEngineState->plan, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); | 312 | PlanReset(&pEngineState->plan, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); |
317 | 313 | ||
318 | // Detect if bundle installed state has changed since start up. | ||
319 | // This only happens if Apply() changed the state of bundle (installed, in progress, or uninstalled). | ||
320 | // In that case, Detect() can be used here to reset the installed state. | ||
321 | // Of course, there's also cases outside of this bundle's control, | ||
322 | // like other processes messing with its registration. | ||
323 | hr = RegistrationDetectInstalled(&pEngineState->registration); | ||
324 | ExitOnFailure(hr, "Failed to detect bundle install state."); | ||
325 | |||
326 | hr = RegistrationSetDynamicVariables(&pEngineState->registration, &pEngineState->variables); | 314 | hr = RegistrationSetDynamicVariables(&pEngineState->registration, &pEngineState->variables); |
327 | ExitOnFailure(hr, "Failed to reset the dynamic registration variables during detect."); | 315 | ExitOnFailure(hr, "Failed to reset the dynamic registration variables during detect."); |
328 | 316 | ||