From a35f540e7a8ffbf26c10b22660f1c2d0821f7228 Mon Sep 17 00:00:00 2001
From: Silent <zdanio95@gmail.com>
Date: Thu, 15 Aug 2019 17:47:55 +0200
Subject: [PATCH 1/2] Explicitly enable conformance mode, and remove /Zc:inline
 because it's a default now

---
 Source/VSProps/Base.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 16699d9e72..9fdc6aff9c 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -88,9 +88,9 @@
       <!--Enable latest C++ standard-->
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <!--Enable Standard Conformance-->
-      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
+      <ConformanceMode>true</ConformanceMode>
       <!--Enforce some behaviors as standards-conformant when they don't default as such-->
-      <AdditionalOptions>/Zc:inline /Zc:throwingNew /volatile:iso %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:throwingNew /volatile:iso %(AdditionalOptions)</AdditionalOptions>
       <!--Enable detailed debug info-->
       <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
       <!--Treat sources as utf-8-->
@@ -103,7 +103,7 @@
                 seem to be a way to only ignore the specific instance we don't care about...
       4351  new behavior: elements of array 'array' will be default initialized
       -->
-      <DisableSpecificWarnings>4996;4351</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4996;4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <!-- Warnings one may want to ignore when using Level4.
       4201  nonstandard extension used : nameless struct/union
       4127  conditional expression is constant

From e67eb4693e7d8354a42db016e84b56af9308a476 Mon Sep 17 00:00:00 2001
From: QuellaZhang <>
Date: Thu, 15 Aug 2019 17:49:57 +0200
Subject: [PATCH 2/2] Fix implicit false-to-nullptr conversions

---
 Source/Core/AudioCommon/WASAPIStream.cpp | 2 +-
 Source/Core/Common/StringUtil.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/AudioCommon/WASAPIStream.cpp b/Source/Core/AudioCommon/WASAPIStream.cpp
index dd83ddb657..483a68f7af 100644
--- a/Source/Core/AudioCommon/WASAPIStream.cpp
+++ b/Source/Core/AudioCommon/WASAPIStream.cpp
@@ -152,7 +152,7 @@ IMMDevice* WASAPIStream::GetDeviceByName(std::string name)
                        __uuidof(IMMDeviceEnumerator), reinterpret_cast<LPVOID*>(&enumerator));
 
   if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result))
-    return false;
+    return nullptr;
 
   IMMDeviceCollection* devices;
   result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &devices);
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index c85e4ae227..7955c81fdf 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -483,7 +483,7 @@ std::string UTF16ToCP(u32 code_page, std::wstring_view input)
     output.resize(size);
 
     if (size != WideCharToMultiByte(code_page, 0, input.data(), static_cast<int>(input.size()),
-                                    &output[0], static_cast<int>(output.size()), nullptr, false))
+                                    &output[0], static_cast<int>(output.size()), nullptr, nullptr))
     {
       const DWORD error_code = GetLastError();
       ERROR_LOG(COMMON, "WideCharToMultiByte Error in String '%s': %lu",