From 273c69f34311f4f4e5f6b5896e71d0788f12d96a Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 17 Oct 2020 19:12:21 -0500
Subject: WIXFEAT:6210 Change data type of versions to strings.

---
 .../inc/BootstrapperApplication.h                            | 12 ++++++------
 .../inc/BootstrapperEngine.h                                 |  8 +++++---
 .../inc/BundleExtensionEngine.h                              |  8 +++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/WixToolset.BootstrapperCore.Native/inc')

diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index 36d788ca..77d5b2c6 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -416,7 +416,7 @@ struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS
     DWORD cbSize;
     LPCWSTR wzPackageId;
     LPCWSTR wzCompatiblePackageId;
-    DWORD64 dw64CompatiblePackageVersion;
+    LPCWSTR wzCompatiblePackageVersion;
 };
 
 struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS
@@ -443,7 +443,7 @@ struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
     BOOL fPerMachine;
-    DWORD64 dw64Version;
+    LPCWSTR wzVersion;
 };
 
 struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS
@@ -499,7 +499,7 @@ struct BA_ONDETECTRELATEDBUNDLE_ARGS
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
     BOOL fPerMachine;
-    DWORD64 dw64Version;
+    LPCWSTR wzVersion;
     BOOTSTRAPPER_RELATED_OPERATION operation;
 };
 
@@ -516,7 +516,7 @@ struct BA_ONDETECTRELATEDMSIPACKAGE_ARGS
     LPCWSTR wzUpgradeCode;
     LPCWSTR wzProductCode;
     BOOL fPerMachine;
-    DWORD64 dw64Version;
+    LPCWSTR wzVersion;
     BOOTSTRAPPER_RELATED_OPERATION operation;
 };
 
@@ -545,7 +545,7 @@ struct BA_ONDETECTUPDATE_ARGS
     DWORD cbSize;
     LPCWSTR wzUpdateLocation;
     DWORD64 dw64Size;
-    DWORD64 dw64Version;
+    LPCWSTR wzVersion;
     LPCWSTR wzTitle;
     LPCWSTR wzSummary;
     LPCWSTR wzContentType;
@@ -781,7 +781,7 @@ struct BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS
     DWORD cbSize;
     LPCWSTR wzPackageId;
     LPCWSTR wzCompatiblePackageId;
-    DWORD64 dw64CompatiblePackageVersion;
+    LPCWSTR wzCompatiblePackageVersion;
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
 };
 
diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
index e3792177..a6a87622 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
@@ -258,8 +258,10 @@ typedef struct _BAENGINE_GETVARIABLEVERSION_ARGS
 typedef struct _BAENGINE_GETVARIABLEVERSION_RESULTS
 {
     DWORD cbSize;
-    // The contents of qwValue may be sensitive, if variable is hidden should keep value encrypted and SecureZeroMemory.
-    DWORD64 qwValue;
+    // The contents of wzValue may be sensitive, if variable is hidden should keep value encrypted and SecureZeroFree.
+    LPWSTR wzValue;
+    // Should be initialized to the size of wzValue.
+    DWORD cchValue;
 } BAENGINE_GETVARIABLEVERSION_RESULTS;
 
 typedef struct _BAENGINE_LAUNCHAPPROVEDEXE_ARGS
@@ -410,7 +412,7 @@ typedef struct _BAENGINE_SETVARIABLEVERSION_ARGS
 {
     DWORD cbSize;
     LPCWSTR wzVariable;
-    DWORD64 qwValue;
+    LPCWSTR wzValue;
 } BAENGINE_SETVARIABLEVERSION_ARGS;
 
 typedef struct _BAENGINE_SETVARIABLEVERSION_RESULTS
diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h
index 61a55693..adcae1af 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h
@@ -107,8 +107,10 @@ typedef struct _BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_ARGS
 typedef struct _BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_RESULTS
 {
     DWORD cbSize;
-    // The contents of qwValue may be sensitive, if variable is hidden should keep value encrypted and SecureZeroMemory.
-    DWORD64 qwValue;
+    // The contents of wzValue may be sensitive, if variable is hidden should keep value encrypted and SecureZeroFree.
+    LPWSTR wzValue;
+    // Should be initialized to the size of wzValue.
+    DWORD cchValue;
 } BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_RESULTS;
 
 typedef struct _BUNDLE_EXTENSION_ENGINE_LOG_ARGS
@@ -152,7 +154,7 @@ typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS
 {
     DWORD cbSize;
     LPCWSTR wzVariable;
-    DWORD64 qwValue;
+    LPCWSTR wzValue;
 } BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS;
 
 typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS
-- 
cgit v1.2.3-55-g6feb