mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-27 12:38:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify windows handling (#1903)

Browse Source
This commit is contained in:
Victor Zverovich 2020-09-26 08:20:38 -07:00 committed by GitHub
parent 253d63159f
commit 762c33a964
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/fmt/format-inl.h
View File

@ -13,35 +13,20 @@
#include <climits>
#include <cmath>
#include <cstdarg>
#include <cstring> // for std::memmove
#include <cstring> // std::memmove
#include <cwchar>
#include <exception>
#include "format.h"
#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
# include <locale>
#endif
#ifdef _WIN32
# include <io.h>
FMT_BEGIN_NAMESPACE
namespace details {
# if !defined(__LP64__)
using DWORD = unsigned long;
# else
using DWORD = unsigned int;
# endif
// WriteConsoleW should not become visible in global namespace
extern "C" {
int __stdcall WriteConsoleW(void* hConsoleOutput, const void* lpBuffer,
DWORD nNumberOfCharsToWrite,
DWORD* lpNumberOfCharsWritten, void* lpReserved);
}
} // namespace details
FMT_END_NAMESPACE
# include <io.h> // _isatty
#endif
#include "format.h"
// Dummy implementations of strerror_r and strerror_s called if corresponding
// system functions are not available.
inline fmt::detail::null<> strerror_r(int, char*, ...) { return {}; }
@ -2896,6 +2881,16 @@ FMT_FUNC std::string detail::vformat(string_view format_str, format_args args) {
return to_string(buffer);
}
#ifdef _WIN32
namespace detail {
extern "C" int __stdcall WriteConsoleW(void* hConsoleOutput,
const void* lpBuffer,
uint32_t nNumberOfCharsToWrite,
uint32_t* lpNumberOfCharsWritten,
void* lpReserved);
}
#endif
FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
memory_buffer buffer;
detail::vformat_to(buffer, format_str,
@ -2904,10 +2899,10 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
auto fd = _fileno(f);
if (_isatty(fd)) {
detail::utf8_to_utf16 u16(string_view(buffer.data(), buffer.size()));
auto written = details::DWORD();
if (!details::WriteConsoleW(
reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
static_cast<details::DWORD>(u16.size()), &written, nullptr)) {
auto written = uint32_t();
if (!detail::WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)),
u16.c_str(), static_cast<uint32_t>(u16.size()),
&written, nullptr)) {
FMT_THROW(format_error("failed to write to console"));
}
return;