AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[platform] Support unicode filename on windows

Browse Source 
- Add ConvertUtf8StringToUtf16 to convert utf8
encoded file path to utf16 encoded path on windows.
- Add unicode filename support in OS::FOpen,
OS::MemoryMappedFile::open and
OS::MemoryMappedFile::create on windows.

Bug: v8:12541
Change-Id: I65396c3211355e41e8952bc0587ff01bbb720f9e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3538284
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Commit-Queue: Igor Sheludko <ishell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79742}
This commit is contained in:
jameslahm 2022-04-04 09:11:14 +08:00 committed by V8 LUCI CQ
parent 45961a0713
commit 2fe25c602c
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/base/platform/platform-win32.cc
View File

@ -90,6 +90,11 @@ int fopen_s(FILE** pFile, const char* filename, const char* mode) {
return *pFile != nullptr ? 0 : 1;
}
int _wfopen_s(FILE** pFile, const wchar_t* filename, const wchar_t* mode) {
*pFile = _wfopen(filename, mode);
return *pFile != nullptr ? 0 : 1;
}
int _vsnprintf_s(char* buffer, size_t sizeOfBuffer, size_t count,
const char* format, va_list argptr) {
DCHECK(count == _TRUNCATE);
@ -593,10 +598,25 @@ static void VPrintHelper(FILE* stream, const char* format, va_list args) {
}
}
// Convert utf-8 encoded string to utf-16 encoded.
static std::wstring ConvertUtf8StringToUtf16(const char* str) {
// On Windows wchar_t must be a 16-bit value.
static_assert(sizeof(wchar_t) == 2, "wrong wchar_t size");
std::wstring utf16_str;
int name_length = static_cast<int>(strlen(str));
int len = MultiByteToWideChar(CP_UTF8, 0, str, name_length, nullptr, 0);
if (len > 0) {
utf16_str.resize(len);
MultiByteToWideChar(CP_UTF8, 0, str, name_length, &utf16_str[0], len);
}
return utf16_str;
}
FILE* OS::FOpen(const char* path, const char* mode) {
FILE* result;
if (fopen_s(&result, path, mode) == 0) {
std::wstring utf16_path = ConvertUtf8StringToUtf16(path);
std::wstring utf16_mode = ConvertUtf8StringToUtf16(mode);
if (_wfopen_s(&result, utf16_path.c_str(), utf16_mode.c_str()) == 0) {
return result;
} else {
return nullptr;
@ -1141,8 +1161,11 @@ OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name,
if (mode == FileMode::kReadWrite) {
access |= GENERIC_WRITE;
}
HANDLE file = CreateFileA(name, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
nullptr, OPEN_EXISTING, 0, nullptr);
std::wstring utf16_name = ConvertUtf8StringToUtf16(name);
HANDLE file = CreateFileW(utf16_name.c_str(), access,
FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
OPEN_EXISTING, 0, nullptr);
if (file == INVALID_HANDLE_VALUE) return nullptr;
DWORD size = GetFileSize(file, nullptr);
@ -1165,8 +1188,9 @@ OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name,
// static
OS::MemoryMappedFile* OS::MemoryMappedFile::create(const char* name,
size_t size, void* initial) {
std::wstring utf16_name = ConvertUtf8StringToUtf16(name);
// Open a physical file.
HANDLE file = CreateFileA(name, GENERIC_READ | GENERIC_WRITE,
HANDLE file = CreateFileW(utf16_name.c_str(), GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
OPEN_ALWAYS, 0, nullptr);
if (file == nullptr) return nullptr;

22
src/d8/d8.cc
View File

@ -3568,32 +3568,12 @@ V8_NOINLINE void FuzzerMonitor::UseOfUninitializedValue() {
#endif
}
static FILE* FOpen(const char* path, const char* mode) {
#if defined(_MSC_VER) && (defined(_WIN32) || defined(_WIN64))
FILE* result;
if (fopen_s(&result, path, mode) == 0) {
return result;
} else {
return nullptr;
}
#else
FILE* file = base::Fopen(path, mode);
if (file == nullptr) return nullptr;
struct stat file_stat;
if (fstat(fileno(file), &file_stat) != 0) return nullptr;
bool is_regular_file = ((file_stat.st_mode & S_IFREG) != 0);
if (is_regular_file) return file;
base::Fclose(file);
return nullptr;
#endif
}
char* Shell::ReadChars(const char* name, int* size_out) {
if (options.read_from_tcp_port >= 0) {
return ReadCharsFromTcpPort(name, size_out);
}
FILE* file = FOpen(name, "rb");
FILE* file = base::OS::FOpen(name, "rb");
if (file == nullptr) return nullptr;
fseek(file, 0, SEEK_END);