Fix test prefast issues

test/vswhere.test/TestEnumInstances.h

@@ -66,16 +66,16 @@ class TestEnumInstances :
     STDMETHODIMP Next(
         _In_ ULONG celt,
         _Out_writes_to_(celt, *pceltFetched) ISetupInstance** rgelt,
-        _Out_opt_ _Deref_out_range_(0, celt) ULONG* pceltFetched
+        _Out_ _Deref_out_range_(0, celt) ULONG* pceltFetched
     )
     {
+        *pceltFetched = 0;
         auto remaining = m_instances.size() - m_i;
         if (0 == remaining)
         {
             return S_FALSE;
         }
-
-        *pceltFetched = 0;
+
         for (unsigned long i = 0; i < celt && m_i < m_instances.size(); ++i, ++m_i, ++*pceltFetched)
         {
             rgelt[i] = m_instances[m_i];

test/vswhere.test/TestInstance.h

@@ -112,10 +112,14 @@ class TestInstance :
             const int num_fields = 6;
             SYSTEMTIME st = {};
 
-            if (num_fields == ::swscanf_s(value.c_str(), L"%hd-%hd-%hdT%hd:%hd:%hd", &st.wYear, &st.wMonth, &st.wDay, &st.wHour, &st.wMinute, &st.wSecond))
+            if (num_fields == ::swscanf_s(value.c_str(), L"%hu-%hu-%huT%hu:%hu:%hu", &st.wYear, &st.wMonth, &st.wDay, &st.wHour, &st.wMinute, &st.wSecond))
             {
                 ::SystemTimeToFileTime(&st, pInstallDate);
             }
+            else
+            {
+                hr = E_FAIL;
+            }
         }
 
         return hr;

test/vswhere.test/TestModule.cpp

@@ -37,5 +37,6 @@ wstring __cdecl format(_In_ LPCWSTR fmt, ...)
 
 TEST_MODULE_INITIALIZE(ModuleInitialize)
 {
+    #pragma warning(suppress: 6387) // Ignore potential failure when getting module handle
     ResourceManager::SetInstance(::GetModuleHandleW(L"vswhere.test.dll"));
 }

test/vswhere.test/TestPropertyStore.h

@@ -147,7 +147,7 @@ class TestPropertyStore :
         }
 
         static ci_equal equals;
-        VARENUM vt;
+        VARENUM vt = VT_EMPTY;
         std::wstring value;
 
         auto hr = TryGet(wszName, vt, value);

test/vswhere.test/VersionRangeTests.cpp

@@ -17,6 +17,7 @@ TEST_CLASS(VersionRangeTests)
         auto pHelper = new VersionRange;
         ISetupHelperPtr sut(pHelper, false);
 
+        #pragma warning(suppress: 6387) // Expected to pass invalid arg
         Assert::AreEqual(E_INVALIDARG, sut->ParseVersion(NULL, NULL));
     }
 
@@ -25,6 +26,7 @@ TEST_CLASS(VersionRangeTests)
         auto pHelper = new VersionRange;
         ISetupHelperPtr sut(pHelper, false);
 
+        #pragma warning(suppress: 6387) // Expected to pass invalid arg
         Assert::AreEqual(E_POINTER, sut->ParseVersion(L"1.0", NULL));
     }
 
@@ -130,6 +132,7 @@ TEST_CLASS(VersionRangeTests)
         auto pHelper = new VersionRange;
         ISetupHelperPtr sut(pHelper, false);
 
+        #pragma warning(suppress: 6387) // Expected to pass invalid arg
         Assert::AreEqual(E_INVALIDARG, sut->ParseVersionRange(NULL, NULL, NULL));
     }
 
@@ -138,6 +141,7 @@ TEST_CLASS(VersionRangeTests)
         auto pHelper = new VersionRange;
         ISetupHelperPtr sut(pHelper, false);
 
+        #pragma warning(suppress: 6387) // Expected to pass invalid arg
         Assert::AreEqual(E_POINTER, sut->ParseVersionRange(L"[1.0,)", NULL, NULL));
     }
 
@@ -147,6 +151,8 @@ TEST_CLASS(VersionRangeTests)
         ISetupHelperPtr sut(pHelper, false);
 
         ULONGLONG ullMinVersion = 0;
+
+        #pragma warning(suppress: 6387) // Expected to pass invalid arg
         Assert::AreEqual(E_POINTER, sut->ParseVersionRange(L"[1.0,)", &ullMinVersion, NULL));
     }