Bring Sean's fixes to `wix4`.
Bob Arnson committed
Sep 18, 2021 at 19:16 UTC
f958aeb8eea975ef76b72e73c0e40303b3a6b0d0
2 files changed
+3
-3
src/burn/engine/variable.cpp
+1
-1
@@ -1845,7 +1845,7 @@ static HRESULT InitializeVariableNativeMachine(
1845
hr = ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine);
1846
ExitOnFailure(hr, "Failed to get native machine value.");
1847
1848
- if (hr != S_FALSE)
1848
+ if (S_FALSE != hr)
1849
{
1850
hr = BVariantSetNumeric(pValue, usNativeMachine);
1851
ExitOnFailure(hr, "Failed to set variant value.");
src/ext/Util/ca/OsInfo.cpp
+2
-2
@@ -503,10 +503,10 @@ extern "C" UINT __stdcall WixQueryNativeMachine(
503
hr = WcaInitialize(hInstall, "WixQueryNativeMachine");
504
ExitOnFailure(hr, "WixQueryNativeMachine failed to initialize");
505
506
- hr = ::ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine);
506
+ hr = ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine);
507
ExitOnFailure(hr, "Failed to get native machine value.");
508
509
- if (hr != S_FALSE)
509
+ if (S_FALSE != hr)
510
{
511
WcaSetIntProperty(L"WIX_NATIVE_MACHINE", usNativeMachine);
512
}