3 files changed, 12 insertions, 8 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
index 539b3a73..42268a16 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
@@ -46,7 +46,8 @@ DWORD DAPI DirDeleteEmptyDirectoriesToRoot(
     );
 
 HRESULT DAPI DirGetCurrent(
-    __deref_out_z LPWSTR* psczCurrentDirectory
+    __deref_out_z LPWSTR* psczCurrentDirectory,
+    __out_opt SIZE_T* pcch
     );
 
 HRESULT DAPI DirSetCurrent(
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h b/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
index d3e326f7..868312dc 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
@@ -34,13 +34,6 @@ typedef enum FILE_ENCODING
 } FILE_ENCODING;
 
 
-LPWSTR DAPI FileFromPath(
-    __in_z LPCWSTR wzPath
-    );
-HRESULT DAPI FileResolvePath(
-    __in_z LPCWSTR wzRelativePath,
-    __out LPWSTR *ppwzFullPath
-    );
 HRESULT DAPI FileStripExtension(
     __in_z LPCWSTR wzFileName,
     __out LPWSTR *ppwzFileNameNoExtension
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
index 941793f8..871e706b 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
@@ -68,6 +68,16 @@ DAPI_(HRESULT) PathExpand(
     );
 
 /*******************************************************************
+ PathGetFullPathName - wrapper around GetFullPathNameW.
+*******************************************************************/
+DAPI_(HRESULT) PathGetFullPathName(
+    __in_z LPCWSTR wzPath,
+    __deref_out_z LPWSTR* psczFullPath,
+    __inout_z_opt LPCWSTR* pwzFileName,
+    __out_opt SIZE_T* pcch
+    );
+
+/*******************************************************************
  PathPrefix - prefixes a full path with \\?\ or \\?\UNC as
               appropriate.
 ********************************************************************/