Add pipeutil to dutil

Plus a couple small clean-ups in a couple of dutil files.

4 files changed, 95 insertions, 2 deletions

diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index edf8ba67..94826b8f 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -59,6 +59,7 @@
     <ClCompile Include="MemUtilTest.cpp" />
     <ClCompile Include="MonUtilTest.cpp" />
     <ClCompile Include="PathUtilTest.cpp" />
+    <ClCompile Include="PipeUtilTest.cpp" />
     <ClCompile Include="ProcUtilTest.cpp" />
     <ClCompile Include="precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index d216f2af..e4972c1a 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -78,6 +78,9 @@
     <ClCompile Include="LocUtilTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="PipeUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="UnitTest.rc">
@@ -94,10 +97,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.testadapter.dll" />
-    <None Include="$(MSBuildThisFileDirectory)xunit.runner.reporters.net452.dll" />
-    <None Include="$(MSBuildThisFileDirectory)xunit.runner.utility.net452.dll" />
     <None Include="$(MSBuildThisFileDirectory)xunit.abstractions.dll" />
     <None Include="TestData\ApupUtilTests\FeedBv2.0.xml" />
     <None Include="TestData\LocUtilTests\strings.wxl" />
+    <None Include="TestData\LocUtilTests\controls.wxl" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libs/dutil/test/DUtilUnitTest/PipeUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/PipeUtilTest.cpp
new file mode 100644
index 00000000..87a5e8f2
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/PipeUtilTest.cpp
@@ -0,0 +1,89 @@
+// 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"
+
+using namespace System;
+using namespace System::Security::Principal;
+using namespace Xunit;
+using namespace WixInternal::TestSupport;
+using namespace WixInternal::TestSupport::XunitExtensions;
+
+static DWORD STDAPICALLTYPE _TestPipeClientThreadProc(
+    __in LPVOID lpThreadParameter
+);
+
+namespace DutilTests
+{
+    public ref class PipeUtil
+    {
+    public:
+        [Fact]
+            void PipeConnectWriteAndRead()
+        {
+            HRESULT hr = S_OK;
+            HANDLE hServerPipe = INVALID_HANDLE_VALUE;
+            HANDLE hClientThread = NULL;
+            PIPE_MESSAGE msg = { };
+            DWORD dwThread = 42;
+            DWORD dwTestMessageId = 987654;
+
+            try
+            {
+                hr = PipeCreate(L"DutilTest", NULL, &hServerPipe);
+                NativeAssert::Succeeded(hr, "Failed to create server pipe.");
+
+                hClientThread = ::CreateThread(NULL, 0, _TestPipeClientThreadProc, &dwTestMessageId, 0, NULL);
+                if (hClientThread == 0)
+                {
+                    NativeAssert::Fail("Failed to create client thread.");
+                    return;
+                }
+
+                hr = PipeServerWaitForClientConnect(hServerPipe);
+                NativeAssert::Succeeded(hr, "Failed to wait for client to connect to pipe.");
+
+                hr = PipeReadMessage(hServerPipe, &msg);
+                NativeAssert::Succeeded(hr, "Failed to read message from client.");
+
+                NativeAssert::Equal(dwTestMessageId, msg.dwMessageType);
+
+                AppWaitForSingleObject(hClientThread, INFINITE);
+
+                ::GetExitCodeThread(hClientThread, &dwThread);
+                NativeAssert::Equal((DWORD)12, dwThread);
+            }
+            finally
+            {
+                ReleasePipeMessage(&msg);
+                ReleaseHandle(hClientThread);
+                ReleasePipeHandle(hServerPipe);
+            }
+        }
+    };
+}
+
+
+static DWORD STDAPICALLTYPE _TestPipeClientThreadProc(
+    __in LPVOID lpThreadParameter
+)
+{
+    HRESULT hr = S_OK;
+    HANDLE hClientPipe = INVALID_HANDLE_VALUE;
+
+    hr = PipeClientConnect(L"DutilTest", &hClientPipe);
+    if (FAILED(hr))
+    {
+        return hr;
+    }
+
+    ::Sleep(200);
+
+    hr = PipeWriteMessage(hClientPipe, *(LPDWORD)lpThreadParameter, NULL, 0);
+    if (FAILED(hr))
+    {
+        return hr;
+    }
+
+    ReleasePipeHandle(hClientPipe);
+    return 12;
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
index 92310b41..5a836074 100644
--- a/src/libs/dutil/test/DUtilUnitTest/precomp.h
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
@@ -24,6 +24,7 @@
 #include <locutil.h>
 #include <memutil.h>
 #include <pathutil.h>
+#include <pipeutil.h>
 #include <procutil.h>
 #include <strutil.h>
 #include <monutil.h>