aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/Msmq/ca/mqsched.cpp8
-rw-r--r--src/ext/Msmq/ca/precomp.h2
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)
68 hr = MqiMessageQueueInstall(&lstMessageQueues, TRUE, &pwzRollbackActionData); 68 hr = MqiMessageQueueInstall(&lstMessageQueues, TRUE, &pwzRollbackActionData);
69 ExitOnFailure(hr, "Failed to add message queues to rollback action data"); 69 ExitOnFailure(hr, "Failed to add message queues to rollback action data");
70 70
71 hr = WcaDoDeferredAction(L"MessageQueuingRollbackInstall", pwzRollbackActionData, 0); 71 hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingRollbackInstall"), pwzRollbackActionData, 0);
72 ExitOnFailure(hr, "Failed to schedule MessageQueuingRollbackInstall"); 72 ExitOnFailure(hr, "Failed to schedule MessageQueuingRollbackInstall");
73 73
74 // schedule execute action 74 // schedule execute action
@@ -80,7 +80,7 @@ extern "C" UINT __stdcall MessageQueuingInstall(MSIHANDLE hInstall)
80 ExitOnFailure(hr, "Failed to add message queue permissions to execute action data"); 80 ExitOnFailure(hr, "Failed to add message queue permissions to execute action data");
81 iCost += lstMessageQueues.iInstallCount * COST_MESSAGE_QUEUE_PERMISSION_ADD; 81 iCost += lstMessageQueues.iInstallCount * COST_MESSAGE_QUEUE_PERMISSION_ADD;
82 82
83 hr = WcaDoDeferredAction(L"MessageQueuingExecuteInstall", pwzExecuteActionData, iCost); 83 hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingExecuteInstall"), pwzExecuteActionData, iCost);
84 ExitOnFailure(hr, "Failed to schedule MessageQueuingExecuteInstall"); 84 ExitOnFailure(hr, "Failed to schedule MessageQueuingExecuteInstall");
85 } 85 }
86 86
@@ -163,7 +163,7 @@ extern "C" UINT __stdcall MessageQueuingUninstall(MSIHANDLE hInstall)
163 hr = MqiMessageQueuePermissionUninstall(&lstMessageQueuePermissions, &pwzRollbackActionData); 163 hr = MqiMessageQueuePermissionUninstall(&lstMessageQueuePermissions, &pwzRollbackActionData);
164 ExitOnFailure(hr, "Failed to add message queue permissions to rollback action data"); 164 ExitOnFailure(hr, "Failed to add message queue permissions to rollback action data");
165 165
166 hr = WcaDoDeferredAction(L"MessageQueuingRollbackUninstall", pwzRollbackActionData, 0); 166 hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingRollbackUninstall"), pwzRollbackActionData, 0);
167 ExitOnFailure(hr, "Failed to schedule MessageQueuingRollbackUninstall"); 167 ExitOnFailure(hr, "Failed to schedule MessageQueuingRollbackUninstall");
168 168
169 // schedule execute action 169 // schedule execute action
@@ -174,7 +174,7 @@ extern "C" UINT __stdcall MessageQueuingUninstall(MSIHANDLE hInstall)
174 ExitOnFailure(hr, "Failed to add message queues to execute action data"); 174 ExitOnFailure(hr, "Failed to add message queues to execute action data");
175 iCost += lstMessageQueues.iUninstallCount * COST_MESSAGE_QUEUE_DELETE; 175 iCost += lstMessageQueues.iUninstallCount * COST_MESSAGE_QUEUE_DELETE;
176 176
177 hr = WcaDoDeferredAction(L"MessageQueuingExecuteUninstall", pwzExecuteActionData, iCost); 177 hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"MessageQueuingExecuteUninstall"), pwzExecuteActionData, iCost);
178 ExitOnFailure(hr, "Failed to schedule MessageQueuingExecuteUninstall"); 178 ExitOnFailure(hr, "Failed to schedule MessageQueuingExecuteUninstall");
179 } 179 }
180 180
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 @@
20#include "mqqueuesched.h" 20#include "mqqueuesched.h"
21#include "mqutilexec.h" 21#include "mqutilexec.h"
22#include "mqqueueexec.h" 22#include "mqqueueexec.h"
23
24#include "..\..\caDecor.h"