Integrate into latest v4.

12 files changed, 161 insertions, 65 deletions

diff --git a/src/ca/custommsierrors.h b/src/ca/custommsierrors.h
new file mode 100644
index 00000000..0c1b23b7
--- /dev/null
+++ b/src/ca/custommsierrors.h
@@ -0,0 +1,4 @@
+#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.
+
+#define msierrMsmqCannotConnect                      28101
diff --git a/src/ca/dllmain.cpp b/src/ca/dllmain.cpp
new file mode 100644
index 00000000..35ae6d1c
--- /dev/null
+++ b/src/ca/dllmain.cpp
@@ -0,0 +1,26 @@
+// 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"
+
+/********************************************************************
+DllMain - standard entry point for all WiX custom actions
+
+********************************************************************/
+extern "C" BOOL WINAPI DllMain(
+    IN HINSTANCE hInst,
+    IN ULONG ulReason,
+    IN LPVOID)
+{
+    switch(ulReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        WcaGlobalInitialize(hInst);
+        break;
+
+    case DLL_PROCESS_DETACH:
+        WcaGlobalFinalize();
+        break;
+    }
+
+    return TRUE;
+}
diff --git a/src/ca/mqexec.cpp b/src/ca/mqexec.cpp
index bac54f31..ff7e9b14 100644
--- a/src/ca/mqexec.cpp
+++ b/src/ca/mqexec.cpp
@@ -2,28 +2,6 @@
 
 #include "precomp.h"
 
-/********************************************************************
- DllMain - standard entry point for all WiX CustomActions
-
-********************************************************************/
-extern "C" BOOL WINAPI DllMain(
-    IN HINSTANCE hInst,
-    IN ULONG ulReason,
-    IN LPVOID)
-{
-    switch(ulReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        WcaGlobalInitialize(hInst);
-        break;
-
-    case DLL_PROCESS_DETACH:
-        WcaGlobalFinalize();
-        break;
-    }
-
-    return TRUE;
-}
 
 /********************************************************************
  MessageQueuingExecuteInstall - CUSTOM ACTION ENTRY POINT
@@ -42,7 +20,7 @@ extern "C" UINT __stdcall MessageQueuingExecuteInstall(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "MessageQueuingExecuteInstall");
     ExitOnFailure(hr, "Failed to initialize MessageQueuingExecuteInstall");
 
-    hr = MqiInitialize();
+    hr = MqiExecInitialize();
     ExitOnFailure(hr, "Failed to initialize");
 
     // get custom action data
@@ -67,7 +45,7 @@ LExit:
     ReleaseStr(pwzCustomActionData);
 
     // uninitialize
-    MqiUninitialize();
+    MqiExecUninitialize();
 
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
@@ -90,7 +68,7 @@ extern "C" UINT __stdcall MessageQueuingRollbackInstall(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "MessageQueuingRollbackInstall");
     ExitOnFailure(hr, "Failed to initialize MessageQueuingRollbackInstall");
 
-    hr = MqiInitialize();
+    hr = MqiExecInitialize();
     ExitOnFailure(hr, "Failed to initialize");
 
     // get custom action data
@@ -113,7 +91,7 @@ LExit:
     ReleaseStr(pwzCustomActionData);
 
     // uninitialize
-    MqiUninitialize();
+    MqiExecUninitialize();
 
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
@@ -136,7 +114,7 @@ extern "C" UINT __stdcall MessageQueuingExecuteUninstall(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "MessageQueuingExecuteUninstall");
     ExitOnFailure(hr, "Failed to initialize MessageQueuingExecuteUninstall");
 
-    hr = MqiInitialize();
+    hr = MqiExecInitialize();
     ExitOnFailure(hr, "Failed to initialize");
 
     // get custom action data
@@ -161,7 +139,7 @@ LExit:
     ReleaseStr(pwzCustomActionData);
 
     // uninitialize
-    MqiUninitialize();
+    MqiExecUninitialize();
 
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
@@ -184,7 +162,7 @@ extern "C" UINT __stdcall MessageQueuingRollbackUninstall(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "MessageQueuingRollbackUninstall");
     ExitOnFailure(hr, "Failed to initialize MessageQueuingRollbackUninstall");
 
-    hr = MqiInitialize();
+    hr = MqiExecInitialize();
     ExitOnFailure(hr, "Failed to initialize");
 
     // get custom action data
@@ -207,7 +185,7 @@ LExit:
     ReleaseStr(pwzCustomActionData);
 
     // uninitialize
-    MqiUninitialize();
+    MqiExecUninitialize();
 
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
diff --git a/src/ca/mqqueueexec.cpp b/src/ca/mqqueueexec.cpp
index f5b99da7..e4304ab8 100644
--- a/src/ca/mqqueueexec.cpp
+++ b/src/ca/mqqueueexec.cpp
@@ -119,7 +119,7 @@ static MQSetQueueSecurityFunc gpfnMQSetQueueSecurity;
 
 // function definitions
 
-HRESULT MqiInitialize()
+HRESULT MqiExecInitialize()
 {
     HRESULT hr = S_OK;
 
@@ -153,7 +153,7 @@ LExit:
     return hr;
 }
 
-void MqiUninitialize()
+void MqiExecUninitialize()
 {
     if (ghMQRT)
         ::FreeLibrary(ghMQRT);
diff --git a/src/ca/mqqueueexec.h b/src/ca/mqqueueexec.h
index 37ceea50..76bc2023 100644
--- a/src/ca/mqqueueexec.h
+++ b/src/ca/mqqueueexec.h
@@ -2,8 +2,8 @@
 // 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.
 
 
-HRESULT MqiInitialize();
-void MqiUninitialize();
+HRESULT MqiExecInitialize();
+void MqiExecUninitialize();
 HRESULT MqiCreateMessageQueues(
     LPWSTR* ppwzData
     );
diff --git a/src/ca/mqqueuesched.cpp b/src/ca/mqqueuesched.cpp
index 4f40a4aa..01777ea4 100644
--- a/src/ca/mqqueuesched.cpp
+++ b/src/ca/mqqueuesched.cpp
@@ -51,7 +51,7 @@ static MQPathNameToFormatNameFunc gpfnMQPathNameToFormatName;
 
 // function definitions
 
-HRESULT MqiInitialize()
+HRESULT MqiSchedInitialize()
 {
     HRESULT hr = S_OK;
 
@@ -72,7 +72,7 @@ LExit:
     return hr;
 }
 
-void MqiUninitialize()
+void MqiSchedUninitialize()
 {
     if (ghMQRT)
     {
diff --git a/src/ca/mqqueuesched.h b/src/ca/mqqueuesched.h
index b063ca28..c9381e0a 100644
--- a/src/ca/mqqueuesched.h
+++ b/src/ca/mqqueuesched.h
@@ -54,8 +54,8 @@ struct MQI_MESSAGE_QUEUE_PERMISSION_LIST
 
 // function prototypes
 
-HRESULT MqiInitialize();
-void MqiUninitialize();
+HRESULT MqiSchedInitialize();
+void MqiSchedUninitialize();
 HRESULT MqiMessageQueueRead(
     MQI_MESSAGE_QUEUE_LIST* pList
     );
diff --git a/src/ca/mqsched.cpp b/src/ca/mqsched.cpp
index cefce853..4c994901 100644
--- a/src/ca/mqsched.cpp
+++ b/src/ca/mqsched.cpp
@@ -4,29 +4,6 @@
 
 
 /********************************************************************
- DllMain - standard entry point for all WiX CustomActions
-
-********************************************************************/
-extern "C" BOOL WINAPI DllMain(
-    IN HINSTANCE hInst,
-    IN ULONG ulReason,
-    IN LPVOID)
-{
-    switch(ulReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        WcaGlobalInitialize(hInst);
-        break;
-
-    case DLL_PROCESS_DETACH:
-        WcaGlobalFinalize();
-        break;
-    }
-
-    return TRUE;
-}
-
-/********************************************************************
  MessageQueuingInstall - CUSTOM ACTION ENTRY POINT for installing MSMQ message queues
 
 ********************************************************************/
@@ -51,7 +28,7 @@ extern "C" UINT __stdcall MessageQueuingInstall(MSIHANDLE hInstall)
 
     do
     {
-        hr = MqiInitialize();
+        hr = MqiSchedInitialize();
         if (S_FALSE == hr)
         {
             WcaLog(LOGMSG_STANDARD, "Failed to load mqrt.dll.");
@@ -118,7 +95,7 @@ LExit:
     ReleaseStr(pwzExecuteActionData);
 
     // uninitialize
-    MqiUninitialize();
+    MqiSchedUninitialize();
 
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
@@ -150,7 +127,7 @@ extern "C" UINT __stdcall MessageQueuingUninstall(MSIHANDLE hInstall)
 
     do
     {
-        hr = MqiInitialize();
+        hr = MqiSchedInitialize();
         if (S_FALSE == hr)
         {
             WcaLog(LOGMSG_STANDARD, "Failed to load mqrt.dll.");
@@ -212,7 +189,7 @@ LExit:
     ReleaseStr(pwzExecuteActionData);
 
     // uninitialize
-    MqiUninitialize();
+    MqiSchedUninitialize();
 
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
     return WcaFinalize(er);
diff --git a/src/ca/msmqca.def b/src/ca/msmqca.def
new file mode 100644
index 00000000..4902858f
--- /dev/null
+++ b/src/ca/msmqca.def
@@ -0,0 +1,12 @@
+; 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.
+
+
+LIBRARY      "msmqca"
+
+EXPORTS
+    MessageQueuingInstall
+    MessageQueuingUninstall
+    MessageQueuingExecuteInstall
+    MessageQueuingRollbackInstall
+    MessageQueuingExecuteUninstall
+    MessageQueuingRollbackUninstall
diff --git a/src/ca/msmqca.vcxproj b/src/ca/msmqca.vcxproj
new file mode 100644
index 00000000..507a2f93
--- /dev/null
+++ b/src/ca/msmqca.vcxproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <TargetName>msmqca</TargetName>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile>
+    <Description>WiX Toolset MSMQ CustomAction</Description>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="mqexec.cpp" />
+    <ClCompile Include="mqqueueexec.cpp" />
+    <ClCompile Include="mqqueuesched.cpp" />
+    <ClCompile Include="mqsched.cpp" />
+    <ClCompile Include="mqutilexec.cpp" />
+    <ClCompile Include="mqutilsched.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="mqcost.h" />
+    <ClInclude Include="mqqueueexec.h" />
+    <ClInclude Include="mqqueuesched.h" />
+    <ClInclude Include="mqutilexec.h" />
+    <ClInclude Include="mqutilsched.h" />
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="msmqca.def" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" />
+  </Target>
+</Project>
diff --git a/src/ca/packages.config b/src/ca/packages.config
new file mode 100644
index 00000000..b87f9ab4
--- /dev/null
+++ b/src/ca/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />
+  <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/ca/precomp.h b/src/ca/precomp.h
new file mode 100644
index 00000000..cbbff6ea
--- /dev/null
+++ b/src/ca/precomp.h
@@ -0,0 +1,23 @@
+#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.
+
+
+#include <windows.h>
+#include <msiquery.h>
+#include <strsafe.h>
+#include <ntsecapi.h>
+#include <aclapi.h>
+#include <mq.h>
+
+#include "wcautil.h"
+#include "memutil.h"
+#include "strutil.h"
+#include "wiutil.h"
+
+#include "CustomMsiErrors.h"
+
+#include "mqcost.h"
+#include "mqutilsched.h"
+#include "mqqueuesched.h"
+#include "mqutilexec.h"
+#include "mqqueueexec.h"