From c51103404f836f592ea7a750aedec355cdf9b5ef Mon Sep 17 00:00:00 2001
From: sosssego <fredmoron@gmail.com>
Date: Tue, 8 Nov 2022 17:34:21 +0000
Subject: [PATCH] [Analyzers][CPP] turn on Warning 4706 (#21434)

* Analyzers CPP

Changing the warning level from 3 to 4.
change some project files to make them use the warning config in cpp props file.

* Analyzers C++ turn on warning 4706

Change Cpp.Build.props file to enable 4706
fix BugReportTool code to get rid of 4706

* disable 4706 for external code
---
 Cpp.Build.props                                          | 2 +-
 tools/BugReportTool/BugReportTool/BugReportTool.vcxproj  | 2 +-
 tools/BugReportTool/BugReportTool/InstallationFolder.cpp | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Cpp.Build.props b/Cpp.Build.props
index 0b546fc092..529da5c53f 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -42,7 +42,7 @@
     <ClCompile>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>    
       <WarningLevel>Level4</WarningLevel>
-	  <DisableSpecificWarnings>26800;28251;4100;4127;4189;4239;4244;4245;4389;4456;4457;4701;6387;4458;4505;4515;4459;4702;4706;6031;6248;26451;28182;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+	  <DisableSpecificWarnings>26800;28251;4100;4127;4189;4239;4244;4245;4389;4456;4457;4701;6387;4458;4505;4515;4459;4702;6031;6248;26451;28182;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <DisableAnalyzeExternal >true</DisableAnalyzeExternal>
       <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
       <ConformanceMode>false</ConformanceMode>
diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
index 6c6929b640..16645f145c 100644
--- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
+++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\deps\cziplib\src\zip.c">
       <!-- Disabling warnings for external code -->
-	  <DisableSpecificWarnings>26451;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+	  <DisableSpecificWarnings>26451;4706;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="EventViewer.cpp" />
     <ClCompile Include="InstallationFolder.cpp" />
diff --git a/tools/BugReportTool/BugReportTool/InstallationFolder.cpp b/tools/BugReportTool/BugReportTool/InstallationFolder.cpp
index 82887c89e9..4fef3b8b40 100644
--- a/tools/BugReportTool/BugReportTool/InstallationFolder.cpp
+++ b/tools/BugReportTool/BugReportTool/InstallationFolder.cpp
@@ -106,7 +106,8 @@ wstring GetChecksum(path filePath)
 		return L"CryptCreateHash() failed. " + get_last_error_or_default(GetLastError());
 	}
 
-	while (bResult = ReadFile(hFile, rgbFile, bufferSize, &cbRead, NULL))
+	bResult = ReadFile(hFile, rgbFile, bufferSize, &cbRead, NULL);
+	while (bResult)
 	{
 		if (0 == cbRead)
 		{
@@ -120,6 +121,8 @@ wstring GetChecksum(path filePath)
 			CloseHandle(hFile);
 			return L"CryptHashData() failed. " + get_last_error_or_default(GetLastError());;
 		}
+
+		bResult = ReadFile(hFile, rgbFile, bufferSize, &cbRead, NULL);
 	}
 
 	if (!bResult)