GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-15 01:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Treat all filepath string as utf-8 encoded

Browse Source 
On Windows, convert utf-8 to wchar string before interact with filepath
This commit is contained in:
Harokyang 2019-10-30 15:16:46 +08:00 committed by harokyang
parent 1100f0f1eb
commit 5cecef2b92
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tiny_gltf.h
View File

@ -2227,7 +2227,10 @@ bool FileExists(const std::string &abs_filename, void *) {
#else
#ifdef _WIN32
FILE *fp;
errno_t err = fopen_s(&fp, abs_filename.c_str(), "rb");
int wchar_size = MultiByteToWideChar(CP_UTF8, 0, abs_filename.data(), (int)abs_filename.size(), nullptr, 0);
std::wstring wstr(wchar_size, 0);
MultiByteToWideChar(CP_UTF8, 0, abs_filename.data(), (int)abs_filename.size(), wstr.data(), (int)wstr.size());
errno_t err = _wfopen_s(&fp, wstr.c_str(), L"rb");
if (err != 0) {
return false;
}
@ -2321,8 +2324,15 @@ bool ReadWholeFile(std::vector<unsigned char> *out, std::string *err,
}
return false;
}
#else
#ifdef _WIN32
int wchar_size = MultiByteToWideChar(CP_UTF8, 0, filepath.data(), (int)filepath.size(), nullptr, 0);
std::wstring wstr(wchar_size, 0);
MultiByteToWideChar(CP_UTF8, 0, filepath.data(), (int)filepath.size(), wstr.data(), (int)wstr.size());
std::ifstream f(wstr.c_str(), std::ifstream::binary);
#else
std::ifstream f(filepath.c_str(), std::ifstream::binary);
#endif
if (!f) {
if (err) {
(*err) += "File open error : " + filepath + "\n";