lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-06-16 17:00:54 +03:00
Code Activity

Resolve #1973 (#1976)

Browse Source 
* Fix #1973

* Fixed problems with 'Language for non-Unicode programs' setting on Windows

* Fix problems on English locale
This commit is contained in:
yhirose
2024-11-13 22:47:09 -05:00
committed by GitHub
parent 924f214303
commit 9dd565b6e3
3 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
httplib.h
View File

@ -2258,13 +2258,33 @@ make_basic_authentication_header(const std::string &username,
namespace detail {
#if defined(_WIN32)
std::wstring u8string_to_wstring(const char *s) {
std::wstring ws;
auto len = static_cast<int>(strlen(s));
auto wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, nullptr, 0);
if (wlen > 0) {
ws.resize(wlen);
wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(ws.data())), wlen);
if (wlen != ws.size()) {
ws.clear();
}
}
return ws;
}
#endif
struct FileStat {
FileStat(const std::string &path);
bool is_file() const;
bool is_dir() const;
private:
#if defined(_WIN32)
struct _stat st_;
#else
struct stat st_;
#endif
int ret_ = -1;
};
@ -2639,7 +2659,12 @@ inline bool is_valid_path(const std::string &path) {
}
inline FileStat::FileStat(const std::string &path) {
#if defined(_WIN32)
auto wpath = u8string_to_wstring(path.c_str());
ret_ = _wstat(wpath.c_str(), &st_);
#else
ret_ = stat(path.c_str(), &st_);
#endif
}
inline bool FileStat::is_file() const {
return ret_ >= 0 && S_ISREG(st_.st_mode);
@ -2909,10 +2934,8 @@ inline bool mmap::open(const char *path) {
close();
#if defined(_WIN32)
std::wstring wpath;
for (size_t i = 0; i < strlen(path); i++) {
wpath += path[i];
}
auto wpath = u8string_to_wstring(path);
if (wpath.empty()) { return false; }
#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,