Add AppWaitForSingleObject/MultipleObjects, ThreadWaitForCompletion.

4 files changed, 65 insertions, 0 deletions

diff --git a/src/libs/dutil/test/DUtilUnitTest/AppUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/AppUtilTests.cpp
new file mode 100644
index 00000000..e8c23469
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/AppUtilTests.cpp
@@ -0,0 +1,60 @@
+// 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.
+
+#include "precomp.h"
+
+namespace DutilTests
+{
+    using namespace System;
+    using namespace Xunit;
+    using namespace WixBuildTools::TestSupport;
+
+    public ref class AppUtil
+    {
+    public:
+        [Fact]
+        void WaitForMultipleObjectsTest()
+        {
+            HRESULT hr = S_OK;
+            HANDLE hOne = NULL;
+            HANDLE hTwo = NULL;
+            HANDLE rghHandles[2] = { };
+            DWORD dwSignaledIndex = 0;
+
+            try
+            {
+                hOne = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+                if (!hOne)
+                {
+                    hr = HRESULT_FROM_WIN32(::GetLastError());
+                    NativeAssert::Succeeded(FAILED(hr) ? hr : E_FAIL, "Failed to create event.");
+                }
+
+                hTwo = ::CreateEventW(NULL, TRUE, TRUE, NULL);
+                if (!hTwo)
+                {
+                    hr = HRESULT_FROM_WIN32(::GetLastError());
+                    NativeAssert::Succeeded(FAILED(hr) ? hr : E_FAIL, "Failed to create event.");
+                }
+
+                rghHandles[0] = hOne;
+                rghHandles[1] = hTwo;
+
+                hr = AppWaitForMultipleObjects(countof(rghHandles), rghHandles, FALSE, 0, &dwSignaledIndex);
+                NativeAssert::Succeeded(hr, "Failed to wait for multiple objects.");
+                Assert::Equal<DWORD>(1, dwSignaledIndex);
+
+                rghHandles[0] = hTwo;
+                rghHandles[1] = hOne;
+
+                hr = AppWaitForMultipleObjects(countof(rghHandles), rghHandles, FALSE, 0, &dwSignaledIndex);
+                NativeAssert::Succeeded(hr, "Failed to wait for multiple objects.");
+                Assert::Equal<DWORD>(0, dwSignaledIndex);
+            }
+            finally
+            {
+                ReleaseHandle(hOne);
+                ReleaseHandle(hTwo);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index a1f13239..210f50f5 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -44,6 +44,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ClCompile Include="AppUtilTests.cpp" />
     <ClCompile Include="ApupUtilTests.cpp" />
     <ClCompile Include="AssemblyInfo.cpp" />
     <ClCompile Include="DictUtilTest.cpp" />
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index cb0c8a73..f1d9c307 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -15,6 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="AppUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="ApupUtilTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
index ac57cdd4..a5542774 100644
--- a/src/libs/dutil/test/DUtilUnitTest/precomp.h
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
@@ -13,6 +13,7 @@
 #include <dutil.h>
 
 #include <verutil.h>
+#include <apputil.h>
 #include <atomutil.h>
 #include <dictutil.h>
 #include <dirutil.h>