From c9d14eb51e4b8458fd5e2738fcc7d1c1129ad22e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 18 Oct 2020 22:37:12 -0500 Subject: WIXFEAT:6210 Change data type of versions to strings. --- src/balutil/BalBootstrapperEngine.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/balutil/BalBootstrapperEngine.cpp') 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); -- cgit v1.2.3-55-g6feb