diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-28 18:12:36 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-29 14:02:02 -0500 |
| commit | 46897fefd6aef4168f35c1f366c833d715c3bdaa (patch) | |
| tree | 852312345c583c35315f283af76f85d6f0b7674c /src/wcautil/wcawrapquery.cpp | |
| parent | cacae742b21e42c6c7a1cd7c9ddd102264ac0782 (diff) | |
| download | wix-46897fefd6aef4168f35c1f366c833d715c3bdaa.tar.gz wix-46897fefd6aef4168f35c1f366c833d715c3bdaa.tar.bz2 wix-46897fefd6aef4168f35c1f366c833d715c3bdaa.zip | |
Clean up more 32-bit assumptions.
Diffstat (limited to 'src/wcautil/wcawrapquery.cpp')
| -rw-r--r-- | src/wcautil/wcawrapquery.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wcautil/wcawrapquery.cpp b/src/wcautil/wcawrapquery.cpp index f04da10d..a3b593fd 100644 --- a/src/wcautil/wcawrapquery.cpp +++ b/src/wcautil/wcawrapquery.cpp | |||
| @@ -88,7 +88,7 @@ eColumnDataType WIXAPI GetDataTypeFromString( | |||
| 88 | LPCWSTR pwzTypeString | 88 | LPCWSTR pwzTypeString |
| 89 | ) | 89 | ) |
| 90 | { | 90 | { |
| 91 | if (NULL == pwzTypeString || 0 == wcslen(pwzTypeString)) | 91 | if (!pwzTypeString || !*pwzTypeString) |
| 92 | { | 92 | { |
| 93 | return cdtUnknown; | 93 | return cdtUnknown; |
| 94 | } | 94 | } |
| @@ -350,7 +350,7 @@ HRESULT WIXAPI WcaWrapQuery( | |||
| 350 | hr = WcaGetRecordString(hRec, dwComponentColumn, &pwzData); | 350 | hr = WcaGetRecordString(hRec, dwComponentColumn, &pwzData); |
| 351 | ExitOnFailure(hr, "Failed to get component from column %d while adding extra columns", dwComponentColumn); | 351 | ExitOnFailure(hr, "Failed to get component from column %d while adding extra columns", dwComponentColumn); |
| 352 | 352 | ||
| 353 | if (0 == lstrlenW(pwzData)) | 353 | if (!pwzData || !*pwzData) |
| 354 | { | 354 | { |
| 355 | // If no component was provided, set these both to zero as though a structure to store them were allocated with memory zero'd out | 355 | // If no component was provided, set these both to zero as though a structure to store them were allocated with memory zero'd out |
| 356 | isInstalled = (INSTALLSTATE)0; | 356 | isInstalled = (INSTALLSTATE)0; |