diff options
| author | Bob Arnson <bob@firegiant.com> | 2022-01-09 23:23:51 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2022-01-10 00:47:18 -0500 |
| commit | a96db4a508f1d1774500ab89f2c57e581fb5a13a (patch) | |
| tree | 40de5d2904e564e28c04c5816fd7528f8f090e2c /src/libs/dutil/WixToolset.DUtil/deputil.cpp | |
| parent | bae756f4354fed4de6097c931590ccafc907fdb2 (diff) | |
| download | wix-a96db4a508f1d1774500ab89f2c57e581fb5a13a.tar.gz wix-a96db4a508f1d1774500ab89f2c57e581fb5a13a.tar.bz2 wix-a96db4a508f1d1774500ab89f2c57e581fb5a13a.zip | |
Add registry bitness to RegUtil and BUtil.
Fixes https://github.com/wixtoolset/issues/issues/6669.
Fixes https://github.com/wixtoolset/issues/issues/6670.
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/deputil.cpp')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/deputil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/deputil.cpp b/src/libs/dutil/WixToolset.DUtil/deputil.cpp index 2e6d6a6c..754365e9 100644 --- a/src/libs/dutil/WixToolset.DUtil/deputil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/deputil.cpp | |||
| @@ -337,7 +337,7 @@ DAPI_(HRESULT) DepRegisterDependency( | |||
| 337 | DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey); | 337 | DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey); |
| 338 | 338 | ||
| 339 | // Create the dependency key (or open it if it already exists). | 339 | // Create the dependency key (or open it if it already exists). |
| 340 | hr = RegCreateEx(hkHive, sczKey, KEY_WRITE, FALSE, NULL, &hkKey, &fCreated); | 340 | hr = RegCreateEx(hkHive, sczKey, KEY_WRITE, REG_KEY_DEFAULT, FALSE, NULL, &hkKey, &fCreated); |
| 341 | DepExitOnFailure(hr, "Failed to create the dependency registry key \"%ls\".", sczKey); | 341 | DepExitOnFailure(hr, "Failed to create the dependency registry key \"%ls\".", sczKey); |
| 342 | 342 | ||
| 343 | // Set the id if it was provided. | 343 | // Set the id if it was provided. |
| @@ -417,14 +417,14 @@ DAPI_(HRESULT) DepRegisterDependent( | |||
| 417 | DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzDependencyProviderKey); | 417 | DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzDependencyProviderKey); |
| 418 | 418 | ||
| 419 | // Create the dependency key (or open it if it already exists). | 419 | // Create the dependency key (or open it if it already exists). |
| 420 | hr = RegCreateEx(hkHive, sczDependencyKey, KEY_WRITE, FALSE, NULL, &hkDependencyKey, &fCreated); | 420 | hr = RegCreateEx(hkHive, sczDependencyKey, KEY_WRITE, REG_KEY_DEFAULT, FALSE, NULL, &hkDependencyKey, &fCreated); |
| 421 | DepExitOnFailure(hr, "Failed to create the dependency registry key \"%ls\".", sczDependencyKey); | 421 | DepExitOnFailure(hr, "Failed to create the dependency registry key \"%ls\".", sczDependencyKey); |
| 422 | 422 | ||
| 423 | // Create the subkey to register the dependent. | 423 | // Create the subkey to register the dependent. |
| 424 | hr = StrAllocFormatted(&sczKey, L"%ls\\%ls", vsczRegistryDependents, wzProviderKey); | 424 | hr = StrAllocFormatted(&sczKey, L"%ls\\%ls", vsczRegistryDependents, wzProviderKey); |
| 425 | DepExitOnFailure(hr, "Failed to allocate dependent subkey \"%ls\" under dependency \"%ls\".", wzProviderKey, wzDependencyProviderKey); | 425 | DepExitOnFailure(hr, "Failed to allocate dependent subkey \"%ls\" under dependency \"%ls\".", wzProviderKey, wzDependencyProviderKey); |
| 426 | 426 | ||
| 427 | hr = RegCreateEx(hkDependencyKey, sczKey, KEY_WRITE, FALSE, NULL, &hkKey, &fCreated); | 427 | hr = RegCreateEx(hkDependencyKey, sczKey, KEY_WRITE, REG_KEY_DEFAULT, FALSE, NULL, &hkKey, &fCreated); |
| 428 | DepExitOnFailure(hr, "Failed to create the dependency subkey \"%ls\".", sczKey); | 428 | DepExitOnFailure(hr, "Failed to create the dependency subkey \"%ls\".", sczKey); |
| 429 | 429 | ||
| 430 | // Set the minimum version if not NULL. | 430 | // Set the minimum version if not NULL. |
