5 files changed, 47 insertions, 1 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/apputil.h b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
index 95a98e73..e2812ee4 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
@@ -84,6 +84,27 @@ HRESULT DAPI AppEscapeCommandLineArgumentFormattedArgs(
     __in va_list args
     );
 
+/********************************************************************
+AppWaitForSingleObject - wrapper for ::WaitForSingleObject.
+
+********************************************************************/
+HRESULT DAPI AppWaitForSingleObject(
+    __in HANDLE hHandle,
+    __in DWORD dwMilliseconds
+    );
+
+/********************************************************************
+AppWaitForMultipleObjects - wrapper for ::WaitForMultipleObjects.
+
+********************************************************************/
+HRESULT DAPI AppWaitForMultipleObjects(
+    __in DWORD dwCount,
+    __in const HANDLE* rghHandles,
+    __in BOOL fWaitAll,
+    __in DWORD dwMilliseconds,
+    __out_opt DWORD* pdwSignaledIndex
+    );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
index 6f099f35..2db64812 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
@@ -130,6 +130,7 @@ void DAPI Dutil_RootFailure(__in_z LPCSTR szFile, __in int iLine, __in HRESULT h
 #define ExitOnWin32ErrorSource(d, e, x, s, ...) if (ERROR_SUCCESS != e) { x = HRESULT_FROM_WIN32(e); if (!FAILED(x)) { x = E_FAIL; } Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; }
 #define ExitOnOptionalXmlQueryFailureSource(d, x, b, s, ...) { { if (S_FALSE == x || E_NOTFOUND == x) { b = FALSE; x = S_OK; } else { b = SUCCEEDED(x); } }; ExitOnRootFailureSource(d, x, s, __VA_ARGS__); }
 #define ExitOnRequiredXmlQueryFailureSource(d, x, s, ...) { if (S_FALSE == x) { x = E_NOTFOUND; } ExitOnRootFailureSource(d, x, s, __VA_ARGS__); }
+#define ExitOnWaitObjectFailureSource(d, x, b, s, ...) { { if (HRESULT_FROM_WIN32(WAIT_TIMEOUT) == x) { b = TRUE; x = S_OK; } else { b = FALSE; } }; ExitOnFailureSource(d, x, s, __VA_ARGS__); }
 
 #define ExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
 #define ExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
@@ -145,6 +146,7 @@ void DAPI Dutil_RootFailure(__in_z LPCSTR szFile, __in int iLine, __in HRESULT h
 #define ExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DEFAULT, e, x, s, __VA_ARGS__)
 #define ExitOnOptionalXmlQueryFailure(x, b, s, ...) ExitOnOptionalXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, b, s, __VA_ARGS__)
 #define ExitOnRequiredXmlQueryFailure(x, s, ...) ExitOnRequiredXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitOnWaitObjectFailure(x, b, s, ...) ExitOnWaitObjectFailureSource(DUTIL_SOURCE_DEFAULT, x, b, s, __VA_ARGS__)
 
 // release macros
 #define ReleaseObject(x) if (x) { x->Release(); }
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h b/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
index f1dd5d1a..664c21e5 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
@@ -63,6 +63,7 @@ typedef enum DUTIL_SOURCE
     DUTIL_SOURCE_VERUTIL,
     DUTIL_SOURCE_WNDUTIL,
     DUTIL_SOURCE_ENVUTIL,
+    DUTIL_SOURCE_THRDUTIL,
 
     DUTIL_SOURCE_EXTERNAL = 256,
 } DUTIL_SOURCE;
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
index d5ab9242..d61d91b5 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
@@ -58,7 +58,7 @@ HRESULT DAPI ProcExecute(
 HRESULT DAPI ProcWaitForCompletion(
     __in HANDLE hProcess,
     __in DWORD dwTimeout,
-    __out DWORD *pReturnCode
+    __out_opt DWORD* pdwReturnCode
     );
 HRESULT DAPI ProcWaitForIds(
     __in_ecount(cProcessIds) const DWORD* pdwProcessIds,
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/thrdutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thrdutil.h
new file mode 100644
index 00000000..47e159a1
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thrdutil.h
@@ -0,0 +1,22 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/********************************************************************
+ ThrdWaitForCompletion - waits for thread to complete and gets return code.
+
+ *******************************************************************/
+HRESULT DAPI ThrdWaitForCompletion(
+    __in HANDLE hThread,
+    __in DWORD dwTimeout,
+    __out_opt DWORD* pdwReturnCode
+    );
+
+#ifdef __cplusplus
+}
+#endif
+