diff options
| author | JosJuice <josjuice@gmail.com> | 2020-06-28 18:15:30 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2020-07-08 14:51:35 +0200 |
| commit | 15d9fab0bbe5cae41116c7eb24dc1797f05957c1 (patch) | |
| tree | f445a0d86ae0b8fc0a7e6cd6b106668946191ba1 /Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | |
| parent | cd51552fe4f88f725459c27959aa7fbc63c9cedf (diff) | |
Common: Rename UTF16ToUTF8
This function does *not* always convert from UTF-16. It converts
from UTF-16 on Windows and UTF-32 on other operating systems.
Also renaming UTF8ToUTF16 for consistency, even though it
technically doesn't have the same problem since it only was
implemented on Windows.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 6afa98ac2d..2fc0e1b972 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -38,7 +38,7 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device) std::string result; if (SUCCEEDED(device->GetProperty(DIPROP_PRODUCTNAME, &str.diph))) { - result = StripSpaces(UTF16ToUTF8(str.wsz)); + result = StripSpaces(WStringToUTF8(str.wsz)); } else { |