diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-03-09 16:21:15 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2026-03-09 17:32:22 -0400 |
| commit | b4da272e25c5c776cc5c66ee069bd3fb7548dd92 (patch) | |
| tree | c505aa7fcde1638b8b67bdb41db0b56f9930a246 /src/burn/engine/core.cpp | |
| parent | dd827742e060db17fb61acc1534556a821c1f2c2 (diff) | |
| download | wix-b4da272e25c5c776cc5c66ee069bd3fb7548dd92.tar.gz wix-b4da272e25c5c776cc5c66ee069bd3fb7548dd92.tar.bz2 wix-b4da272e25c5c776cc5c66ee069bd3fb7548dd92.zip | |
Set more detect-phase values when falling back.
When configurable-scope bundle is already installed,
find it during detect by falling back from machine to user.
Set the scope as early as possible so detect-phase checks
(e.g., cache path, state file) work as expected.
Fixes https://github.com/wixtoolset/issues/issues/9257
Diffstat (limited to 'src/burn/engine/core.cpp')
| -rw-r--r-- | src/burn/engine/core.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index da4ea91b..926c327b 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -256,6 +256,10 @@ extern "C" HRESULT CoreQueryRegistration( | |||
| 256 | SIZE_T cbBuffer = 0; | 256 | SIZE_T cbBuffer = 0; |
| 257 | SIZE_T iBuffer = 0; | 257 | SIZE_T iBuffer = 0; |
| 258 | 258 | ||
| 259 | // Detect if bundle is already installed. | ||
| 260 | hr = RegistrationDetectInstalled(&pEngineState->registration, &pEngineState->cache); | ||
| 261 | ExitOnFailure(hr, "Failed to detect bundle install state."); | ||
| 262 | |||
| 259 | // detect resume type | 263 | // detect resume type |
| 260 | hr = RegistrationDetectResumeType(&pEngineState->registration, &pEngineState->command.resumeType); | 264 | hr = RegistrationDetectResumeType(&pEngineState->registration, &pEngineState->command.resumeType); |
| 261 | ExitOnFailure(hr, "Failed to detect resume type."); | 265 | ExitOnFailure(hr, "Failed to detect resume type."); |
| @@ -2280,6 +2284,7 @@ static HRESULT DetectPackagePayloadsCached( | |||
| 2280 | LExit: | 2284 | LExit: |
| 2281 | ReleaseStr(sczPayloadCachePath); | 2285 | ReleaseStr(sczPayloadCachePath); |
| 2282 | ReleaseStr(sczCachePath); | 2286 | ReleaseStr(sczCachePath); |
| 2287 | |||
| 2283 | return hr; | 2288 | return hr; |
| 2284 | } | 2289 | } |
| 2285 | 2290 | ||
