Changeset 374 for cpp/common/nonstd_stdio.cpp

Timestamp:

04/23/15 03:18:25 (8 years ago)

Author:

Maciej Komosinski

Message:

Under _WIN32, mfopen() now redirects to a function mfile_wfopen() that converts arguments to wide char and then uses _wfopen()

File:

• cpp/common/nonstd_stdio.cpp (modified) (2 diffs)

cpp/common/nonstd_stdio.cpp

@@ -18 +18 @@
 #endif
 
+
+
+#ifdef _WIN32
+FILE* mfile_wfopen(const char *path, const char *mode) //to avoid converting args into wide char in all occurrences of mfopen()
+{
+        return _wfopen(Convert::utf8ToUtf16(path).c_str(), Convert::strTOwstr(mode).c_str());
+}
+#endif
+
 bool fileExists(const char* path)
 {
         //lepiej gdyby uzywalo stat bo mfopen mogloby cos niepotrzebnie wczytywac przy otwarciu pliku ale mfopen wiadomo ze zadziala wszedzie tak samo
-#ifdef _WIN32
-        MFILE *f = mfopen(Convert::utf8ToUtf16(path).c_str(), Convert::strTOwstr(FOPEN_READ_BINARY).c_str());
-#else
         MFILE *f = mfopen(path, FOPEN_READ_BINARY);
-#endif
         if (f == NULL) return false;
         mfclose(f);
@@ -105 +110 @@
 {
         int size;
-#ifdef _WIN32
-        MFILE *f = mfopen(Convert::utf8ToUtf16(path).c_str(), Convert::strTOwstr(FOPEN_READ_BINARY).c_str());
-#else
         MFILE *f = mfopen(path, FOPEN_READ_BINARY);
-#endif
         if (f == NULL) return -1;
         size = getFileSize(f);