aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/Dependency/ca/wixdepca.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ext/Dependency/ca/wixdepca.cpp b/src/ext/Dependency/ca/wixdepca.cpp
index efb19ea2..88342217 100644
--- a/src/ext/Dependency/ca/wixdepca.cpp
+++ b/src/ext/Dependency/ca/wixdepca.cpp
@@ -6,14 +6,14 @@
6#define INITIAL_STRINGDICT_SIZE 4 6#define INITIAL_STRINGDICT_SIZE 4
7 7
8LPCWSTR vcsDependencyProviderQuery = 8LPCWSTR vcsDependencyProviderQuery =
9 L"SELECT `Wix4DependencyProvider`.`Wix4DependencyProvider`, `Wix4DependencyProvider`.`Component_`, `Wix4DependencyProvider`.`ProviderKey`, `Wix4DependencyProvider`.`Attributes` " 9 L"SELECT `Wix4DependencyProvider`.`WixDependencyProvider`, `Wix4DependencyProvider`.`Component_`, `Wix4DependencyProvider`.`ProviderKey`, `Wix4DependencyProvider`.`Attributes` "
10 L"FROM `Wix4DependencyProvider`"; 10 L"FROM `Wix4DependencyProvider`";
11enum eDependencyProviderQuery { dpqId = 1, dpqComponent, dpqProviderKey, dpqAttributes }; 11enum eDependencyProviderQuery { dpqId = 1, dpqComponent, dpqProviderKey, dpqAttributes };
12 12
13LPCWSTR vcsDependencyQuery = 13LPCWSTR vcsDependencyQuery =
14 L"SELECT `Wix4Dependency`.`Wix4Dependency`, `Wix4DependencyProvider`.`Component_`, `Wix4Dependency`.`ProviderKey`, `Wix4Dependency`.`MinVersion`, `Wix4Dependency`.`MaxVersion`, `Wix4Dependency`.`Attributes` " 14 L"SELECT `Wix4Dependency`.`WixDependency`, `Wix4DependencyProvider`.`Component_`, `Wix4Dependency`.`ProviderKey`, `Wix4Dependency`.`MinVersion`, `Wix4Dependency`.`MaxVersion`, `Wix4Dependency`.`Attributes` "
15 L"FROM `Wix4DependencyProvider`, `Wix4Dependency`, `Wix4DependencyRef` " 15 L"FROM `Wix4DependencyProvider`, `Wix4Dependency`, `Wix4DependencyRef` "
16 L"WHERE `Wix4Dependency`.`Wix4Dependency` = `Wix4DependencyRef`.`Wix4Dependency_` AND `Wix4DependencyProvider`.`Wix4DependencyProvider` = `Wix4DependencyRef`.`Wix4DependencyProvider_`"; 16 L"WHERE `Wix4Dependency`.`WixDependency` = `Wix4DependencyRef`.`WixDependency_` AND `Wix4DependencyProvider`.`WixDependencyProvider` = `Wix4DependencyRef`.`WixDependencyProvider_`";
17enum eDependencyComponentQuery { dqId = 1, dqComponent, dqProviderKey, dqMinVersion, dqMaxVersion, dqAttributes }; 17enum eDependencyComponentQuery { dqId = 1, dqComponent, dqProviderKey, dqMinVersion, dqMaxVersion, dqAttributes };
18 18
19static HRESULT EnsureRequiredDependencies( 19static HRESULT EnsureRequiredDependencies(
@@ -159,7 +159,7 @@ static HRESULT EnsureRequiredDependencies(
159 while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) 159 while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
160 { 160 {
161 hr = WcaGetRecordString(hRec, dqId, &sczId); 161 hr = WcaGetRecordString(hRec, dqId, &sczId);
162 ExitOnFailure(hr, "Failed to get Wix4Dependency.Wix4Dependency."); 162 ExitOnFailure(hr, "Failed to get Wix4Dependency.WixDependency.");
163 163
164 hr = WcaGetRecordString(hRec, dqComponent, &sczComponent); 164 hr = WcaGetRecordString(hRec, dqComponent, &sczComponent);
165 ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Component_."); 165 ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Component_.");
@@ -317,7 +317,7 @@ static HRESULT EnsureAbsentDependents(
317 while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) 317 while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
318 { 318 {
319 hr = WcaGetRecordString(hRec, dpqId, &sczId); 319 hr = WcaGetRecordString(hRec, dpqId, &sczId);
320 ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Wix4DependencyProvider."); 320 ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.WixDependencyProvider.");
321 321
322 hr = WcaGetRecordString(hRec, dpqComponent, &sczComponent); 322 hr = WcaGetRecordString(hRec, dpqComponent, &sczComponent);
323 ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Component."); 323 ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Component.");