[Utils] Call unicode API on Windows

Backports bitcoin#13888
Warrows · Oct 14, 2019 · a7f5f32 · a7f5f32
1 parent 6ad0a19
commit a7f5f32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/netbase.cpp b/src/netbase.cpp
@@ -28,6 +28,8 @@
 #include <arpa/inet.h>
 #endif
 #include <fcntl.h>
+#else
+#include <codecvt>
 #endif
 
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
@@ -1400,12 +1402,12 @@ bool operator<(const CSubNet& a, const CSubNet& b)
 #ifdef WIN32
 std::string NetworkErrorString(int err)
 {
-    char buf[256];
+    wchar_t buf[256];
     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,
             NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-            buf, sizeof(buf), NULL)) {
-        return strprintf("%s (%d)", buf, err);
+            buf, ARRAYSIZE(buf), nullptr)) {
+        return strprintf("%s (%d)", std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>,wchar_t>().to_bytes(buf), err);
     } else {
         return strprintf("Unknown error (%d)", err);
     }

diff --git a/src/util.cpp b/src/util.cpp
@@ -541,7 +541,7 @@ void CreatePidFile(const fs::path& path, pid_t pid)
 bool RenameOver(fs::path src, fs::path dest)
 {
 #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;
 #else
     int rc = std::rename(src.string().c_str(), dest.string().c_str());