Call unicode API on Windows
This commit is contained in:
parent
362518791a
commit
d38bf9105d
2 changed files with 7 additions and 5 deletions
|
@ -17,6 +17,8 @@
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#else
|
||||||
|
#include <codecvt>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(MSG_NOSIGNAL)
|
#if !defined(MSG_NOSIGNAL)
|
||||||
|
@ -649,13 +651,13 @@ bool LookupSubNet(const char* pszName, CSubNet& ret)
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
std::string NetworkErrorString(int err)
|
std::string NetworkErrorString(int err)
|
||||||
{
|
{
|
||||||
char buf[256];
|
wchar_t buf[256];
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
if(FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
|
if(FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
|
||||||
nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||||
buf, sizeof(buf), nullptr))
|
buf, ARRAYSIZE(buf), nullptr))
|
||||||
{
|
{
|
||||||
return strprintf("%s (%d)", buf, err);
|
return strprintf("%s (%d)", std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>,wchar_t>().to_bytes(buf), err);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -997,7 +997,7 @@ void CreatePidFile(const fs::path &path, pid_t pid)
|
||||||
bool RenameOver(fs::path src, fs::path dest)
|
bool RenameOver(fs::path src, fs::path dest)
|
||||||
{
|
{
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
return MoveFileExA(src.string().c_str(), dest.string().c_str(),
|
return MoveFileExW(src.wstring().c_str(), dest.wstring().c_str(),
|
||||||
MOVEFILE_REPLACE_EXISTING) != 0;
|
MOVEFILE_REPLACE_EXISTING) != 0;
|
||||||
#else
|
#else
|
||||||
int rc = std::rename(src.string().c_str(), dest.string().c_str());
|
int rc = std::rename(src.string().c_str(), dest.string().c_str());
|
||||||
|
|
Loading…
Reference in a new issue