Add basic test for Msmq install/uninstall.

Fix up lack of WIX CUSTOM_ACTION_DECORATION wrappers

Add new RuntimeTest skipper for Server Features / Optional Features.


Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>

2 files changed, 6 insertions, 4 deletions

diff --git a/src/ext/Msmq/ca/mqsched.cpp b/src/ext/Msmq/ca/mqsched.cpp
index 4c994901..ab5a5ee7 100644
--- a/src/ext/Msmq/ca/mqsched.cpp
+++ b/src/ext/Msmq/ca/mqsched.cpp
@@ -68,7 +68,7 @@ extern "C" UINT __stdcall MessageQueuingInstall(MSIHANDLE hInstall)
         hr = MqiMessageQueueInstall(&lstMessageQueues, TRUE, &pwzRollbackActionData);
         ExitOnFailure(hr, "Failed to add message queues to rollback action data");
 
-        hr = WcaDoDeferredAction(L"MessageQueuingRollbackInstall", pwzRollbackActionData, 0);
+        hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingRollbackInstall"), pwzRollbackActionData, 0);
         ExitOnFailure(hr, "Failed to schedule MessageQueuingRollbackInstall");
 
         // schedule execute action
@@ -80,7 +80,7 @@ extern "C" UINT __stdcall MessageQueuingInstall(MSIHANDLE hInstall)
         ExitOnFailure(hr, "Failed to add message queue permissions to execute action data");
         iCost += lstMessageQueues.iInstallCount * COST_MESSAGE_QUEUE_PERMISSION_ADD;
 
-        hr = WcaDoDeferredAction(L"MessageQueuingExecuteInstall", pwzExecuteActionData, iCost);
+        hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingExecuteInstall"), pwzExecuteActionData, iCost);
         ExitOnFailure(hr, "Failed to schedule MessageQueuingExecuteInstall");
     }
 
@@ -163,7 +163,7 @@ extern "C" UINT __stdcall MessageQueuingUninstall(MSIHANDLE hInstall)
         hr = MqiMessageQueuePermissionUninstall(&lstMessageQueuePermissions, &pwzRollbackActionData);
         ExitOnFailure(hr, "Failed to add message queue permissions to rollback action data");
 
-        hr = WcaDoDeferredAction(L"MessageQueuingRollbackUninstall", pwzRollbackActionData, 0);
+        hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingRollbackUninstall"), pwzRollbackActionData, 0);
         ExitOnFailure(hr, "Failed to schedule MessageQueuingRollbackUninstall");
 
         // schedule execute action
@@ -174,7 +174,7 @@ extern "C" UINT __stdcall MessageQueuingUninstall(MSIHANDLE hInstall)
         ExitOnFailure(hr, "Failed to add message queues to execute action data");
         iCost += lstMessageQueues.iUninstallCount * COST_MESSAGE_QUEUE_DELETE;
 
-        hr = WcaDoDeferredAction(L"MessageQueuingExecuteUninstall", pwzExecuteActionData, iCost);
+        hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingExecuteUninstall"), pwzExecuteActionData, iCost);
         ExitOnFailure(hr, "Failed to schedule MessageQueuingExecuteUninstall");
     }
 
diff --git a/src/ext/Msmq/ca/precomp.h b/src/ext/Msmq/ca/precomp.h
index 6fbd418c..7e8f92f6 100644
--- a/src/ext/Msmq/ca/precomp.h
+++ b/src/ext/Msmq/ca/precomp.h
@@ -20,3 +20,5 @@
 #include "mqqueuesched.h"
 #include "mqutilexec.h"
 #include "mqqueueexec.h"
+
+#include "..\..\caDecor.h"