From e67eb4693e7d8354a42db016e84b56af9308a476 Mon Sep 17 00:00:00 2001 From: QuellaZhang <> Date: Thu, 15 Aug 2019 17:49:57 +0200 Subject: [PATCH] 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(&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(input.size()), - &output[0], static_cast(output.size()), nullptr, false)) + &output[0], static_cast(output.size()), nullptr, nullptr)) { const DWORD error_code = GetLastError(); ERROR_LOG(COMMON, "WideCharToMultiByte Error in String '%s': %lu",