Changeset 281 for cpp/common/stl-util.cpp

Timestamp:

12/27/14 01:01:43 (9 years ago)

Author:

Maciej Komosinski

Message:

Support for wide char (unicode) names of files and directories under Windows, internally encoded as char* utf-8

File:

• cpp/common/stl-util.cpp (modified) (3 diffs)

cpp/common/stl-util.cpp

@@ -7 +7 @@
 #include <stdlib.h>
 #include "nonstd_stdio.h"
+#include "Convert.h"
 #include "nonstd.h"
 #include "framsg.h"
@@ -91 +92 @@
 #endif
         {
+#ifdef _WIN32
+                MFILE *f = mfopen(Convert::utf8ToUtf16(filename).c_str(), Convert::strTOwstr(FOPEN_READ_BINARY).c_str());
+#else
                 MFILE *f = mfopen(filename, FOPEN_READ_BINARY);
+#endif
                 if (f)
                 {
@@ -119 +124 @@
 bool writeCompleteFile(const char* filename, const string& text, bool warn_on_fail)
 {
+#ifdef _WIN32
+        MFILE *f = mfopen(Convert::utf8ToUtf16(filename).c_str(), Convert::strTOwstr(FOPEN_WRITE_BINARY).c_str());
+#else
         MFILE *f = mfopen(filename, FOPEN_WRITE_BINARY);
+#endif
         bool ok = f != NULL;
         if (f)