Add `Wix4` table prefixes.
Per https://github.com/wixtoolset/issues/issues/5933.
Bob Arnson committed
Apr 18, 2021 at 21:06 UTC
e31c6d9643c0578e22db4df1e64d6672248fd0c7
3 files changed
+13
-13
src/ca/firewall.cpp
+5
-5
@@ -3,7 +3,7 @@
3
#include "precomp.h"
4
5
LPCWSTR vcsFirewallExceptionQuery =
6
- L"SELECT `Name`, `RemoteAddresses`, `Port`, `Protocol`, `Program`, `Attributes`, `Profile`, `Component_`, `Description`, `Direction` FROM `WixFirewallException`";
6
+ L"SELECT `Name`, `RemoteAddresses`, `Port`, `Protocol`, `Program`, `Attributes`, `Profile`, `Component_`, `Description`, `Direction` FROM `Wix4FirewallException`";
7
enum eFirewallExceptionQuery { feqName = 1, feqRemoteAddresses, feqPort, feqProtocol, feqProgram, feqAttributes, feqProfile, feqComponent, feqDescription };
8
enum eFirewallExceptionTarget { fetPort = 1, fetApplication, fetUnknown };
9
enum eFirewallExceptionAttributes { feaIgnoreFailures = 1 };
@@ -43,15 +43,15 @@ static UINT SchedFirewallExceptions(
43
ExitOnFailure(hr, "failed to initialize");
44
45
// anything to do?
46
- if (S_OK != WcaTableExists(L"WixFirewallException"))
46
+ if (S_OK != WcaTableExists(L"Wix4FirewallException"))
47
{
48
- WcaLog(LOGMSG_STANDARD, "WixFirewallException table doesn't exist, so there are no firewall exceptions to configure.");
48
+ WcaLog(LOGMSG_STANDARD, "Wix4FirewallException table doesn't exist, so there are no firewall exceptions to configure.");
49
ExitFunction();
50
}
51
52
// query and loop through all the firewall exceptions
53
hr = WcaOpenExecuteView(vcsFirewallExceptionQuery, &hView);
54
- ExitOnFailure(hr, "failed to open view on WixFirewallException table");
54
+ ExitOnFailure(hr, "failed to open view on Wix4FirewallException table");
55
56
while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
57
{
@@ -141,7 +141,7 @@ static UINT SchedFirewallExceptions(
141
{
142
hr = S_OK;
143
}
144
- ExitOnFailure(hr, "failure occured while processing WixFirewallException table");
144
+ ExitOnFailure(hr, "failure occured while processing Wix4FirewallException table");
145
146
// schedule ExecFirewallExceptions if there's anything to do
147
if (pwzCustomActionData && *pwzCustomActionData)
src/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
+6
-6
@@ -16,7 +16,7 @@ namespace WixToolsetTest.Firewall
16
var folder = TestData.Get(@"TestData\UsingFirewall");
17
var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
18
19
- var results = build.BuildAndQuery(Build, "WixFirewallException", "CustomAction");
19
+ var results = build.BuildAndQuery(Build, "Wix4FirewallException", "CustomAction");
20
Assert.Equal(new[]
21
{
22
"CustomAction:Wix4ExecFirewallExceptionsInstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t",
@@ -25,7 +25,7 @@ namespace WixToolsetTest.Firewall
25
"CustomAction:Wix4RollbackFirewallExceptionsUninstall_X86\t3329\tWix4FWCA_X86\tExecFirewallExceptions\t",
26
"CustomAction:Wix4SchedFirewallExceptionsInstall_X86\t1\tWix4FWCA_X86\tSchedFirewallExceptionsInstall\t",
27
"CustomAction:Wix4SchedFirewallExceptionsUninstall_X86\t1\tWix4FWCA_X86\tSchedFirewallExceptionsUninstall\t",
28
- "WixFirewallException:ExampleFirewall\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example firewall\t1",
28
+ "Wix4FirewallException:ExampleFirewall\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example firewall\t1",
29
}, results);
30
}
31
@@ -35,7 +35,7 @@ namespace WixToolsetTest.Firewall
35
var folder = TestData.Get(@"TestData\UsingFirewall");
36
var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
37
38
- var results = build.BuildAndQuery(BuildARM64, "WixFirewallException", "CustomAction");
38
+ var results = build.BuildAndQuery(BuildARM64, "Wix4FirewallException", "CustomAction");
39
Assert.Equal(new[]
40
{
41
"CustomAction:Wix4ExecFirewallExceptionsInstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t",
@@ -44,7 +44,7 @@ namespace WixToolsetTest.Firewall
44
"CustomAction:Wix4RollbackFirewallExceptionsUninstall_A64\t3329\tWix4FWCA_A64\tExecFirewallExceptions\t",
45
"CustomAction:Wix4SchedFirewallExceptionsInstall_A64\t1\tWix4FWCA_A64\tSchedFirewallExceptionsInstall\t",
46
"CustomAction:Wix4SchedFirewallExceptionsUninstall_A64\t1\tWix4FWCA_A64\tSchedFirewallExceptionsUninstall\t",
47
- "WixFirewallException:ExampleFirewall\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example firewall\t1",
47
+ "Wix4FirewallException:ExampleFirewall\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example firewall\t1",
48
}, results);
49
}
50
@@ -54,10 +54,10 @@ namespace WixToolsetTest.Firewall
54
var folder = TestData.Get(@"TestData\UsingOutboundFirewall");
55
var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
56
57
- var results = build.BuildAndQuery(Build, "WixFirewallException");
57
+ var results = build.BuildAndQuery(Build, "Wix4FirewallException");
58
Assert.Equal(new[]
59
{
60
- "WixFirewallException:fex.5c8b_4C0THcQTvn8tpwhoRrgck\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example outbound firewall\t2",
60
+ "Wix4FirewallException:fex.5c8b_4C0THcQTvn8tpwhoRrgck\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example outbound firewall\t2",
61
}, results);
62
}
63
src/wixext/FirewallTableDefinitions.cs
+2
-2
@@ -7,11 +7,11 @@ namespace WixToolset.Firewall
7
public static class FirewallTableDefinitions
8
{
9
public static readonly TableDefinition WixFirewallException = new TableDefinition(
10
- "WixFirewallException",
10
+ "Wix4FirewallException",
11
FirewallSymbolDefinitions.WixFirewallException,
12
new[]
13
{
14
- new ColumnDefinition("WixFirewallException", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column),
14
+ new ColumnDefinition("Wix4FirewallException", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column),
15
new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Localizable display name.", modularizeType: ColumnModularizeType.Property),
16
new ColumnDefinition("RemoteAddresses", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Remote address to accept incoming connections from.", modularizeType: ColumnModularizeType.Property),
17
new ColumnDefinition("Port", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, minValue: 1, description: "Port number.", modularizeType: ColumnModularizeType.Property),