diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-12 14:17:41 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-14 12:15:52 -0700 |
commit | ad5aeb25c459196938cc88c404406bbbe1df9061 (patch) | |
tree | e49b0e5d798ba7a4d666bfac23b1a0e88713dc1f /src/test/BurnUnitTest/VariableTest.cpp | |
parent | e9a4f673511dd06a8209f3e4037ad20f153d6caa (diff) | |
download | wix-ad5aeb25c459196938cc88c404406bbbe1df9061.tar.gz wix-ad5aeb25c459196938cc88c404406bbbe1df9061.tar.bz2 wix-ad5aeb25c459196938cc88c404406bbbe1df9061.zip |
Port support for ISO/IEC 19770-2:2105 (aka SWID Tags-2)
Fixes wixtoolset/issues#8380
Diffstat (limited to 'src/test/BurnUnitTest/VariableTest.cpp')
-rw-r--r-- | src/test/BurnUnitTest/VariableTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/BurnUnitTest/VariableTest.cpp b/src/test/BurnUnitTest/VariableTest.cpp index ab45a73f..5c9dce03 100644 --- a/src/test/BurnUnitTest/VariableTest.cpp +++ b/src/test/BurnUnitTest/VariableTest.cpp | |||
@@ -134,7 +134,7 @@ namespace Bootstrapper | |||
134 | HRESULT hr = S_OK; | 134 | HRESULT hr = S_OK; |
135 | BURN_VARIABLES variables = { }; | 135 | BURN_VARIABLES variables = { }; |
136 | LPWSTR scz = NULL; | 136 | LPWSTR scz = NULL; |
137 | DWORD cch = 0; | 137 | SIZE_T cch = 0; |
138 | BOOL fContainsHiddenData = FALSE; | 138 | BOOL fContainsHiddenData = FALSE; |
139 | try | 139 | try |
140 | { | 140 | { |
@@ -180,12 +180,12 @@ namespace Bootstrapper | |||
180 | hr = VariableFormatString(&variables, L"PRE [PROP1] POST", &scz, &cch); | 180 | hr = VariableFormatString(&variables, L"PRE [PROP1] POST", &scz, &cch); |
181 | TestThrowOnFailure(hr, L"Failed to format string"); | 181 | TestThrowOnFailure(hr, L"Failed to format string"); |
182 | 182 | ||
183 | Assert::Equal((DWORD)lstrlenW(scz), cch); | 183 | Assert::Equal((SIZE_T)lstrlenW(scz), cch); |
184 | 184 | ||
185 | hr = VariableFormatString(&variables, L"PRE [PROP1] POST", NULL, &cch); | 185 | hr = VariableFormatString(&variables, L"PRE [PROP1] POST", NULL, &cch); |
186 | TestThrowOnFailure(hr, L"Failed to format string"); | 186 | TestThrowOnFailure(hr, L"Failed to format string"); |
187 | 187 | ||
188 | Assert::Equal((DWORD)lstrlenW(scz), cch); | 188 | Assert::Equal((SIZE_T)lstrlenW(scz), cch); |
189 | } | 189 | } |
190 | finally | 190 | finally |
191 | { | 191 | { |