luo980/cpp-httplib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yhirose 2024-11-13 20:59:11 -05:00
parent 95fb89eb30
commit 7604602eca
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httplib.h
View File

@ -2911,13 +2911,15 @@ inline bool mmap::open(const char *path) {
#if defined(_WIN32) #if defined(_WIN32)
std::wstring wpath; std::wstring wpath;
{ {
auto cp = ::GetACP();
auto len = static_cast<int>(strlen(path)); auto len = static_cast<int>(strlen(path));
auto wlen = ::MultiByteToWideChar(CP_UTF8, 0, path, len, nullptr, 0); auto wlen = ::MultiByteToWideChar(cp, 0, path, len, nullptr, 0);
if (wlen <= 0) { return false; } if (wlen <= 0) { return false; }
wpath.resize(wlen); wpath.resize(wlen);
auto pwpath = const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(wpath.data())); auto pwpath = const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(wpath.data()));
wlen = ::MultiByteToWideChar(CP_UTF8, 0, path, len, pwpath, wlen); wlen = ::MultiByteToWideChar(cp, 0, path, len, pwpath, wlen);
if (wlen != wpath.size()) { return false; } if (wlen != wpath.size()) { return false; }
} }

11
test/test.cc
View File

@ -1,3 +1,4 @@
// NOTE: This file should be saved as UTF-8 w/ BOM
#include <httplib.h> #include <httplib.h>
#include <signal.h> #include <signal.h>
@ -241,7 +242,7 @@ TEST(DecodeURLTest, PercentCharacter) {
detail::decode_url( detail::decode_url(
R"(descrip=Gastos%20%C3%A1%C3%A9%C3%AD%C3%B3%C3%BA%C3%B1%C3%91%206)", R"(descrip=Gastos%20%C3%A1%C3%A9%C3%AD%C3%B3%C3%BA%C3%B1%C3%91%206)",
false), false),
R"(descrip=Gastos áéíóúñÑ 6)"); u8"descrip=Gastos áéíóúñÑ 6");
} }
TEST(DecodeURLTest, PercentCharacterNUL) { TEST(DecodeURLTest, PercentCharacterNUL) {
@ -267,9 +268,9 @@ TEST(EncodeQueryParamTest, ParseReservedCharactersTest) {
} }
TEST(EncodeQueryParamTest, TestUTF8Characters) { TEST(EncodeQueryParamTest, TestUTF8Characters) {
string chineseCharacters = "中国語"; string chineseCharacters = u8"中国語";
string russianCharacters = "дом"; string russianCharacters = u8"дом";
string brazilianCharacters = "óculos"; string brazilianCharacters = u8"óculos";
EXPECT_EQ(detail::encode_query_param(chineseCharacters), EXPECT_EQ(detail::encode_query_param(chineseCharacters),
"%E4%B8%AD%E5%9B%BD%E8%AA%9E"); "%E4%B8%AD%E5%9B%BD%E8%AA%9E");
@ -5289,7 +5290,7 @@ TEST(MountTest, MultibytesPathName) {
auto res = cli.Get("/日本語Dir/日本語File.txt"); auto res = cli.Get("/日本語Dir/日本語File.txt");
ASSERT_TRUE(res); ASSERT_TRUE(res);
EXPECT_EQ(StatusCode::OK_200, res->status); EXPECT_EQ(StatusCode::OK_200, res->status);
EXPECT_EQ("日本語コンテンツ", res->body); EXPECT_EQ(u8"日本語コンテンツ", res->body);
} }
TEST(KeepAliveTest, ReadTimeout) { TEST(KeepAliveTest, ReadTimeout) {