From 4dd93442a5d576fb335a2e35f3bbf3461c716315 Mon Sep 17 00:00:00 2001
From: JesseCol <50150435+JesseCol@users.noreply.github.com>
Date: Fri, 10 May 2024 18:44:26 -0700
Subject: [PATCH] Revert "Fix Prefast C6101 on Foundation Solution (#4378)"
 (#4405)

This reverts commit 8d366d91b7d786a8130f307bd52286d45c46effc.
---
 dev/Deployment/DeploymentManager.cpp        |  2 +-
 dev/UndockedRegFreeWinRT/typeresolution.cpp | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp
index a99439f6c..fd8fee2b6 100644
--- a/dev/Deployment/DeploymentManager.cpp
+++ b/dev/Deployment/DeploymentManager.cpp
@@ -260,7 +260,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
         }
         else
         {
-            if ((::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::Feature_DeploymentRepair::IsEnabled()) &&
+            if ((::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::Feature_DeploymentRepair::IsEnabled()) && 
                 (isRepair))
             {
                 status = DeploymentStatus::PackageRepairFailed;
diff --git a/dev/UndockedRegFreeWinRT/typeresolution.cpp b/dev/UndockedRegFreeWinRT/typeresolution.cpp
index e0482d040..0dec2e264 100644
--- a/dev/UndockedRegFreeWinRT/typeresolution.cpp
+++ b/dev/UndockedRegFreeWinRT/typeresolution.cpp
@@ -64,14 +64,6 @@ namespace UndockedRegFreeWinRT
         _COM_Outptr_opt_result_maybenull_ IMetaDataImport2** ppMetaDataImport,
         _Out_opt_ mdTypeDef* pmdTypeDef)
     {
-        if (ppMetaDataImport != nullptr)
-        {
-            *ppMetaDataImport = nullptr;
-        }
-        if (pmdTypeDef != nullptr)
-        {
-            *pmdTypeDef = 0;
-        }
         HRESULT hr = S_OK;
         Microsoft::WRL::ComPtr<IMetaDataImport2> spMetaDataImport;
         MetaDataImportersLRUCache* pMetaDataImporterCache = MetaDataImportersLRUCache::GetMetaDataImportersLRUCacheInstance();
@@ -221,17 +213,7 @@ namespace UndockedRegFreeWinRT
         _COM_Outptr_opt_result_maybenull_ IMetaDataImport2** ppMetaDataImport,
         _Out_opt_ mdTypeDef* pmdTypeDef)
     {
-        if (ppMetaDataImport != nullptr)
-        {
-            *ppMetaDataImport = nullptr;
-        }
-        if (pmdTypeDef != nullptr)
-        {
-            *pmdTypeDef = 0;
-        }
-
         wchar_t szCandidateFileName[MAX_PATH + 1]{};
-        RETURN_IF_FAILED(WindowsCreateString(L"", 0, phstrMetaDataFilePath));
         HRESULT hr{ StringCchCopy(szCandidateFileName, ARRAYSIZE(szCandidateFileName), pszFullName) };
         if (SUCCEEDED(hr))
         {