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/elevation.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/elevation.cpp')
-rw-r--r-- | src/burn/engine/elevation.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp index d12a151a..e479b6c0 100644 --- a/src/burn/engine/elevation.cpp +++ b/src/burn/engine/elevation.cpp | |||
@@ -178,6 +178,7 @@ static HRESULT OnApplyInitialize( | |||
178 | ); | 178 | ); |
179 | static HRESULT ElevatedProcessDetect( | 179 | static HRESULT ElevatedProcessDetect( |
180 | __in BURN_REGISTRATION* pRegistration, | 180 | __in BURN_REGISTRATION* pRegistration, |
181 | __in BURN_VARIABLES* pVariables, | ||
181 | __in BURN_PACKAGES* pPackages | 182 | __in BURN_PACKAGES* pPackages |
182 | ); | 183 | ); |
183 | static HRESULT OnApplyUninitialize( | 184 | static HRESULT OnApplyUninitialize( |
@@ -2245,7 +2246,7 @@ static HRESULT OnApplyInitialize( | |||
2245 | ExitOnFailure(hr, "Failed to acquire lock due to setup in other session."); | 2246 | ExitOnFailure(hr, "Failed to acquire lock due to setup in other session."); |
2246 | 2247 | ||
2247 | // Detect. | 2248 | // Detect. |
2248 | hr = ElevatedProcessDetect(pRegistration, pPackages); | 2249 | hr = ElevatedProcessDetect(pRegistration, pVariables, pPackages); |
2249 | ExitOnFailure(hr, "Failed to run detection in elevated process."); | 2250 | ExitOnFailure(hr, "Failed to run detection in elevated process."); |
2250 | 2251 | ||
2251 | // Attempt to pause AU with best effort. | 2252 | // Attempt to pause AU with best effort. |
@@ -2331,6 +2332,7 @@ LExit: | |||
2331 | 2332 | ||
2332 | static HRESULT ElevatedProcessDetect( | 2333 | static HRESULT ElevatedProcessDetect( |
2333 | __in BURN_REGISTRATION* pRegistration, | 2334 | __in BURN_REGISTRATION* pRegistration, |
2335 | __in BURN_VARIABLES* pVariables, | ||
2334 | __in BURN_PACKAGES* pPackages | 2336 | __in BURN_PACKAGES* pPackages |
2335 | ) | 2337 | ) |
2336 | { | 2338 | { |
@@ -2338,6 +2340,9 @@ static HRESULT ElevatedProcessDetect( | |||
2338 | 2340 | ||
2339 | DetectReset(pRegistration, pPackages); | 2341 | DetectReset(pRegistration, pPackages); |
2340 | 2342 | ||
2343 | hr = RegistrationSetDynamicVariables(pRegistration, pVariables); | ||
2344 | ExitOnFailure(hr, "Failed to reset the dynamic registration variables during elevated detect."); | ||
2345 | |||
2341 | hr = RelatedBundlesInitializeForScope(TRUE, pRegistration, &pRegistration->relatedBundles); | 2346 | hr = RelatedBundlesInitializeForScope(TRUE, pRegistration, &pRegistration->relatedBundles); |
2342 | ExitOnFailure(hr, "Failed to initialize per-machine related bundles."); | 2347 | ExitOnFailure(hr, "Failed to initialize per-machine related bundles."); |
2343 | 2348 | ||