Fix some type mismatch issues in MRT

Author: huichen123

dev/MRTCore/mrt/mrm/UnitTests/DecisionInfo.UnitTests.cpp

@@ -84,12 +84,7 @@ void DecisionInfoUnitTests::SimpleBuilderTests()
         return;
     }
 
-    // Add test data to builders
-    // Although it is tempting to remove the '!' below to address the PREfast issue, doing that broke the build. 
-    // OTOH, 2 instances of the same code pattern are also in OS.2020, therefore, we probably would want to have 
-    // a "global" fix for all instances. Bug 50087117 has been filed for tracking the "global" fix.
-#pragma warning(suppress: 6215) // C6215: Cast between semantically different integer types.
-    if (FAILED(!decisionInfo.ApplyTestData(pBuilder)))
+    if (FAILED(decisionInfo.ApplyTestData(pBuilder)))
     {
         Log::Error(L"[ Error applying test data ]");
         return;

dev/MRTCore/mrt/mrm/UnitTests/testUtils.cpp

@@ -32,14 +32,14 @@ bool TestUtils::TryVerifyRemap(_In_ PCWSTR pVarName, _Inout_ const RemapUInt16*
             return false;
         }
 
-        for (UINT16 i = 0; i < expectedStrings.GetNumStrings(); i++)
+        for (int i = 0; i < expectedStrings.GetNumStrings(); i++)
         {
             if (!expectedStrings.TryGetStringAsInt(i, &expectedValue))
             {
                 Log::Warning(tmp.Format(L"[ \"%s\" malformed - value %d ignored ]", pVarName, i));
                 continue;
             }
-            pRemap->TryGetMapping(i, &gotValue);
+            pRemap->TryGetMapping(static_cast<UINT16>(i), &gotValue);
             VERIFY(expectedValue == gotValue);
         }
         return true;
@@ -250,4 +250,4 @@ void TestUtils::TryGetExpectedResult(_In_ PCWSTR varName, _Out_ DEFRESULT* resul
     }
 }
 
-} // namespace UnitTests
+} // namespace UnitTests

dev/MRTCore/mrt/mrm/mrmmin/DecisionInfoBuilder.cpp

@@ -315,35 +315,35 @@ HRESULT DecisionInfoBuilder::Merge(
     }
 
     // merge qualifiers
-    for (UINT16 i = 1; i < pMerge->GetNumQualifiers(); i++)
+    for (int i = 1; i < pMerge->GetNumQualifiers(); i++)
     {
         RETURN_IF_FAILED(pMerge->GetQualifier(i, &qualifier));
         RETURN_IF_FAILED(GetOrAddQualifier(&qualifier, &index));
-        if (!pQualifierMapUsed->TrySetMapping(i, static_cast<UINT16>(index)))
+        if (!pQualifierMapUsed->TrySetMapping(static_cast<UINT16>(i), static_cast<UINT16>(index)))
         {
             return HRESULT_FROM_WIN32(ERROR_MRM_MAP_NOT_FOUND);
         }
     }
 
     // merge qualifiersets
     QualifierSetResult qualifierSet;
-    for (UINT16 i = 1; i < pMerge->GetNumQualifierSets(); i++)
+    for (int i = 1; i < pMerge->GetNumQualifierSets(); i++)
     {
         RETURN_IF_FAILED(pMerge->GetQualifierSet(i, &qualifierSet));
         RETURN_IF_FAILED(GetOrAddQualifierSet(&qualifierSet, pQualifierMapUsed, &index));
-        if (!pQualifierSetMapUsed->TrySetMapping(i, static_cast<UINT16>(index)))
+        if (!pQualifierSetMapUsed->TrySetMapping(static_cast<UINT16>(i), static_cast<UINT16>(index)))
         {
             return HRESULT_FROM_WIN32(ERROR_MRM_MAP_NOT_FOUND);
         }
     }
 
     // merge decisions
     DecisionResult decision;
-    for (UINT16 i = 2; i < pMerge->GetNumDecisions(); i++)
+    for (int i = 2; i < pMerge->GetNumDecisions(); i++)
     {
         RETURN_IF_FAILED(pMerge->GetDecision(i, &decision));
         RETURN_IF_FAILED(GetOrAddDecision(&decision, pQualifierSetMapUsed, &index));
-        if (!pDecisionMapUsed->TrySetMapping(i, static_cast<UINT16>(index)))
+        if (!pDecisionMapUsed->TrySetMapping(static_cast<UINT16>(i), static_cast<UINT16>(index)))
         {
             return HRESULT_FROM_WIN32(ERROR_MRM_MAP_NOT_FOUND);
         }