From 74ca49020e2f382437337f166711ea87556865bd Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 19 Jan 2019 20:31:52 -0600
Subject: Integrate into latest v4.

---
 src/ca/mqsched.cpp | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'src/ca/mqsched.cpp')

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
@@ -3,29 +3,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;
-}
-
 /********************************************************************
  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);
-- 
cgit v1.2.3-55-g6feb