hrmmm

Author: neheb

src/basicio.cpp

@@ -489,8 +489,28 @@ int FileIo::open(const std::string& mode) {
   close();
   p_->openMode_ = mode;
   p_->opMode_ = Impl::opSeek;
+#ifdef _WIN32
+  auto wMode = [&] {
+    if (mode == "ab")
+      return L"ab";
+    if (mode == "rb")
+      return L"rb";
+    if (mode == "wb")
+      return L"wb";
+    if (mode == "a+b")
+      return L"a+b";
+    if (mode == "r+b")
+      return L"r+b";
+    if (mode == "w+b")
+      return L"w+b";
+    return L"";
+  }();
+
+  if (_wfopen_s(&p_->fp_, p_->path_.c_str(), wMode))
+#else
   p_->fp_ = ::fopen(path().c_str(), mode.c_str());
   if (!p_->fp_)
+#endif
     return 1;
   return 0;
 }
@@ -1641,6 +1661,20 @@ size_t writeFile(const DataBuf& buf, const std::string& path) {
   }
   return file.write(buf.c_data(), buf.size());
 }
+
+#ifdef _WIN32
+DataBuf readFile(const std::wstring& path) {
+  FileIo file(path);
+  if (file.open("rb") != 0) {
+    throw Error(ErrorCode::kerFileOpenFailed, "rb", strError());
+  }
+  DataBuf buf(static_cast<size_t>(fs::file_size(path)));
+  if (file.read(buf.data(), buf.size()) != buf.size()) {
+    throw Error(ErrorCode::kerCallFailed, strError(), "FileIo::read");
+  }
+  return buf;
+}
+#endif
 #endif
 
 #ifdef EXV_USE_CURL

src/image.cpp

@@ -903,7 +903,7 @@ Image::UniquePtr ImageFactory::create(ImageType type, const std::string& path) {
 Image::UniquePtr ImageFactory::create(ImageType type, const std::wstring& path) {
   auto fileIo = std::make_unique<FileIo>(path);
   // Create or overwrite the file, then close it
-  if (fileIo->open(L"w+b") != 0)
+  if (fileIo->open("w+b") != 0)
     throw Error(ErrorCode::kerFileOpenFailed, "w+b", strError());
   fileIo->close();