From 7604602ecaf48e699592f06de5cba0840f1eed62 Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Wed, 13 Nov 2024 20:59:11 -0500
Subject: [PATCH] Fixed problems with 'Language for non-Unicode programs'
 setting on Windows

---
 httplib.h    |  6 ++++--
 test/test.cc | 11 ++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/httplib.h b/httplib.h
index f4a6d9c..62753e3 100644
--- a/httplib.h
+++ b/httplib.h
@@ -2911,13 +2911,15 @@ inline bool mmap::open(const char *path) {
 #if defined(_WIN32)
   std::wstring wpath;
   {
+    auto cp = ::GetACP();
+
     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; }
 
     wpath.resize(wlen);
     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; }
   }
 
diff --git a/test/test.cc b/test/test.cc
index dfa4e1a..e278a96 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,3 +1,4 @@
+// NOTE: This file should be saved as UTF-8 w/ BOM
 #include <httplib.h>
 #include <signal.h>
 
@@ -241,7 +242,7 @@ TEST(DecodeURLTest, PercentCharacter) {
       detail::decode_url(
           R"(descrip=Gastos%20%C3%A1%C3%A9%C3%AD%C3%B3%C3%BA%C3%B1%C3%91%206)",
           false),
-      R"(descrip=Gastos áéíóúñÑ 6)");
+      u8"descrip=Gastos áéíóúñÑ 6");
 }
 
 TEST(DecodeURLTest, PercentCharacterNUL) {
@@ -267,9 +268,9 @@ TEST(EncodeQueryParamTest, ParseReservedCharactersTest) {
 }
 
 TEST(EncodeQueryParamTest, TestUTF8Characters) {
-  string chineseCharacters = "中国語";
-  string russianCharacters = "дом";
-  string brazilianCharacters = "óculos";
+  string chineseCharacters = u8"中国語";
+  string russianCharacters = u8"дом";
+  string brazilianCharacters = u8"óculos";
 
   EXPECT_EQ(detail::encode_query_param(chineseCharacters),
             "%E4%B8%AD%E5%9B%BD%E8%AA%9E");
@@ -5289,7 +5290,7 @@ TEST(MountTest, MultibytesPathName) {
   auto res = cli.Get("/日本語Dir/日本語File.txt");
   ASSERT_TRUE(res);
   EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("日本語コンテンツ", res->body);
+  EXPECT_EQ(u8"日本語コンテンツ", res->body);
 }
 
 TEST(KeepAliveTest, ReadTimeout) {