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

Improve Windows implementation of message()

Browse Source
This commit is contained in:
Peter Dimov
2018-09-21 06:45:56 +03:00
parent e180bfe37e
commit 7b401cef93
2 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
#include <boost/winapi/error_handling.hpp>
#include <boost/winapi/character_code_conversion.hpp>
#include <boost/winapi/local_memory.hpp>
#include <cstdio>
//
@ -25,6 +26,35 @@ namespace system
namespace detail
{
#if defined(_MSC_VER) && _MSC_VER < 1900
inline char const * unknown_message_win32( int ev, char * buffer, std::size_t len )
{
# if defined( BOOST_MSVC )
# pragma warning( push )
# pragma warning( disable: 4996 )
# endif
_snprintf( buffer, len - 1, "Unknown error (%d)", ev );
buffer[ len - 1 ] = 0;
return buffer;
# if defined( BOOST_MSVC )
# pragma warning( pop )
# endif
}
#else
inline char const * unknown_message_win32( int ev, char * buffer, std::size_t len )
{
std::snprintf( buffer, len, "Unknown error (%d)", ev );
return buffer;
}
#endif
inline char const * system_category_message_win32( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
{
if( len == 0 )
@ -62,14 +92,14 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
if( retval == 0 )
{
return "Unknown error";
return unknown_message_win32( ev, buffer, len );
}
int r = boost::winapi::WideCharToMultiByte( CP_ACP_, 0, wbuffer, -1, buffer, static_cast<int>( len ), NULL, NULL );
if( r == 0 )
{
return "Unknown error";
return unknown_message_win32( ev, buffer, len );
}
--r; // exclude null terminator
@ -97,11 +127,17 @@ struct local_free
}
};
inline std::string unknown_message_win32( int ev )
{
char buffer[ 38 ];
return unknown_message_win32( ev, buffer, sizeof( buffer ) );
}
inline std::string system_category_message_win32( int ev )
{
using namespace boost::winapi;
void * lpMsgBuf = 0;
wchar_t * lpMsgBuf = 0;
DWORD_ retval = boost::winapi::FormatMessageW(
FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
@ -113,20 +149,27 @@ inline std::string system_category_message_win32( int ev )
NULL
);
local_free lf_ = { lpMsgBuf };
if( retval == 0 )
{
return "Unknown error";
return unknown_message_win32( ev );
}
std::string buffer( retval * 2 + 1, char() );
local_free lf_ = { lpMsgBuf };
int r = boost::winapi::WideCharToMultiByte( CP_ACP_, 0, static_cast<wchar_t const*>( lpMsgBuf ), -1, &buffer[0], static_cast<int>( buffer.size() ), NULL, NULL );
int r = boost::winapi::WideCharToMultiByte( CP_ACP_, 0, lpMsgBuf, -1, 0, 0, NULL, NULL );
if( r == 0 )
{
return "Unknown error";
return unknown_message_win32( ev );
}
std::string buffer( r, char() );
r = boost::winapi::WideCharToMultiByte( CP_ACP_, 0, lpMsgBuf, -1, &buffer[0], r, NULL, NULL );
if( r == 0 )
{
return unknown_message_win32( ev );
}
--r; // exclude null terminator

6
test/system_category_test.cpp
View File

@ -14,6 +14,7 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <cstring>
#include <cstdio>
//
@ -51,7 +52,10 @@ std::string sys_strerror( int ev )
if( retval == 0 )
{
return "Unknown error";
char buffer[ 38 ];
std::sprintf( buffer, "Unknown error (%d)", ev );
return buffer;
}
std::string str( static_cast<char const*>( lpMsgBuf ) );