The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 23:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8315 from CookiePLMonster/conformance-fixes

Browse Source 
Conformance fixes
This commit is contained in:
Connor McLaughlin 2019-08-17 11:54:41 +10:00 committed by GitHub
commit 0a7265f807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 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",

6
Source/VSProps/Base.props
View File

@ -88,9 +88,9 @@
<!--Enable latest C++ standard--> <!--Enable latest C++ standard-->
<LanguageStandard>stdcpplatest</LanguageStandard> <LanguageStandard>stdcpplatest</LanguageStandard>
<!--Enable Standard Conformance--> <!--Enable Standard Conformance-->
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions> <ConformanceMode>true</ConformanceMode>
<!--Enforce some behaviors as standards-conformant when they don't default as such--> <!--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--> <!--Enable detailed debug info-->
<AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
<!--Treat sources as utf-8--> <!--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... 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 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. <!-- Warnings one may want to ignore when using Level4.
4201 nonstandard extension used : nameless struct/union 4201 nonstandard extension used : nameless struct/union
4127 conditional expression is constant 4127 conditional expression is constant