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

Merge pull request #125 from igaztanaga/patch-1

Browse Source 
Update system_category_message_win32.hpp
This commit is contained in:
Peter Dimov
2024-09-05 21:25:41 +03:00
committed by GitHub
parent 3e5ce27719 6d58d0bb76
commit 09f4eb87e2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/system/detail/system_category_message_win32.hpp
View File

@ -73,7 +73,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
DWORD_ retval = boost::winapi::FormatMessageA( DWORD_ retval = boost::winapi::FormatMessageA(
FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_, FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
NULL, NULL,
ev, static_cast<DWORD_>(ev),
MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
buffer, buffer,
static_cast<DWORD_>( len ), static_cast<DWORD_>( len ),
@ -94,7 +94,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
DWORD_ retval = boost::winapi::FormatMessageW( DWORD_ retval = boost::winapi::FormatMessageW(
FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_, FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
NULL, NULL,
ev, static_cast<DWORD_>(ev),
MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
(LPWSTR_) &lpMsgBuf, (LPWSTR_) &lpMsgBuf,
0, 0,
@ -152,7 +152,7 @@ inline std::string system_category_message_win32( int ev )
DWORD_ retval = boost::winapi::FormatMessageW( DWORD_ retval = boost::winapi::FormatMessageW(
FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_, FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
NULL, NULL,
ev, static_cast<DWORD_>(ev),
MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
(LPWSTR_) &lpMsgBuf, (LPWSTR_) &lpMsgBuf,
0, 0,
@ -176,7 +176,7 @@ inline std::string system_category_message_win32( int ev )
return unknown_message_win32( ev ); return unknown_message_win32( ev );
} }
std::string buffer( r, char() ); std::string buffer( static_cast<std::size_t>(r), char() );
r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, &buffer[0], r, NULL, NULL ); r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, &buffer[0], r, NULL, NULL );
@ -187,12 +187,12 @@ inline std::string system_category_message_win32( int ev )
--r; // exclude null terminator --r; // exclude null terminator
while( r > 0 && ( buffer[ r-1 ] == '\n' || buffer[ r-1 ] == '\r' ) ) while( r > 0 && ( buffer[ static_cast<std::size_t>(r)-1 ] == '\n' || buffer[ static_cast<std::size_t>(r)-1 ] == '\r' ) )
{ {
--r; --r;
} }
if( r > 0 && buffer[ r-1 ] == '.' ) if( r > 0 && buffer[ static_cast<std::size_t>(r)-1 ] == '.' )
{ {
--r; --r;
} }