1 files changed, 8 insertions, 6 deletions

diff --git a/src/bextutil/BextBundleExtensionEngine.cpp b/src/bextutil/BextBundleExtensionEngine.cpp
index a78b3130..983782a9 100644
--- a/src/bextutil/BextBundleExtensionEngine.cpp
+++ b/src/bextutil/BextBundleExtensionEngine.cpp
@@ -185,26 +185,28 @@ public: // IBundleExtensionEngine
 
     virtual STDMETHODIMP GetVariableVersion(
         __in_z LPCWSTR wzVariable,
-        __out DWORD64* pqwValue
+        __out_ecount_opt(*pcchValue) LPWSTR wzValue,
+        __inout DWORD* pcchValue
         )
     {
         HRESULT hr = S_OK;
         BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_ARGS args = { };
         BUNDLE_EXTENSION_ENGINE_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_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLEVERSION, &args, &results, m_pvBundleExtensionEngineProcContext);
 
-        *pqwValue = results.qwValue;
+        *pcchValue = results.cchValue;
 
     LExit:
-        SecureZeroMemory(&results, sizeof(results));
         return hr;
     }
 
@@ -263,7 +265,7 @@ public: // IBundleExtensionEngine
 
     virtual STDMETHODIMP SetVariableVersion(
         __in_z LPCWSTR wzVariable,
-        __in DWORD64 qwValue
+        __in_z_opt LPCWSTR wzValue
         )
     {
         BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS args = { };
@@ -271,7 +273,7 @@ public: // IBundleExtensionEngine
 
         args.cbSize = sizeof(args);
         args.wzVariable = wzVariable;
-        args.qwValue = qwValue;
+        args.wzValue = wzValue;
 
         results.cbSize = sizeof(results);