Table ids per https://github.com/wixtoolset/issues/issues/5933.
Bob Arnson committed
Sep 19, 2021 at 22:29 UTC
3a4dffe9feb62ea383e767ba903ff1edc8234f0e
11 files changed
+50
-49
src/ext/Iis/ca/precomp.h
+1
-1
@@ -61,4 +61,4 @@
61
#include "scassl7.h"
62
#include "scaexecIIS7.h"
63
64
-#include "caDecor.h"
64
+#include "..\..\caDecor.h"
src/ext/Iis/ca/scacert.cpp
+1
-1
@@ -85,7 +85,7 @@ VOID ParseCertificateAuthority(__in LPCWSTR wzCertificateAuthorityOrig, __out LP
85
*/
86
87
88
-LPCWSTR vcsCertQuery = L"SELECT `Certificate`, `Name`, `Component_`, `StoreLocation`, `StoreName`, `Attributes`, `Binary_`, `CertificatePath`, `PFXPassword` FROM `Certificate`";
88
+LPCWSTR vcsCertQuery = L"SELECT `Certificate`, `Name`, `Component_`, `StoreLocation`, `StoreName`, `Attributes`, `Binary_`, `CertificatePath`, `PFXPassword` FROM `Wix4Certificate`";
89
enum eCertQuery { cqCertificate = 1, cqName, cqComponent, cqStoreLocation, cqStoreName, cqAttributes, cqCertificateBinary, cqCertificatePath, cqPFXPassword };
90
91
src/ext/Iis/ca/scasched.cpp
+17
-17
@@ -7,58 +7,58 @@ const int WriteMetabaseChangesCost = 20;
7
const int WriteIIS7ConfigChangesCost = 20;
8
9
// sql queries
10
-LPCWSTR vcsUserDeferredQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `User`";
10
+LPCWSTR vcsUserDeferredQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `Wix4User`";
11
12
-LPCWSTR vcsWebSvcExtQuery = L"SELECT `Component_`, `File`, `Description`, `Group`, `Attributes` FROM `IIsWebServiceExtension`";
12
+LPCWSTR vcsWebSvcExtQuery = L"SELECT `Component_`, `File`, `Description`, `Group`, `Attributes` FROM `Wix4IIsWebServiceExtension`";
13
14
-LPCWSTR vcsAppPoolQuery = L"SELECT `AppPool`, `Name`, `Component_`, `Attributes`, `User_`, `RecycleMinutes`, `RecycleRequests`, `RecycleTimes`, `VirtualMemory`, `PrivateMemory`, `IdleTimeout`, `QueueLimit`, `CPUMon`, `MaxProc`, `ManagedRuntimeVersion`, `ManagedPipelineMode` FROM `IIsAppPool`";
14
+LPCWSTR vcsAppPoolQuery = L"SELECT `AppPool`, `Name`, `Component_`, `Attributes`, `User_`, `RecycleMinutes`, `RecycleRequests`, `RecycleTimes`, `VirtualMemory`, `PrivateMemory`, `IdleTimeout`, `QueueLimit`, `CPUMon`, `MaxProc`, `ManagedRuntimeVersion`, `ManagedPipelineMode` FROM `Wix4IIsAppPool`";
15
16
LPCWSTR vcsComponentAttrQuery = L"SELECT `Component`,`Attributes` FROM `Component`";
17
18
-LPCWSTR vcsMimeMapQuery = L"SELECT `MimeMap`, `ParentType`, `ParentValue`, `MimeType`, `Extension` FROM `IIsMimeMap`";
18
+LPCWSTR vcsMimeMapQuery = L"SELECT `MimeMap`, `ParentType`, `ParentValue`, `MimeType`, `Extension` FROM `Wix4IIsMimeMap`";
19
20
-LPCWSTR vcsHttpHeaderQuery = L"SELECT `Name`, `ParentType`, `ParentValue`, `Value`, `Attributes` FROM `IIsHttpHeader` ORDER BY `Sequence`";
20
+LPCWSTR vcsHttpHeaderQuery = L"SELECT `Name`, `ParentType`, `ParentValue`, `Value`, `Attributes` FROM `Wix4IIsHttpHeader` ORDER BY `Sequence`";
21
22
LPCWSTR vcsWebErrorQuery =
23
L"SELECT `ErrorCode`, `SubCode`, `ParentType`, `ParentValue`, `File`, `URL` "
24
- L"FROM `IIsWebError` ORDER BY `ErrorCode`, `SubCode`";
24
+ L"FROM `Wix4IIsWebError` ORDER BY `ErrorCode`, `SubCode`";
25
26
LPCWSTR vcsWebDirPropertiesQuery = L"SELECT `DirProperties`, `Access`, `Authorization`, `AnonymousUser_`, `IIsControlledPassword`, `LogVisits`, `Index`, `DefaultDoc`, `AspDetailedError`, `HttpExpires`, `CacheControlMaxAge`, `CacheControlCustom`, `NoCustomError`, `AccessSSLFlags`, `AuthenticationProviders` "
27
- L"FROM `IIsWebDirProperties`";
27
+ L"FROM `Wix4IIsWebDirProperties`";
28
29
-LPCWSTR vcsSslCertificateQuery = L"SELECT `Certificate`.`StoreName`, `CertificateHash`.`Hash`, `IIsWebSiteCertificates`.`Web_` FROM `Certificate`, `CertificateHash`, `IIsWebSiteCertificates` WHERE `Certificate`.`Certificate`=`CertificateHash`.`Certificate_` AND `CertificateHash`.`Certificate_`=`IIsWebSiteCertificates`.`Certificate_`";
29
+LPCWSTR vcsSslCertificateQuery = L"SELECT `Wix4Certificate`.`StoreName`, `Wix4CertificateHash`.`Hash`, `Wix4IIsWebSiteCertificates`.`Web_` FROM `Wix4Certificate`, `Wix4CertificateHash`, `Wix4IIsWebSiteCertificates` WHERE `Wix4Certificate`.`Certificate`=`Wix4CertificateHash`.`Certificate_` AND `Wix4CertificateHash`.`Certificate_`=`Wix4IIsWebSiteCertificates`.`Certificate_`";
30
31
LPCWSTR vcsWebLogQuery = L"SELECT `Log`, `Format` "
32
- L"FROM `IIsWebLog`";
32
+ L"FROM `Wix4IIsWebLog`";
33
34
LPCWSTR vcsWebApplicationQuery = L"SELECT `Name`, `Isolation`, `AllowSessions`, `SessionTimeout`, "
35
L"`Buffer`, `ParentPaths`, `DefaultScript`, `ScriptTimeout`, "
36
L"`ServerDebugging`, `ClientDebugging`, `AppPool_`, `Application` "
37
- L"FROM `IIsWebApplication`";
37
+ L"FROM `Wix4IIsWebApplication`";
38
39
-LPCWSTR vcsWebAppExtensionQuery = L"SELECT `Extension`, `Verbs`, `Executable`, `Attributes`, `Application_` FROM `IIsWebApplicationExtension`";
39
+LPCWSTR vcsWebAppExtensionQuery = L"SELECT `Extension`, `Verbs`, `Executable`, `Attributes`, `Application_` FROM `Wix4IIsWebApplicationExtension`";
40
41
LPCWSTR vcsWebQuery = L"SELECT `Web`, `Component_`, `Id`, `Description`, `ConnectionTimeout`, `Directory_`, `State`, `Attributes`, `DirProperties_`, `Application_`, "
42
- L"`Address`, `IP`, `Port`, `Header`, `Secure`, `Log_` FROM `IIsWebSite`, `IIsWebAddress` "
42
+ L"`Address`, `IP`, `Port`, `Header`, `Secure`, `Log_` FROM `Wix4IIsWebSite`, `Wix4IIsWebAddress` "
43
L"WHERE `KeyAddress_`=`Address` ORDER BY `Sequence`";
44
45
LPCWSTR vcsWebAddressQuery = L"SELECT `Address`, `Web_`, `IP`, `Port`, `Header`, `Secure` "
46
- L"FROM `IIsWebAddress`";
46
+ L"FROM `Wix4IIsWebAddress`";
47
48
LPCWSTR vcsWebBaseQuery = L"SELECT `Web`, `Id`, `IP`, `Port`, `Header`, `Secure`, `Description` "
49
- L"FROM `IIsWebSite`, `IIsWebAddress` "
49
+ L"FROM `Wix4IIsWebSite`, `Wix4IIsWebAddress` "
50
L"WHERE `KeyAddress_`=`Address`";
51
52
LPCWSTR vcsWebDirQuery = L"SELECT `Web_`, `WebDir`, `Component_`, `Path`, `DirProperties_`, `Application_` "
53
- L"FROM `IIsWebDir`";
53
+ L"FROM `Wix4IIsWebDir`";
54
55
LPCWSTR vcsVDirQuery = L"SELECT `Web_`, `VirtualDir`, `Component_`, `Alias`, `Directory_`, `DirProperties_`, `Application_` "
56
L"FROM `IIsWebVirtualDir`";
57
58
-LPCWSTR vcsFilterQuery = L"SELECT `Web_`, `Name`, `Component_`, `Path`, `Description`, `Flags`, `LoadOrder` FROM `IIsFilter` ORDER BY `Web_`";
58
+LPCWSTR vcsFilterQuery = L"SELECT `Web_`, `Name`, `Component_`, `Path`, `Description`, `Flags`, `LoadOrder` FROM `Wix4IIsFilter` ORDER BY `Web_`";
59
60
LPCWSTR vcsPropertyQuery = L"SELECT `Property`, `Component_`, `Attributes`, `Value` "
61
- L"FROM `IIsProperty`";
61
+ L"FROM `Wix4IIsProperty`";
62
63
#define IIS7CONDITION L"VersionNT >= 600"
64
#define USEIIS7CONDITION IIS7CONDITION L"AND NOT UseIis6Compatibility"
src/ext/Iis/ca/scauser.cpp
+4
-4
@@ -2,16 +2,16 @@
2
3
#include "precomp.h"
4
5
-LPCWSTR vcsUserQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `User` WHERE `User`=?";
5
+LPCWSTR vcsUserQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `Wix4User` WHERE `User`=?";
6
enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword };
7
8
-LPCWSTR vcsGroupQuery = L"SELECT `Group`, `Component_`, `Name`, `Domain` FROM `Group` WHERE `Group`=?";
8
+LPCWSTR vcsGroupQuery = L"SELECT `Group`, `Component_`, `Name`, `Domain` FROM `Wix4Group` WHERE `Group`=?";
9
enum eGroupQuery { vgqGroup = 1, vgqComponent, vgqName, vgqDomain };
10
11
-LPCWSTR vcsUserGroupQuery = L"SELECT `User_`, `Group_` FROM `UserGroup` WHERE `User_`=?";
11
+LPCWSTR vcsUserGroupQuery = L"SELECT `User_`, `Group_` FROM `Wix4UserGroup` WHERE `User_`=?";
12
enum eUserGroupQuery { vugqUser = 1, vugqGroup };
13
14
-LPCWSTR vActionableQuery = L"SELECT `User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `User` WHERE `Component_` IS NOT NULL";
14
+LPCWSTR vActionableQuery = L"SELECT `User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` FROM `Wix4User` WHERE `Component_` IS NOT NULL";
15
enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain, vaqPassword, vaqAttributes };
16
17
HRESULT __stdcall ScaGetUserDeferred(
src/ext/Iis/ca/scawebdir7.cpp
+1
-1
@@ -4,7 +4,7 @@
4
5
// sql queries
6
static LPCWSTR vcsWebDirQuery7 = L"SELECT `Web_`, `WebDir`, `Component_`, `Path`, `DirProperties_`, `Application_`"
7
- L"FROM `IIsWebDir`";
7
+ L"FROM `Wix4IIsWebDir`";
8
9
enum eWebDirQuery { wdqWeb = 1, wdqWebDir, wdqComponent , wdqPath, wdqProperties, wdqApplication, wdqInstalled, wdqAction };
10
src/ext/Iis/ca/scaweblog7.cpp
+2
-2
@@ -3,7 +3,7 @@
3
#include "precomp.h"
4
// sql queries
5
LPCWSTR vcsWebLogQuery7 = L"SELECT `Log`, `Format` "
6
- L"FROM `IIsWebLog` WHERE `Log`=?";
6
+ L"FROM `Wix4IIsWebLog` WHERE `Log`=?";
7
8
enum eWebLogQuery { wlqLog = 1, wlqFormat };
9
@@ -50,7 +50,7 @@ HRESULT ScaGetWebLog7(
50
ExitOnFailure(hr, "failed to copy log name: %ls", pwzData);
51
52
hr = WcaGetRecordString(hRec, wlqFormat, &pwzData);
53
- ExitOnFailure(hr, "failed to get IIsWebLog.Format for Log:", wzLog);
53
+ ExitOnFailure(hr, "failed to get IIsWebLog.Format for Log: %ls", wzLog);
54
55
//translate WIX log format name strings to IIS7
56
if (0 == lstrcmpW(pwzData, L"Microsoft IIS Log File Format"))
src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
+3
-2
@@ -16,10 +16,11 @@ namespace WixToolsetTest.Iis
16
var folder = TestData.Get(@"TestData\UsingIis");
17
var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder });
18
19
- var results = build.BuildAndQuery(Build, "IIsWebAddress");
19
+ var results = build.BuildAndQuery(Build, "Wix4IIsWebSite", "Wix4IIsWebAddress");
20
Assert.Equal(new[]
21
{
22
- "IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0",
22
+ "Wix4IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0",
23
+ "Wix4IIsWebSite:Test\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tTest web server\t\tTestWebSiteProductDirectory\t2\t2\tTestAddress\tReadAndExecute\t\t\t\t",
24
}, results);
25
}
26
src/ext/Iis/wixext/IisTableDefinitions.cs
+18
-18
@@ -7,7 +7,7 @@ namespace WixToolset.Iis
7
public static class IisTableDefinitions
8
{
9
public static readonly TableDefinition Certificate = new TableDefinition(
10
- "Certificate",
10
+ "Wix4Certificate",
11
IisSymbolDefinitions.Certificate,
12
new[]
13
{
@@ -25,7 +25,7 @@ namespace WixToolset.Iis
25
);
26
27
public static readonly TableDefinition CertificateHash = new TableDefinition(
28
- "CertificateHash",
28
+ "Wix4CertificateHash",
29
IisSymbolDefinitions.CertificateHash,
30
new[]
31
{
@@ -36,7 +36,7 @@ namespace WixToolset.Iis
36
);
37
38
public static readonly TableDefinition IIsWebSiteCertificates = new TableDefinition(
39
- "IIsWebSiteCertificates",
39
+ "Wix4IIsWebSiteCertificates",
40
IisSymbolDefinitions.IIsWebSiteCertificates,
41
new[]
42
{
@@ -47,7 +47,7 @@ namespace WixToolset.Iis
47
);
48
49
public static readonly TableDefinition IIsAppPool = new TableDefinition(
50
- "IIsAppPool",
50
+ "Wix4IIsAppPool",
51
IisSymbolDefinitions.IIsAppPool,
52
new[]
53
{
@@ -72,7 +72,7 @@ namespace WixToolset.Iis
72
);
73
74
public static readonly TableDefinition IIsMimeMap = new TableDefinition(
75
- "IIsMimeMap",
75
+ "Wix4IIsMimeMap",
76
IisSymbolDefinitions.IIsMimeMap,
77
new[]
78
{
@@ -86,7 +86,7 @@ namespace WixToolset.Iis
86
);
87
88
public static readonly TableDefinition IIsProperty = new TableDefinition(
89
- "IIsProperty",
89
+ "Wix4IIsProperty",
90
IisSymbolDefinitions.IIsProperty,
91
new[]
92
{
@@ -99,7 +99,7 @@ namespace WixToolset.Iis
99
);
100
101
public static readonly TableDefinition IIsWebDirProperties = new TableDefinition(
102
- "IIsWebDirProperties",
102
+ "Wix4IIsWebDirProperties",
103
IisSymbolDefinitions.IIsWebDirProperties,
104
new[]
105
{
@@ -123,7 +123,7 @@ namespace WixToolset.Iis
123
);
124
125
public static readonly TableDefinition IIsWebAddress = new TableDefinition(
126
- "IIsWebAddress",
126
+ "Wix4IIsWebAddress",
127
IisSymbolDefinitions.IIsWebAddress,
128
new[]
129
{
@@ -138,7 +138,7 @@ namespace WixToolset.Iis
138
);
139
140
public static readonly TableDefinition IIsWebSite = new TableDefinition(
141
- "IIsWebSite",
141
+ "Wix4IIsWebSite",
142
IisSymbolDefinitions.IIsWebSite,
143
new[]
144
{
@@ -160,7 +160,7 @@ namespace WixToolset.Iis
160
);
161
162
public static readonly TableDefinition IIsWebApplication = new TableDefinition(
163
- "IIsWebApplication",
163
+ "Wix4IIsWebApplication",
164
IisSymbolDefinitions.IIsWebApplication,
165
new[]
166
{
@@ -181,7 +181,7 @@ namespace WixToolset.Iis
181
);
182
183
public static readonly TableDefinition IIsWebApplicationExtension = new TableDefinition(
184
- "IIsWebApplicationExtension",
184
+ "Wix4IIsWebApplicationExtension",
185
IisSymbolDefinitions.IIsWebApplicationExtension,
186
new[]
187
{
@@ -195,7 +195,7 @@ namespace WixToolset.Iis
195
);
196
197
public static readonly TableDefinition IIsFilter = new TableDefinition(
198
- "IIsFilter",
198
+ "Wix4IIsFilter",
199
IisSymbolDefinitions.IIsFilter,
200
new[]
201
{
@@ -212,7 +212,7 @@ namespace WixToolset.Iis
212
);
213
214
public static readonly TableDefinition IIsWebDir = new TableDefinition(
215
- "IIsWebDir",
215
+ "Wix4IIsWebDir",
216
IisSymbolDefinitions.IIsWebDir,
217
new[]
218
{
@@ -227,7 +227,7 @@ namespace WixToolset.Iis
227
);
228
229
public static readonly TableDefinition IIsWebError = new TableDefinition(
230
- "IIsWebError",
230
+ "Wix4IIsWebError",
231
IisSymbolDefinitions.IIsWebError,
232
new[]
233
{
@@ -242,7 +242,7 @@ namespace WixToolset.Iis
242
);
243
244
public static readonly TableDefinition IIsHttpHeader = new TableDefinition(
245
- "IIsHttpHeader",
245
+ "Wix4IIsHttpHeader",
246
IisSymbolDefinitions.IIsHttpHeader,
247
new[]
248
{
@@ -258,7 +258,7 @@ namespace WixToolset.Iis
258
);
259
260
public static readonly TableDefinition IIsWebServiceExtension = new TableDefinition(
261
- "IIsWebServiceExtension",
261
+ "Wix4IIsWebServiceExtension",
262
IisSymbolDefinitions.IIsWebServiceExtension,
263
new[]
264
{
@@ -273,7 +273,7 @@ namespace WixToolset.Iis
273
);
274
275
public static readonly TableDefinition IIsWebVirtualDir = new TableDefinition(
276
- "IIsWebVirtualDir",
276
+ "Wix4IIsWebVirtualDir",
277
IisSymbolDefinitions.IIsWebVirtualDir,
278
new[]
279
{
@@ -289,7 +289,7 @@ namespace WixToolset.Iis
289
);
290
291
public static readonly TableDefinition IIsWebLog = new TableDefinition(
292
- "IIsWebLog",
292
+ "Wix4IIsWebLog",
293
IisSymbolDefinitions.IIsWebLog,
294
new[]
295
{
src/ext/Iis/wixlib/IIsExtension_Platform.wxi
+3
-3
@@ -2,7 +2,7 @@
2
3
4
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include caDecor.wxi ?>
5
+ <?include ..\..\caDecor.wxi ?>
6
7
<Fragment>
8
<UIRef Id="WixIIsErrors" />
@@ -58,8 +58,8 @@
58
<CustomAction Id="$(var.Prefix)RollbackDeleteMachineCertificate$(var.Suffix)" DllEntry="AddMachineCertificate" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" />
59
60
<InstallExecuteSequence>
61
- <Custom Action="UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT > 400" />
62
- <Custom Action="InstallCertificates$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
61
+ <Custom Action="$(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT > 400" />
62
+ <Custom Action="$(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
63
</InstallExecuteSequence>
64
</Fragment>
65