WIXFEAT:6210 Change data type of versions to strings.

8 files changed, 41 insertions, 38 deletions

diff --git a/src/balutil/BalBootstrapperEngine.cpp b/src/balutil/BalBootstrapperEngine.cpp
index 6a0c66d6..b68ea7c2 100644
--- a/src/balutil/BalBootstrapperEngine.cpp
+++ b/src/balutil/BalBootstrapperEngine.cpp
@@ -133,26 +133,28 @@ public: // IBootstrapperEngine
 
     virtual STDMETHODIMP GetVariableVersion(
         __in_z LPCWSTR wzVariable,
-        __out DWORD64* pqwValue
+        __out_ecount_opt(*pcchValue) LPWSTR wzValue,
+        __inout DWORD* pcchValue
         )
     {
         HRESULT hr = S_OK;
         BAENGINE_GETVARIABLEVERSION_ARGS args = { };
         BAENGINE_GETVARIABLEVERSION_RESULTS results = { };
 
-        ExitOnNull(pqwValue, hr, E_INVALIDARG, "pqwValue is required");
+        ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required");
 
         args.cbSize = sizeof(args);
         args.wzVariable = wzVariable;
 
         results.cbSize = sizeof(results);
+        results.wzValue = wzValue;
+        results.cchValue = *pcchValue;
 
         hr = m_pfnBAEngineProc(BOOTSTRAPPER_ENGINE_MESSAGE_GETVARIABLEVERSION, &args, &results, m_pvBAEngineProcContext);
 
-        *pqwValue = results.qwValue;
+        *pcchValue = results.cchValue;
 
     LExit:
-        SecureZeroMemory(&results, sizeof(results));
         return hr;
     }
 
@@ -410,7 +412,7 @@ public: // IBootstrapperEngine
 
     virtual STDMETHODIMP SetVariableVersion(
         __in_z LPCWSTR wzVariable,
-        __in DWORD64 qwValue
+        __in_z_opt LPCWSTR wzValue
         )
     {
         BAENGINE_SETVARIABLEVERSION_ARGS args = { };
@@ -418,7 +420,7 @@ public: // IBootstrapperEngine
 
         args.cbSize = sizeof(args);
         args.wzVariable = wzVariable;
-        args.qwValue = qwValue;
+        args.wzValue = wzValue;
 
         results.cbSize = sizeof(results);
 
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 8697b5ab..7373040a 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -2,8 +2,8 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
@@ -98,8 +98,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.51\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/src/balutil/inc/BalBaseBAFunctions.h b/src/balutil/inc/BalBaseBAFunctions.h
index 4e095fb8..72edadd5 100644
--- a/src/balutil/inc/BalBaseBAFunctions.h
+++ b/src/balutil/inc/BalBaseBAFunctions.h
@@ -103,7 +103,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __inout BOOL* /*pfCancel*/,
         __inout BOOL* /*pfIgnoreBundle*/
         )
@@ -123,7 +123,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectUpdate(
         __in_z LPCWSTR /*wzUpdateLocation*/,
         __in DWORD64 /*dw64Size*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __in_z LPCWSTR /*wzTitle*/,
         __in_z LPCWSTR /*wzSummary*/,
         __in_z LPCWSTR /*wzContentType*/,
@@ -148,7 +148,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __inout BOOL* /*pfCancel*/
         )
@@ -167,7 +167,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectCompatibleMsiPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in_z LPCWSTR /*wzCompatiblePackageId*/,
-        __in DWORD64 /*dw64CompatiblePackageVersion*/,
+        __in LPCWSTR /*wzCompatiblePackageVersion*/,
         __inout BOOL* /*pfCancel*/
         )
     {
@@ -179,7 +179,7 @@ public: // IBootstrapperApplication
         __in_z LPCWSTR /*wzUpgradeCode*/,
         __in_z LPCWSTR /*wzProductCode*/,
         __in BOOL /*fPerMachine*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __inout BOOL* /*pfCancel*/
         )
@@ -254,7 +254,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in_z LPCWSTR /*wzCompatiblePackageId*/,
-        __in DWORD64 /*dw64CompatiblePackageVersion*/,
+        __in LPCWSTR /*wzCompatiblePackageVersion*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* /*pfCancel*/
diff --git a/src/balutil/inc/BalBaseBootstrapperApplication.h b/src/balutil/inc/BalBaseBootstrapperApplication.h
index 1d014419..612faf54 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplication.h
@@ -101,7 +101,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __inout BOOL* pfCancel,
         __inout BOOL* /*pfIgnoreBundle*/
         )
@@ -123,7 +123,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectUpdate(
         __in_z LPCWSTR /*wzUpdateLocation*/,
         __in DWORD64 /*dw64Size*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __in_z LPCWSTR /*wzTitle*/,
         __in_z LPCWSTR /*wzSummary*/,
         __in_z LPCWSTR /*wzContentType*/,
@@ -149,7 +149,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __inout BOOL* pfCancel
         )
@@ -170,7 +170,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectCompatibleMsiPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in_z LPCWSTR /*wzCompatiblePackageId*/,
-        __in DWORD64 /*dw64CompatiblePackageVersion*/,
+        __in LPCWSTR /*wzCompatiblePackageVersion*/,
         __inout BOOL* pfCancel
         )
     {
@@ -183,7 +183,7 @@ public: // IBootstrapperApplication
         __in_z LPCWSTR /*wzUpgradeCode*/,
         __in_z LPCWSTR /*wzProductCode*/,
         __in BOOL /*fPerMachine*/,
-        __in DWORD64 /*dw64Version*/,
+        __in LPCWSTR /*wzVersion*/,
         __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __inout BOOL* pfCancel
         ) 
@@ -264,7 +264,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in_z LPCWSTR /*wzCompatiblePackageId*/,
-        __in DWORD64 /*dw64CompatiblePackageVersion*/,
+        __in LPCWSTR /*wzCompatiblePackageVersion*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* pfCancel
diff --git a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
index d25af1f7..7d5de8e4 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -78,7 +78,7 @@ static HRESULT BalBaseBAProcOnDetectForwardCompatibleBundle(
     __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
     )
 {
-    return pBA->OnDetectForwardCompatibleBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->dw64Version, &pResults->fCancel, &pResults->fIgnoreBundle);
+    return pBA->OnDetectForwardCompatibleBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel, &pResults->fIgnoreBundle);
 }
 
 static HRESULT BalBaseBAProcOnDetectUpdateBegin(
@@ -96,7 +96,7 @@ static HRESULT BalBaseBAProcOnDetectUpdate(
     __inout BA_ONDETECTUPDATE_RESULTS* pResults
     )
 {
-    return pBA->OnDetectUpdate(pArgs->wzUpdateLocation, pArgs->dw64Size, pArgs->dw64Version, pArgs->wzTitle, pArgs->wzSummary, pArgs->wzContentType, pArgs->wzContent, &pResults->fCancel, &pResults->fStopProcessingUpdates);
+    return pBA->OnDetectUpdate(pArgs->wzUpdateLocation, pArgs->dw64Size, pArgs->wzVersion, pArgs->wzTitle, pArgs->wzSummary, pArgs->wzContentType, pArgs->wzContent, &pResults->fCancel, &pResults->fStopProcessingUpdates);
 }
 
 static HRESULT BalBaseBAProcOnDetectUpdateComplete(
@@ -114,7 +114,7 @@ static HRESULT BalBaseBAProcOnDetectRelatedBundle(
     __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBA->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->dw64Version, pArgs->operation, &pResults->fCancel);
+    return pBA->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->operation, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnDetectPackageBegin(
@@ -132,7 +132,7 @@ static HRESULT BalBaseBAProcOnDetectCompatiblePackage(
     __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults
     )
 {
-    return pBA->OnDetectCompatibleMsiPackage(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->dw64CompatiblePackageVersion, &pResults->fCancel);
+    return pBA->OnDetectCompatibleMsiPackage(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->wzCompatiblePackageVersion, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnDetectRelatedMsiPackage(
@@ -141,7 +141,7 @@ static HRESULT BalBaseBAProcOnDetectRelatedMsiPackage(
     __inout BA_ONDETECTRELATEDMSIPACKAGE_RESULTS* pResults
     )
 {
-    return pBA->OnDetectRelatedMsiPackage(pArgs->wzPackageId, pArgs->wzUpgradeCode, pArgs->wzProductCode, pArgs->fPerMachine, pArgs->dw64Version, pArgs->operation, &pResults->fCancel);
+    return pBA->OnDetectRelatedMsiPackage(pArgs->wzPackageId, pArgs->wzUpgradeCode, pArgs->wzProductCode, pArgs->fPerMachine, pArgs->wzVersion, pArgs->operation, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnDetectTargetMsiPackage(
@@ -195,7 +195,7 @@ static HRESULT BalBaseBAProcOnPlanCompatibleMsiPackageBegin(
     __inout BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS* pResults
     )
 {
-    return pBA->OnPlanCompatibleMsiPackageBegin(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->dw64CompatiblePackageVersion, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBA->OnPlanCompatibleMsiPackageBegin(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->wzCompatiblePackageVersion, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnPlanCompatibleMsiPackageComplete(
diff --git a/src/balutil/inc/IBootstrapperApplication.h b/src/balutil/inc/IBootstrapperApplication.h
index e17d2589..9cc19120 100644
--- a/src/balutil/inc/IBootstrapperApplication.h
+++ b/src/balutil/inc/IBootstrapperApplication.h
@@ -32,7 +32,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
-        __in DWORD64 dw64Version,
+        __in_z LPCWSTR wzVersion,
         __inout BOOL* pfCancel,
         __inout BOOL* pfIgnoreBundle
         ) = 0;
@@ -48,7 +48,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnDetectUpdate)(
         __in_z_opt LPCWSTR wzUpdateLocation,
         __in DWORD64 dw64Size,
-        __in DWORD64 dw64Version,
+        __in_z LPCWSTR wzVersion,
         __in_z_opt LPCWSTR wzTitle,
         __in_z_opt LPCWSTR wzSummary,
         __in_z_opt LPCWSTR wzContentType,
@@ -69,7 +69,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
-        __in DWORD64 dw64Version,
+        __in_z LPCWSTR wzVersion,
         __in BOOTSTRAPPER_RELATED_OPERATION operation,
         __inout BOOL* pfCancel
         ) = 0;
@@ -84,7 +84,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnDetectCompatibleMsiPackage)(
         __in_z LPCWSTR wzPackageId,
         __in_z LPCWSTR wzCompatiblePackageId,
-        __in DWORD64 dw64CompatiblePackageVersion,
+        __in_z LPCWSTR wzCompatiblePackageVersion,
         __inout BOOL* pfCancel
         ) = 0;
 
@@ -94,7 +94,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __in_z LPCWSTR wzUpgradeCode,
         __in_z LPCWSTR wzProductCode,
         __in BOOL fPerMachine,
-        __in DWORD64 dw64Version,
+        __in_z LPCWSTR wzVersion,
         __in BOOTSTRAPPER_RELATED_OPERATION operation,
         __inout BOOL* pfCancel
         ) = 0;
@@ -156,7 +156,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnPlanCompatibleMsiPackageBegin)(
         __in_z LPCWSTR wzPackageId,
         __in_z LPCWSTR wzCompatiblePackageId,
-        __in DWORD64 dw64CompatiblePackageVersion,
+        __in_z LPCWSTR wzCompatiblePackageVersion,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
         __inout BOOL* pfCancel
diff --git a/src/balutil/inc/IBootstrapperEngine.h b/src/balutil/inc/IBootstrapperEngine.h
index 3b648df1..cf055102 100644
--- a/src/balutil/inc/IBootstrapperEngine.h
+++ b/src/balutil/inc/IBootstrapperEngine.h
@@ -21,7 +21,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
 
     STDMETHOD(GetVariableVersion)(
         __in_z LPCWSTR wzVariable,
-        __out DWORD64* pqwValue
+        __out_ecount_opt(*pcchValue) LPWSTR wzValue,
+        __inout DWORD* pcchValue
         ) = 0;
 
     STDMETHOD(FormatString)(
@@ -95,7 +96,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
 
     STDMETHOD(SetVariableVersion)(
         __in_z LPCWSTR wzVariable,
-        __in DWORD64 qwValue
+        __in_z_opt LPCWSTR wzValue
         ) = 0;
 
     STDMETHOD(CloseSplashScreen)() = 0;
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 4db0b6a7..be1bf8e2 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.33" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.51" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.37" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.55" targetFramework="native" />
 </packages>
\ No newline at end of file