Merge branch 'master' into 1.0

[libdcp.git] / asdcplib / src / KM_fileio.cpp

diff --git a/asdcplib/src/KM_fileio.cpp b/asdcplib/src/KM_fileio.cpp
index d9aba2dab7178f81764aba552fe06b2885cbc9d5..b20ff7f7a04fd51ed464b54c1ab8e6e45d24e18f 100644 (file)
--- a/asdcplib/src/KM_fileio.cpp
+++ b/asdcplib/src/KM_fileio.cpp
@@ -109,9 +109,18 @@ do_stat(const char* path, fstat_t* stat_info)
 #ifdef KM_WIN32
   UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
 
-  if ( _stati64(path, stat_info) == (__int64)-1 )
+  int const wn = MultiByteToWideChar (CP_UTF8, 0, path, -1, 0, 0);
+  wchar_t* buffer = new wchar_t[wn];
+  if (MultiByteToWideChar (CP_UTF8, 0, path, -1, buffer, wn) == 0) {
+         delete[] buffer;
+         return Kumu::RESULT_FAIL;
+  }
+
+  if ( _wstati64(buffer, stat_info) == (__int64)-1 )
     result = Kumu::RESULT_FILEOPEN;
 
+  delete[] buffer;
+
   ::SetErrorMode( prev );
 #else
   if ( stat(path, stat_info) == -1L )
@@ -691,11 +700,10 @@ Kumu::FileReader::OpenRead(const char* filename) const
 
   int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0);
   wchar_t* buffer = new wchar_t[wn];
-  if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn)) {
+  if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) {
          delete[] buffer;
          return Kumu::RESULT_FAIL;
   }
-
   const_cast<FileReader*>(this)->m_Handle = ::CreateFileW(buffer,
                          (GENERIC_READ),                // open for reading
                          FILE_SHARE_READ,               // share for reading
@@ -825,7 +833,7 @@ Kumu::FileWriter::OpenWrite(const char* filename)
 
   int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0);
   wchar_t* buffer = new wchar_t[wn];
-  if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn)) {
+  if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) {
          delete[] buffer;
          return Kumu::RESULT_FAIL;
   }
@@ -862,7 +870,7 @@ Kumu::FileWriter::OpenModify(const char* filename)
 
   int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0);
   wchar_t* buffer = new wchar_t[wn];
-  if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn)) {
+  if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) {
          delete[] buffer;
          return Kumu::RESULT_FAIL;
   }