Send more progress during cache verification.

Add verifyStep to OnCacheVerifyProgress.
Send OnContainerOrPayloadVerify events only if file existed in cache.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index e1920107..d8994c26 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -64,6 +64,13 @@ enum BOOTSTRAPPER_CACHE_OPERATION
     BOOTSTRAPPER_CACHE_OPERATION_EXTRACT,
 };
 
+enum BOOTSTRAPPER_CACHE_VERIFY_STEP
+{
+    BOOTSTRAPPER_CACHE_VERIFY_STEP_STAGE,
+    BOOTSTRAPPER_CACHE_VERIFY_STEP_HASH,
+    BOOTSTRAPPER_CACHE_VERIFY_STEP_FINALIZE,
+};
+
 enum BOOTSTRAPPER_APPLY_RESTART
 {
     BOOTSTRAPPER_APPLY_RESTART_NONE,
@@ -553,6 +560,7 @@ struct BA_ONCACHEVERIFYPROGRESS_ARGS
     DWORD64 dw64Progress;
     DWORD64 dw64Total;
     DWORD dwOverallPercentage;
+    BOOTSTRAPPER_CACHE_VERIFY_STEP verifyStep;
 };
 
 struct BA_ONCACHEVERIFYPROGRESS_RESULTS