4 files changed, 44 insertions, 0 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/envutil.h b/src/libs/dutil/WixToolset.DUtil/inc/envutil.h
index 8491b27b..4e4f6197 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/envutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/envutil.h
@@ -16,6 +16,17 @@ HRESULT DAPI EnvExpandEnvironmentStrings(
     __out_opt SIZE_T* pcchExpanded
     );
 
+/********************************************************************
+ EnvExpandEnvironmentStringsForUser - Wrapper for ::ExpandEnvironmentStringsForUser.
+
+ *******************************************************************/
+HRESULT DAPI EnvExpandEnvironmentStringsForUser(
+    __in_opt HANDLE hToken,
+    __in LPCWSTR wzSource,
+    __out LPWSTR* psczExpanded,
+    __out_opt SIZE_T* pcchExpanded
+    );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
index 875cfafb..f36e6ebc 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
@@ -205,6 +205,15 @@ DAPI_(HRESULT) PathGetTempPath(
     );
 
 /*******************************************************************
+ PathSystemWindowsSubdirectory - returns the path to the Windows folder
+    or a subdirectory of that folder that is backslash terminated.
+*******************************************************************/
+DAPI_(HRESULT) PathSystemWindowsSubdirectory(
+    __in_z_opt LPCWSTR wzSubdirectory,
+    __out_z LPWSTR* psczFullPath
+    );
+
+/*******************************************************************
  PathGetSystemTempPaths - returns the paths to system temp folders
     that are backslash terminated with higher preference first.
 *******************************************************************/
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
index 13618043..7c873b80 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
@@ -34,6 +34,20 @@ HRESULT DAPI PolcReadString(
     __deref_out_z LPWSTR* pscz
     );
 
+/********************************************************************
+PolcReadUnexpandedString - reads a string from policy, without expanding it.
+
+NOTE: S_FALSE returned if policy not set.
+NOTE: out is set to default on S_FALSE or any error.
+********************************************************************/
+HRESULT DAPI PolcReadUnexpandedString(
+    __in_z LPCWSTR wzPolicyPath,
+    __in_z LPCWSTR wzPolicyName,
+    __in_z_opt LPCWSTR wzDefault,
+    __inout BOOL* pfNeedsExpansion,
+    __deref_out_z LPWSTR* pscz
+    );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
index 4f49313b..d5ab9242 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
@@ -18,6 +18,16 @@ HRESULT DAPI ProcElevated(
     __out BOOL* pfElevated
     );
 
+HRESULT DAPI ProcSystem(
+    __in HANDLE hProcess,
+    __out BOOL* pfSystem
+    );
+
+HRESULT DAPI ProcTokenUser(
+    __in HANDLE hProcess,
+    __out TOKEN_USER** ppTokenUser
+    );
+
 HRESULT DAPI ProcWow64(
     __in HANDLE hProcess,
     __out BOOL* pfWow64