boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-31 13:07:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor BOOST_SYSTEM_USE_UTF8 code

Browse Source
This commit is contained in:
Peter Dimov
2018-10-01 17:40:16 +03:00
parent b300fdeef4
commit 584f9731ad
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/boost/system/detail/system_category_win32.hpp
View File

@ -55,6 +55,19 @@ inline char const * unknown_message_win32( int ev, char * buffer, std::size_t le
#endif #endif
inline boost::winapi::UINT_ message_cp_win32()
{
#if defined(BOOST_SYSTEM_USE_UTF8)
return boost::winapi::CP_UTF8_;
#else
return boost::winapi::CP_ACP_;
#endif
}
inline char const * system_category_message_win32( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT inline char const * system_category_message_win32( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
{ {
if( len == 0 ) if( len == 0 )
@ -95,15 +108,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
return unknown_message_win32( ev, buffer, len ); return unknown_message_win32( ev, buffer, len );
} }
#if defined(BOOST_SYSTEM_USE_UTF8) UINT_ const code_page = message_cp_win32();
UINT_ code_page = CP_UTF8_;
#else
UINT_ code_page = CP_ACP_;
#endif
int r = boost::winapi::WideCharToMultiByte( code_page, 0, wbuffer, -1, buffer, static_cast<int>( len ), NULL, NULL ); int r = boost::winapi::WideCharToMultiByte( code_page, 0, wbuffer, -1, buffer, static_cast<int>( len ), NULL, NULL );
@ -166,15 +171,7 @@ inline std::string system_category_message_win32( int ev )
local_free lf_ = { lpMsgBuf }; local_free lf_ = { lpMsgBuf };
#if defined(BOOST_SYSTEM_USE_UTF8) UINT_ const code_page = message_cp_win32();
UINT_ code_page = CP_UTF8_;
#else
UINT_ code_page = CP_ACP_;
#endif
int r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, 0, 0, NULL, NULL ); int r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, 0, 0, NULL, NULL );