| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 // Conversion functions for UTF-8 and UTF-16 strings on Windows. | 11 // Conversion functions for UTF-8 and UTF-16 strings on Windows. |
| 12 // Duplicated from talk/base/win32.h. | 12 // Duplicated from talk/base/win32.h. |
| 13 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ | 13 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ |
| 14 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ | 14 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ |
| 15 | 15 |
| 16 #ifdef WIN32 | 16 #ifdef WIN32 |
| 17 #include <windows.h> | 17 #include <windows.h> |
| 18 |
| 19 #include <memory> |
| 18 #include <string> | 20 #include <string> |
| 19 | 21 |
| 20 #include "webrtc/base/scoped_ptr.h" | 22 #include "webrtc/base/scoped_ptr.h" |
| 21 | 23 |
| 22 namespace webrtc { | 24 namespace webrtc { |
| 23 | 25 |
| 24 inline std::wstring ToUtf16(const char* utf8, size_t len) { | 26 inline std::wstring ToUtf16(const char* utf8, size_t len) { |
| 25 int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), | 27 int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), |
| 26 NULL, 0); | 28 NULL, 0); |
| 27 rtc::scoped_ptr<wchar_t[]> ws(new wchar_t[len16]); | 29 std::unique_ptr<wchar_t[]> ws(new wchar_t[len16]); |
| 28 ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws.get(), | 30 ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws.get(), |
| 29 len16); | 31 len16); |
| 30 return std::wstring(ws.get(), len16); | 32 return std::wstring(ws.get(), len16); |
| 31 } | 33 } |
| 32 | 34 |
| 33 inline std::wstring ToUtf16(const std::string& str) { | 35 inline std::wstring ToUtf16(const std::string& str) { |
| 34 return ToUtf16(str.data(), str.length()); | 36 return ToUtf16(str.data(), str.length()); |
| 35 } | 37 } |
| 36 | 38 |
| 37 inline std::string ToUtf8(const wchar_t* wide, size_t len) { | 39 inline std::string ToUtf8(const wchar_t* wide, size_t len) { |
| 38 int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), | 40 int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), |
| 39 NULL, 0, NULL, NULL); | 41 NULL, 0, NULL, NULL); |
| 40 rtc::scoped_ptr<char[]> ns(new char[len8]); | 42 std::unique_ptr<char[]> ns(new char[len8]); |
| 41 ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns.get(), len8, | 43 ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns.get(), len8, |
| 42 NULL, NULL); | 44 NULL, NULL); |
| 43 return std::string(ns.get(), len8); | 45 return std::string(ns.get(), len8); |
| 44 } | 46 } |
| 45 | 47 |
| 46 inline std::string ToUtf8(const wchar_t* wide) { | 48 inline std::string ToUtf8(const wchar_t* wide) { |
| 47 return ToUtf8(wide, wcslen(wide)); | 49 return ToUtf8(wide, wcslen(wide)); |
| 48 } | 50 } |
| 49 | 51 |
| 50 inline std::string ToUtf8(const std::wstring& wstr) { | 52 inline std::string ToUtf8(const std::wstring& wstr) { |
| 51 return ToUtf8(wstr.data(), wstr.length()); | 53 return ToUtf8(wstr.data(), wstr.length()); |
| 52 } | 54 } |
| 53 | 55 |
| 54 } // namespace webrtc | 56 } // namespace webrtc |
| 55 | 57 |
| 56 #endif // WIN32 | 58 #endif // WIN32 |
| 57 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ | 59 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ |
| OLD | NEW |