2 files changed, 40 insertions, 11 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/apputil.h b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
index 1a1e14f7..11280102 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
@@ -34,12 +34,51 @@ AppParseCommandLine - parses the command line using CommandLineToArgvW.
                       by calling AppFreeCommandLineArgs.
 
 ********************************************************************/
-DAPI_(HRESULT) AppParseCommandLine(
+HRESULT DAPI AppParseCommandLine(
     __in LPCWSTR wzCommandLine,
     __in int* argc,
     __in LPWSTR** pArgv
     );
 
+/*******************************************************************
+ AppAppendCommandLineArgument - appends a command line argument on to a
+    string such that ::CommandLineToArgv() will shred them correctly
+    (i.e. quote arguments with spaces in them).
+********************************************************************/
+HRESULT DAPI AppAppendCommandLineArgument(
+    __deref_inout_z LPWSTR* psczCommandLine,
+    __in_z LPCWSTR wzArgument
+    );
+
+HRESULT DAPIV AppAppendCommandLineArgumentFormatted(
+    __deref_inout_z LPWSTR* psczCommandLine,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
+
+HRESULT DAPI AppAppendCommandLineArgumentFormattedArgs(
+    __deref_inout_z LPWSTR* psczCommandLine,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    );
+
+/********************************************************************
+AppEscapeCommandLineArgumentFormatted - formats a string and then
+    escapes it such that ::CommandLineToArgv() will parse it back unaltered.
+
+********************************************************************/
+HRESULT DAPIV AppEscapeCommandLineArgumentFormatted(
+    __deref_inout_z LPWSTR* psczEscapedArgument,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
+
+HRESULT DAPI AppEscapeCommandLineArgumentFormattedArgs(
+    __deref_inout_z LPWSTR* psczEscapedArgument,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
index 0ae9f437..00a468ce 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
@@ -14,16 +14,6 @@ typedef enum PATH_EXPAND
 
 
 /*******************************************************************
- PathCommandLineAppend - appends a command line argument on to a
-    string such that ::CommandLineToArgv() will shred them correctly
-    (i.e. quote arguments with spaces in them).
-********************************************************************/
-DAPI_(HRESULT) PathCommandLineAppend(
-    __deref_inout_z LPWSTR* psczCommandLine,
-    __in_z LPCWSTR wzArgument
-    );
-
-/*******************************************************************
  PathFile -  returns a pointer to the file part of the path.
 ********************************************************************/
 DAPI_(LPWSTR) PathFile(