diff options
Diffstat (limited to 'src/burn/test/BurnUnitTest/RelatedBundleTest.cpp')
-rw-r--r-- | src/burn/test/BurnUnitTest/RelatedBundleTest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp index 4fee1b1d..9feb85d6 100644 --- a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp +++ b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp | |||
@@ -48,8 +48,8 @@ namespace Bootstrapper | |||
48 | L" <UX>" | 48 | L" <UX>" |
49 | L" <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />" | 49 | L" <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />" |
50 | L" </UX>" | 50 | L" </UX>" |
51 | L" <RelatedBundle Id='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />" | 51 | L" <RelatedBundle Code='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />" |
52 | L" <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='yes'>" | 52 | L" <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='yes'>" |
53 | L" <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />" | 53 | L" <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />" |
54 | L" </Registration>" | 54 | L" </Registration>" |
55 | L"</Bundle>"; | 55 | L"</Bundle>"; |
@@ -100,8 +100,8 @@ namespace Bootstrapper | |||
100 | L" <UX>" | 100 | L" <UX>" |
101 | L" <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />" | 101 | L" <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />" |
102 | L" </UX>" | 102 | L" </UX>" |
103 | L" <RelatedBundle Id='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />" | 103 | L" <RelatedBundle Code='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />" |
104 | L" <Registration Id='{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}' Tag='foo' ProviderKey='foo' Version='4.0.0.0' ExecutableName='setup.exe' PerMachine='no'>" | 104 | L" <Registration Code='{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}' Tag='foo' ProviderKey='foo' Version='4.0.0.0' ExecutableName='setup.exe' PerMachine='no'>" |
105 | L" <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='4.0.0.0' />" | 105 | L" <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='4.0.0.0' />" |
106 | L" </Registration>" | 106 | L" </Registration>" |
107 | L"</Bundle>"; | 107 | L"</Bundle>"; |
@@ -142,7 +142,7 @@ namespace Bootstrapper | |||
142 | this->RegisterFakeBundle(L"{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}", L"{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}", NULL, L"4.0.0.0", FALSE); | 142 | this->RegisterFakeBundle(L"{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}", L"{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}", NULL, L"4.0.0.0", FALSE); |
143 | } | 143 | } |
144 | 144 | ||
145 | void RegisterFakeBundle(LPCWSTR wzBundleId, LPCWSTR wzUpgradeCodes, LPCWSTR wzCachePath, LPCWSTR wzVersion, BOOL fPerMachine) | 145 | void RegisterFakeBundle(LPCWSTR wzBundleCode, LPCWSTR wzUpgradeCodes, LPCWSTR wzCachePath, LPCWSTR wzVersion, BOOL fPerMachine) |
146 | { | 146 | { |
147 | HRESULT hr = S_OK; | 147 | HRESULT hr = S_OK; |
148 | LPWSTR* rgsczUpgradeCodes = NULL; | 148 | LPWSTR* rgsczUpgradeCodes = NULL; |
@@ -157,12 +157,12 @@ namespace Bootstrapper | |||
157 | hr = StrSplitAllocArray(&rgsczUpgradeCodes, reinterpret_cast<UINT*>(&cUpgradeCodes), wzUpgradeCodes, L";"); | 157 | hr = StrSplitAllocArray(&rgsczUpgradeCodes, reinterpret_cast<UINT*>(&cUpgradeCodes), wzUpgradeCodes, L";"); |
158 | NativeAssert::Succeeded(hr, "Failed to split upgrade codes."); | 158 | NativeAssert::Succeeded(hr, "Failed to split upgrade codes."); |
159 | 159 | ||
160 | hr = StrAllocFormatted(&sczRegistrationKey, L"%s\\%s", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleId); | 160 | hr = StrAllocFormatted(&sczRegistrationKey, L"%s\\%s", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleCode); |
161 | NativeAssert::Succeeded(hr, "Failed to build uninstall registry key path."); | 161 | NativeAssert::Succeeded(hr, "Failed to build uninstall registry key path."); |
162 | 162 | ||
163 | if (!wzCachePath) | 163 | if (!wzCachePath) |
164 | { | 164 | { |
165 | hr = StrAllocFormatted(&sczCachePath, L"%ls.exe", wzBundleId); | 165 | hr = StrAllocFormatted(&sczCachePath, L"%ls.exe", wzBundleCode); |
166 | NativeAssert::Succeeded(hr, "Failed to build cache path."); | 166 | NativeAssert::Succeeded(hr, "Failed to build cache path."); |
167 | 167 | ||
168 | wzCachePath = sczCachePath; | 168 | wzCachePath = sczCachePath; |