diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-09-18 19:16:58 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-09-18 19:16:58 -0400 |
| commit | f958aeb8eea975ef76b72e73c0e40303b3a6b0d0 (patch) | |
| tree | 17e36af44fb4bd0e58c8f39359b99650758030d6 /src | |
| parent | fe77e96629575d6cfc16f8a868f13af89c198d13 (diff) | |
| download | wix-f958aeb8eea975ef76b72e73c0e40303b3a6b0d0.tar.gz wix-f958aeb8eea975ef76b72e73c0e40303b3a6b0d0.tar.bz2 wix-f958aeb8eea975ef76b72e73c0e40303b3a6b0d0.zip | |
Bring Sean's fixes to `wix4`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/burn/engine/variable.cpp | 2 | ||||
| -rw-r--r-- | src/ext/Util/ca/OsInfo.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/engine/variable.cpp b/src/burn/engine/variable.cpp index 04d64f18..fa6190dd 100644 --- a/src/burn/engine/variable.cpp +++ b/src/burn/engine/variable.cpp | |||
| @@ -1845,7 +1845,7 @@ static HRESULT InitializeVariableNativeMachine( | |||
| 1845 | hr = ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine); | 1845 | hr = ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine); |
| 1846 | ExitOnFailure(hr, "Failed to get native machine value."); | 1846 | ExitOnFailure(hr, "Failed to get native machine value."); |
| 1847 | 1847 | ||
| 1848 | if (hr != S_FALSE) | 1848 | if (S_FALSE != hr) |
| 1849 | { | 1849 | { |
| 1850 | hr = BVariantSetNumeric(pValue, usNativeMachine); | 1850 | hr = BVariantSetNumeric(pValue, usNativeMachine); |
| 1851 | ExitOnFailure(hr, "Failed to set variant value."); | 1851 | ExitOnFailure(hr, "Failed to set variant value."); |
diff --git a/src/ext/Util/ca/OsInfo.cpp b/src/ext/Util/ca/OsInfo.cpp index 3f91a9e5..005407af 100644 --- a/src/ext/Util/ca/OsInfo.cpp +++ b/src/ext/Util/ca/OsInfo.cpp | |||
| @@ -503,10 +503,10 @@ extern "C" UINT __stdcall WixQueryNativeMachine( | |||
| 503 | hr = WcaInitialize(hInstall, "WixQueryNativeMachine"); | 503 | hr = WcaInitialize(hInstall, "WixQueryNativeMachine"); |
| 504 | ExitOnFailure(hr, "WixQueryNativeMachine failed to initialize"); | 504 | ExitOnFailure(hr, "WixQueryNativeMachine failed to initialize"); |
| 505 | 505 | ||
| 506 | hr = ::ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine); | 506 | hr = ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine); |
| 507 | ExitOnFailure(hr, "Failed to get native machine value."); | 507 | ExitOnFailure(hr, "Failed to get native machine value."); |
| 508 | 508 | ||
| 509 | if (hr != S_FALSE) | 509 | if (S_FALSE != hr) |
| 510 | { | 510 | { |
| 511 | WcaSetIntProperty(L"WIX_NATIVE_MACHINE", usNativeMachine); | 511 | WcaSetIntProperty(L"WIX_NATIVE_MACHINE", usNativeMachine); |
| 512 | } | 512 | } |