diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-07 17:34:09 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-08 17:14:11 -0600 |
commit | 19d85eed389fbd964f64c2fbb85e40ec20439d26 (patch) | |
tree | 29adf2c191ea8a50153238ee457ff34f0d73d059 /src/burn/engine/userexperience.cpp | |
parent | 5c7b1a8fa2b02ddd758c0c267f59b7e77b527f62 (diff) | |
download | wix-19d85eed389fbd964f64c2fbb85e40ec20439d26.tar.gz wix-19d85eed389fbd964f64c2fbb85e40ec20439d26.tar.bz2 wix-19d85eed389fbd964f64c2fbb85e40ec20439d26.zip |
Add ability to customize file versioning rules for MsiPackage and MspPackage.
Fixes #5911
Diffstat (limited to 'src/burn/engine/userexperience.cpp')
-rw-r--r-- | src/burn/engine/userexperience.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/burn/engine/userexperience.cpp b/src/burn/engine/userexperience.cpp index c974f4d4..2bd6ecaf 100644 --- a/src/burn/engine/userexperience.cpp +++ b/src/burn/engine/userexperience.cpp | |||
@@ -104,7 +104,7 @@ extern "C" HRESULT UserExperienceLoad( | |||
104 | args.pCommand = pCommand; | 104 | args.pCommand = pCommand; |
105 | args.pfnBootstrapperEngineProc = EngineForApplicationProc; | 105 | args.pfnBootstrapperEngineProc = EngineForApplicationProc; |
106 | args.pvBootstrapperEngineProcContext = pEngineContext; | 106 | args.pvBootstrapperEngineProcContext = pEngineContext; |
107 | args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 8, 10, 0); | 107 | args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 12, 7, 0); |
108 | 108 | ||
109 | results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); | 109 | results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); |
110 | 110 | ||
@@ -1896,7 +1896,8 @@ EXTERN_C BAAPI UserExperienceOnPlanMsiPackage( | |||
1896 | __in BOOTSTRAPPER_ACTION_STATE action, | 1896 | __in BOOTSTRAPPER_ACTION_STATE action, |
1897 | __inout BURN_MSI_PROPERTY* pActionMsiProperty, | 1897 | __inout BURN_MSI_PROPERTY* pActionMsiProperty, |
1898 | __inout INSTALLUILEVEL* pUiLevel, | 1898 | __inout INSTALLUILEVEL* pUiLevel, |
1899 | __inout BOOL* pfDisableExternalUiHandler | 1899 | __inout BOOL* pfDisableExternalUiHandler, |
1900 | __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning | ||
1900 | ) | 1901 | ) |
1901 | { | 1902 | { |
1902 | HRESULT hr = S_OK; | 1903 | HRESULT hr = S_OK; |
@@ -1907,11 +1908,13 @@ EXTERN_C BAAPI UserExperienceOnPlanMsiPackage( | |||
1907 | args.wzPackageId = wzPackageId; | 1908 | args.wzPackageId = wzPackageId; |
1908 | args.fExecute = fExecute; | 1909 | args.fExecute = fExecute; |
1909 | args.action = action; | 1910 | args.action = action; |
1911 | args.recommendedFileVersioning = *pFileVersioning; | ||
1910 | 1912 | ||
1911 | results.cbSize = sizeof(results); | 1913 | results.cbSize = sizeof(results); |
1912 | results.actionMsiProperty = *pActionMsiProperty; | 1914 | results.actionMsiProperty = *pActionMsiProperty; |
1913 | results.uiLevel = *pUiLevel; | 1915 | results.uiLevel = *pUiLevel; |
1914 | results.fDisableExternalUiHandler = *pfDisableExternalUiHandler; | 1916 | results.fDisableExternalUiHandler = *pfDisableExternalUiHandler; |
1917 | results.fileVersioning = args.recommendedFileVersioning; | ||
1915 | 1918 | ||
1916 | hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE, &args, &results); | 1919 | hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE, &args, &results); |
1917 | ExitOnFailure(hr, "BA OnPlanMsiPackage failed."); | 1920 | ExitOnFailure(hr, "BA OnPlanMsiPackage failed."); |
@@ -1923,6 +1926,7 @@ EXTERN_C BAAPI UserExperienceOnPlanMsiPackage( | |||
1923 | *pActionMsiProperty = results.actionMsiProperty; | 1926 | *pActionMsiProperty = results.actionMsiProperty; |
1924 | *pUiLevel = results.uiLevel; | 1927 | *pUiLevel = results.uiLevel; |
1925 | *pfDisableExternalUiHandler = results.fDisableExternalUiHandler; | 1928 | *pfDisableExternalUiHandler = results.fDisableExternalUiHandler; |
1929 | *pFileVersioning = results.fileVersioning; | ||
1926 | 1930 | ||
1927 | LExit: | 1931 | LExit: |
1928 | return hr; | 1932 | return hr; |