1 files changed, 73 insertions, 8 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/butil.h b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
index 989d4237..0405be8b 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/butil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
@@ -30,15 +30,54 @@ RETURNS:
     All other returns are unexpected returns from other dutil methods.
 ********************************************************************/
 HRESULT DAPI BundleGetBundleInfo(
-    __in_z LPCWSTR szBundleId,
-    __in_z LPCWSTR szAttribute,
+    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzAttribute,
     __deref_out_z LPWSTR* psczValue
     );
 
 /********************************************************************
+BundleGetBundleInfoFixed - Queries the bundle installation metadata for a given property
+
+RETURNS:
+    E_INVALIDARG
+        An invalid parameter was passed to the function.
+    HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT)
+        The bundle is not installed
+    HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY)
+        The property is unrecognized
+    HRESULT_FROM_WIN32(ERROR_MORE_DATA)
+        A buffer is too small to hold the requested data.
+    E_NOTIMPL:
+        Tried to read a bundle attribute for a type which has not been implemented
+
+    All other returns are unexpected returns from other dutil methods.
+********************************************************************/
+HRESULT DAPI BundleGetBundleInfoFixed(
+    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzAttribute,
+    __out_ecount_opt(*pcchValue) LPWSTR wzValue,
+    __inout SIZE_T* pcchValue
+    );
+
+/********************************************************************
 BundleEnumRelatedBundle - Queries the bundle installation metadata for installs with the given upgrade code
+RETURNS:
+    E_INVALIDARG
+        An invalid parameter was passed to the function.
 
-NOTE: lpBundleIdBuff is a buffer to receive the bundle GUID. This buffer must be 39 characters long. 
+    All other returns are unexpected returns from other dutil methods.
+********************************************************************/
+HRESULT DAPI BundleEnumRelatedBundle(
+    __in_z LPCWSTR wzUpgradeCode,
+    __in BUNDLE_INSTALL_CONTEXT context,
+    __inout PDWORD pdwStartIndex,
+    __deref_out_z LPWSTR* psczBundleId
+    );
+
+/********************************************************************
+BundleEnumRelatedBundleFixed - Queries the bundle installation metadata for installs with the given upgrade code
+
+NOTE: lpBundleIdBuff is a buffer to receive the bundle GUID. This buffer must be 39 characters long.
         The first 38 characters are for the GUID, and the last character is for the terminating null character.
 RETURNS:
     E_INVALIDARG
@@ -46,11 +85,11 @@ RETURNS:
 
     All other returns are unexpected returns from other dutil methods.
 ********************************************************************/
-HRESULT DAPI BundleEnumRelatedBundle(
-  __in_z   LPCWSTR lpUpgradeCode,
-  __in     BUNDLE_INSTALL_CONTEXT context,
-  __inout  PDWORD pdwStartIndex,
-  __out_ecount(MAX_GUID_CHARS+1)  LPWSTR lpBundleIdBuf
+HRESULT DAPI BundleEnumRelatedBundleFixed(
+    __in_z LPCWSTR wzUpgradeCode,
+    __in BUNDLE_INSTALL_CONTEXT context,
+    __inout PDWORD pdwStartIndex,
+    __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleId
     );
 
 /********************************************************************
@@ -77,6 +116,32 @@ HRESULT DAPI BundleGetBundleVariable(
     __deref_out_z LPWSTR* psczValue
     );
 
+/********************************************************************
+BundleGetBundleVariableFixed - Queries the bundle installation metadata for a given variable
+
+RETURNS:
+    S_OK
+        Success, if the variable had a value, it's returned in psczValue
+    E_INVALIDARG
+        An invalid parameter was passed to the function.
+    HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT)
+        The bundle is not installed
+    HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY)
+        The variable is unrecognized
+    HRESULT_FROM_WIN32(ERROR_MORE_DATA)
+        A buffer is too small to hold the requested data.
+    E_NOTIMPL:
+        Tried to read a bundle variable for a type which has not been implemented
+
+    All other returns are unexpected returns from other dutil methods.
+********************************************************************/
+HRESULT DAPI BundleGetBundleVariableFixed(
+    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzVariable,
+    __out_ecount_opt(*pcchValue) LPWSTR wzValue,
+    __inout SIZE_T* pcchValue
+    );
+
 
 #ifdef __cplusplus
 }