The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-14 15:51:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Core: use more recent api in ComputeDefaultCountryCode on Windows

Browse Source 
Co-authored-by: Shawn Hoffman <godisgovernment@gmail.com>
This commit is contained in:
iwubcode 2025-03-16 00:29:34 -05:00
parent 373a1a5dc0
commit 452cd1c261
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/Config/DefaultLocale.cpp
View File

@ -90,13 +90,15 @@ static std::string ComputeDefaultCountryCode()
#ifdef _WIN32
// Windows codepath: Check the regional information.
// More likely to match the user's physical location than locales are.
// TODO: Can we use GetUserDefaultGeoName? (It was added in a Windows 10 update)
GEOID geo = GetUserGeoID(GEOCLASS_NATION);
const int buffer_size = GetGeoInfoW(geo, GEO_ISO2, nullptr, 0, 0);
std::vector<wchar_t> buffer(buffer_size);
const int result = GetGeoInfoW(geo, GEO_ISO2, buffer.data(), buffer_size, 0);
if (result != 0)
return TStrToUTF8(buffer.data());
const int buffer_size = GetUserDefaultGeoName(nullptr, 0);
if (buffer_size == 3)
{
std::wstring buffer(buffer_size, L'\0');
const int result = GetUserDefaultGeoName(buffer.data(), buffer_size);
buffer.resize(2);
if (result > 0)
return WStringToUTF8(buffer);
}
#endif
// Generic codepath: Check the locales.