From dd345b20e523ed42c5351c201668f395816a70a7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 31 Jan 2023 20:18:45 -0500
Subject: As promised, remove CAQuietExec*.

---
 src/ext/Util/ca/qtexecca.cpp | 49 --------------------------------------------
 src/ext/Util/ca/utilca.def   |  2 --
 2 files changed, 51 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/Util/ca/qtexecca.cpp b/src/ext/Util/ca/qtexecca.cpp
index ddcc812f..df4e9a8d 100644
--- a/src/ext/Util/ca/qtexecca.cpp
+++ b/src/ext/Util/ca/qtexecca.cpp
@@ -174,55 +174,6 @@ LExit:
     return hr;
 }
 
-// These two custom actions are deprecated, and should go away in wix v4.0. WixQuietExec replaces this one,
-// and is not intended to have any difference in behavior apart from CA name and property names.
-extern "C" UINT __stdcall CAQuietExec(
-    __in MSIHANDLE hInstall
-    )
-{
-    Assert(hInstall);
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "CAQuietExec");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = ExecCommon(CAQUIET_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE);
-    ExitOnFailure(hr, "Failed in ExecCommon method");
-
-LExit:
-    if (FAILED(hr))
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    return WcaFinalize(er); 
-}
-
-// 2nd deprecated custom action name, superseded by WixQuietExec64
-extern "C" UINT __stdcall CAQuietExec64(
-    __in MSIHANDLE hInstall
-    )
-{
-    Assert(hInstall);
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "CAQuietExec64");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = ExecCommon64(CAQUIET64_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE);
-    ExitOnFailure(hr, "Failed in ExecCommon64 method");
-
-LExit:
-    if (FAILED(hr))
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    return WcaFinalize(er);
-}
-
 extern "C" UINT __stdcall WixQuietExec(
     __in MSIHANDLE hInstall
     )
diff --git a/src/ext/Util/ca/utilca.def b/src/ext/Util/ca/utilca.def
index 3912ce56..96545566 100644
--- a/src/ext/Util/ca/utilca.def
+++ b/src/ext/Util/ca/utilca.def
@@ -28,8 +28,6 @@ EXPORTS
     WixCreateInternetShortcuts
     WixRollbackInternetShortcuts
 ; qtexecca.cpp
-    CAQuietExec
-    CAQuietExec64
     WixQuietExec
     WixQuietExec64
     WixSilentExec
-- 
cgit v1.2.3-55-g6feb