diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ca/wixdepca.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ca/wixdepca.cpp b/src/ca/wixdepca.cpp index 154b73f2..d6433707 100644 --- a/src/ca/wixdepca.cpp +++ b/src/ca/wixdepca.cpp | |||
| @@ -278,6 +278,16 @@ static HRESULT EnsureAbsentDependents( | |||
| 278 | UINT cDependents = 0; | 278 | UINT cDependents = 0; |
| 279 | PMSIHANDLE hDependencyRec = NULL; | 279 | PMSIHANDLE hDependencyRec = NULL; |
| 280 | 280 | ||
| 281 | // Skip the dependent check if the WixDependencyProvider table is missing (no dependency providers). | ||
| 282 | hr = WcaTableExists(L"WixDependencyProvider"); | ||
| 283 | if (S_FALSE == hr) | ||
| 284 | { | ||
| 285 | WcaLog(LOGMSG_STANDARD, "Skipping the dependents check since no dependency providers are authored."); | ||
| 286 | ExitFunction1(hr = S_OK); | ||
| 287 | } | ||
| 288 | |||
| 289 | ExitOnFailure(hr, "Failed to check if the WixDependencyProvider table exists."); | ||
| 290 | |||
| 281 | // Split the IGNOREDEPENDENCIES property for use below if set. If it is "ALL", then quit now. | 291 | // Split the IGNOREDEPENDENCIES property for use below if set. If it is "ALL", then quit now. |
| 282 | hr = SplitIgnoredDependents(&sdIgnoredDependents); | 292 | hr = SplitIgnoredDependents(&sdIgnoredDependents); |
| 283 | ExitOnFailure(hr, "Failed to get the ignored dependents."); | 293 | ExitOnFailure(hr, "Failed to get the ignored dependents."); |
| @@ -297,16 +307,6 @@ static HRESULT EnsureAbsentDependents( | |||
| 297 | hr = S_OK; | 307 | hr = S_OK; |
| 298 | } | 308 | } |
| 299 | 309 | ||
| 300 | // Skip the dependent check if the WixDependencyProvider table is missing (no dependency providers). | ||
| 301 | hr = WcaTableExists(L"WixDependencyProvider"); | ||
| 302 | if (S_FALSE == hr) | ||
| 303 | { | ||
| 304 | WcaLog(LOGMSG_STANDARD, "Skipping the dependents check since no dependency providers are authored."); | ||
| 305 | ExitFunction(); | ||
| 306 | } | ||
| 307 | |||
| 308 | ExitOnFailure(hr, "Failed to check if the WixDependencyProvider table exists."); | ||
| 309 | |||
| 310 | // Set the registry hive to use depending on install context. | 310 | // Set the registry hive to use depending on install context. |
| 311 | hkHive = fMachineContext ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; | 311 | hkHive = fMachineContext ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
| 312 | 312 | ||
