From e31c6d9643c0578e22db4df1e64d6672248fd0c7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 18 Apr 2021 21:06:02 -0400
Subject: Add `Wix4` table prefixes.

Per https://github.com/wixtoolset/issues/issues/5933.
---
 src/ca/firewall.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/ca')

diff --git a/src/ca/firewall.cpp b/src/ca/firewall.cpp
index 038f4ea5..caae21a1 100644
--- a/src/ca/firewall.cpp
+++ b/src/ca/firewall.cpp
@@ -3,7 +3,7 @@
 #include "precomp.h"
 
 LPCWSTR vcsFirewallExceptionQuery =
-    L"SELECT `Name`, `RemoteAddresses`, `Port`, `Protocol`, `Program`, `Attributes`, `Profile`, `Component_`, `Description`, `Direction` FROM `WixFirewallException`";
+    L"SELECT `Name`, `RemoteAddresses`, `Port`, `Protocol`, `Program`, `Attributes`, `Profile`, `Component_`, `Description`, `Direction` FROM `Wix4FirewallException`";
 enum eFirewallExceptionQuery { feqName = 1, feqRemoteAddresses, feqPort, feqProtocol, feqProgram, feqAttributes, feqProfile, feqComponent, feqDescription };
 enum eFirewallExceptionTarget { fetPort = 1, fetApplication, fetUnknown };
 enum eFirewallExceptionAttributes { feaIgnoreFailures = 1 };
@@ -43,15 +43,15 @@ static UINT SchedFirewallExceptions(
     ExitOnFailure(hr, "failed to initialize");
 
     // anything to do?
-    if (S_OK != WcaTableExists(L"WixFirewallException"))
+    if (S_OK != WcaTableExists(L"Wix4FirewallException"))
     {
-        WcaLog(LOGMSG_STANDARD, "WixFirewallException table doesn't exist, so there are no firewall exceptions to configure.");
+        WcaLog(LOGMSG_STANDARD, "Wix4FirewallException table doesn't exist, so there are no firewall exceptions to configure.");
         ExitFunction();
     }
 
     // query and loop through all the firewall exceptions
     hr = WcaOpenExecuteView(vcsFirewallExceptionQuery, &hView);
-    ExitOnFailure(hr, "failed to open view on WixFirewallException table");
+    ExitOnFailure(hr, "failed to open view on Wix4FirewallException table");
 
     while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
     {
@@ -141,7 +141,7 @@ static UINT SchedFirewallExceptions(
     {
         hr = S_OK;
     } 
-    ExitOnFailure(hr, "failure occured while processing WixFirewallException table");
+    ExitOnFailure(hr, "failure occured while processing Wix4FirewallException table");
 
     // schedule ExecFirewallExceptions if there's anything to do
     if (pwzCustomActionData && *pwzCustomActionData)
-- 
cgit v1.2.3-55-g6feb