ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix implicit false-to-nullptr conversions

This commit is contained in:
QuellaZhang 2019-08-15 17:49:57 +02:00 committed by Silent
parent a35f540e7a
commit e67eb4693e
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/WASAPIStream.cpp
View File

@ -152,7 +152,7 @@ IMMDevice* WASAPIStream::GetDeviceByName(std::string name)
__uuidof(IMMDeviceEnumerator), reinterpret_cast<LPVOID*>(&enumerator)); __uuidof(IMMDeviceEnumerator), reinterpret_cast<LPVOID*>(&enumerator));
if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result)) if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result))
return false; return nullptr;
IMMDeviceCollection* devices; IMMDeviceCollection* devices;
result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &devices); result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &devices);

2
Source/Core/Common/StringUtil.cpp
View File

@ -483,7 +483,7 @@ std::string UTF16ToCP(u32 code_page, std::wstring_view input)
output.resize(size); output.resize(size);
if (size != WideCharToMultiByte(code_page, 0, input.data(), static_cast<int>(input.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(); const DWORD error_code = GetLastError();
ERROR_LOG(COMMON, "WideCharToMultiByte Error in String '%s': %lu", ERROR_LOG(COMMON, "WideCharToMultiByte Error in String '%s': %lu",