From 15d9fab0bbe5cae41116c7eb24dc1797f05957c1 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 28 Jun 2020 18:15:30 +0200 Subject: 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. --- Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp') 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 { -- cgit v1.2.3