aboutsummaryrefslogtreecommitdiff
path: root/src/engine/core.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-04-16 09:42:01 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-04-19 23:12:55 -0500
commitc88806b89293f5bb92c42e90230e48be6b79b7f4 (patch)
treeaf9fb6fdbe68d0e208115a7d7bd73d183aff880f /src/engine/core.cpp
parent941c47e5a3f57ce9626b447a95740b1444e69343 (diff)
downloadwix-c88806b89293f5bb92c42e90230e48be6b79b7f4.tar.gz
wix-c88806b89293f5bb92c42e90230e48be6b79b7f4.tar.bz2
wix-c88806b89293f5bb92c42e90230e48be6b79b7f4.zip
Detect whether the bundle is cached.
Diffstat (limited to 'src/engine/core.cpp')
-rw-r--r--src/engine/core.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/core.cpp b/src/engine/core.cpp
index 7341e4b8..42759d3f 100644
--- a/src/engine/core.cpp
+++ b/src/engine/core.cpp
@@ -239,7 +239,7 @@ extern "C" HRESULT CoreQueryRegistration(
239 SIZE_T iBuffer = 0; 239 SIZE_T iBuffer = 0;
240 240
241 // Detect if bundle is already installed. 241 // Detect if bundle is already installed.
242 hr = RegistrationDetectInstalled(&pEngineState->registration, &pEngineState->registration.fInstalled); 242 hr = RegistrationDetectInstalled(&pEngineState->registration);
243 ExitOnFailure(hr, "Failed to detect bundle install state."); 243 ExitOnFailure(hr, "Failed to detect bundle install state.");
244 244
245 // detect resume type 245 // detect resume type
@@ -293,7 +293,7 @@ extern "C" HRESULT CoreDetect(
293 // only happens if Apply() changed the state of bundle (installed or 293 // only happens if Apply() changed the state of bundle (installed or
294 // uninstalled). In that case, Detect() can be used here to reset 294 // uninstalled). In that case, Detect() can be used here to reset
295 // the installed state. 295 // the installed state.
296 hr = RegistrationDetectInstalled(&pEngineState->registration, &pEngineState->registration.fInstalled); 296 hr = RegistrationDetectInstalled(&pEngineState->registration);
297 ExitOnFailure(hr, "Failed to detect bundle install state."); 297 ExitOnFailure(hr, "Failed to detect bundle install state.");
298 298
299 if (pEngineState->registration.fInstalled) 299 if (pEngineState->registration.fInstalled)
@@ -308,7 +308,7 @@ extern "C" HRESULT CoreDetect(
308 } 308 }
309 309
310 fDetectBegan = TRUE; 310 fDetectBegan = TRUE;
311 hr = UserExperienceOnDetectBegin(&pEngineState->userExperience, pEngineState->registration.fInstalled, pEngineState->packages.cPackages); 311 hr = UserExperienceOnDetectBegin(&pEngineState->userExperience, pEngineState->registration.fCached, pEngineState->registration.fInstalled, pEngineState->packages.cPackages);
312 ExitOnRootFailure(hr, "UX aborted detect begin."); 312 ExitOnRootFailure(hr, "UX aborted detect begin.");
313 313
314 pEngineState->userExperience.hwndDetect = hwndParent; 314 pEngineState->userExperience.hwndDetect = hwndParent;
@@ -426,7 +426,7 @@ LExit:
426 426
427 pEngineState->userExperience.hwndDetect = NULL; 427 pEngineState->userExperience.hwndDetect = NULL;
428 428
429 LogId(REPORT_STANDARD, MSG_DETECT_COMPLETE, hr, !fDetectBegan ? "(failed)" : LoggingBoolToString(pEngineState->registration.fInstalled), FAILED(hr) ? "(failed)" : LoggingBoolToString(pEngineState->registration.fEligibleForCleanup)); 429 LogId(REPORT_STANDARD, MSG_DETECT_COMPLETE, hr, !fDetectBegan ? "(failed)" : LoggingBoolToString(pEngineState->registration.fInstalled), !fDetectBegan ? "(failed)" : LoggingBoolToString(pEngineState->registration.fCached), FAILED(hr) ? "(failed)" : LoggingBoolToString(pEngineState->registration.fEligibleForCleanup));
430 430
431 return hr; 431 return hr;
432} 432}