1 files changed, 32 insertions, 3 deletions

diff --git a/src/dutil/inc/butil.h b/src/dutil/inc/butil.h
index a42cac11..d1ec73bc 100644
--- a/src/dutil/inc/butil.h
+++ b/src/dutil/inc/butil.h
@@ -12,15 +12,44 @@ enum BUNDLE_INSTALL_CONTEXT
     BUNDLE_INSTALL_CONTEXT_USER,
 };
 
+
+/********************************************************************
+BundleGetBundleInfo - 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 BundleGetBundleInfo(
-  __in LPCWSTR   szBundleId,                             // Bundle code
-  __in LPCWSTR   szAttribute,                            // attribute name
+  __in_z LPCWSTR szBundleId,                             // Bundle code
+  __in_z LPCWSTR szAttribute,                            // attribute name
   __out_ecount_opt(*pcchValueBuf) LPWSTR lpValueBuf,     // returned value, NULL if not desired
   __inout_opt                     LPDWORD pcchValueBuf   // in/out buffer character count
     );
 
+/********************************************************************
+BundleEnumRelatedBundle - 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
+        An invalid parameter was passed to the function.
+
+    All other returns are unexpected returns from other dutil methods.
+********************************************************************/
 HRESULT DAPI BundleEnumRelatedBundle(
-  __in     LPCWSTR lpUpgradeCode,
+  __in_z   LPCWSTR lpUpgradeCode,
   __in     BUNDLE_INSTALL_CONTEXT context,
   __inout  PDWORD pdwStartIndex,
   __out_ecount(MAX_GUID_CHARS+1)  LPWSTR lpBundleIdBuf