src: fix generation of path objects in Windows

src/node_file.cc

@@ -3146,21 +3146,8 @@ static void GetFormatOfExtensionlessFile(
 }
 
 #ifdef _WIN32
-std::wstring ConvertToWideString(const std::string& str) {
-  int size_needed = MultiByteToWideChar(
-      CP_UTF8, 0, &str[0], static_cast<int>(str.size()), nullptr, 0);
-  std::wstring wstrTo(size_needed, 0);
-  MultiByteToWideChar(CP_UTF8,
-                      0,
-                      &str[0],
-                      static_cast<int>(str.size()),
-                      &wstrTo[0],
-                      size_needed);
-  return wstrTo;
-}
-
 #define BufferValueToPath(str)                                                 \
-  std::filesystem::path(ConvertToWideString(str.ToString()))
+  std::filesystem::path(ConvertToWideString(str.ToString(), CP_UTF8))
 
 std::string ConvertWideToUTF8(const std::wstring& wstr) {
   if (wstr.empty()) return std::string();

src/node_modules.cc

@@ -344,8 +344,16 @@ void BindingData::GetNearestParentPackageJSON(
     path_value_str.push_back(kPathSeparator);
   }
 
-  auto package_json =
-      TraverseParent(realm, std::filesystem::path(path_value_str));
+  std::filesystem::path path;
+
+#ifdef _WIN32
+  std::wstring wide_path = ConvertToWideString(path_value_str, GetACP());
+  path = std::filesystem::path(wide_path);
+#else
+  path = std::filesystem::path(path_value_str);
+#endif
+
+  auto package_json = TraverseParent(realm, path);
 
   if (package_json != nullptr) {
     args.GetReturnValue().Set(package_json->Serialize(realm));
@@ -370,8 +378,16 @@ void BindingData::GetNearestParentPackageJSONType(
     path_value_str.push_back(kPathSeparator);
   }
 
-  auto package_json =
-      TraverseParent(realm, std::filesystem::path(path_value_str));
+  std::filesystem::path path;
+
+#ifdef _WIN32
+  std::wstring wide_path = ConvertToWideString(path_value_str, GetACP());
+  path = std::filesystem::path(wide_path);
+#else
+  path = std::filesystem::path(path_value_str);
+#endif
+
+  auto package_json = TraverseParent(realm, path);
 
   if (package_json == nullptr) {
     return;

src/util-inl.h

@@ -562,6 +562,22 @@ bool IsWindowsBatchFile(const char* filename) {
 #endif  // _WIN32
 }
 
+#ifdef _WIN32
+inline std::wstring ConvertToWideString(const std::string& str,
+                                        UINT code_page) {
+  int size_needed = MultiByteToWideChar(
+      code_page, 0, &str[0], static_cast<int>(str.size()), nullptr, 0);
+  std::wstring wstrTo(size_needed, 0);
+  MultiByteToWideChar(code_page,
+                      0,
+                      &str[0],
+                      static_cast<int>(str.size()),
+                      &wstrTo[0],
+                      size_needed);
+  return wstrTo;
+}
+#endif  // _WIN32
+
 }  // namespace node
 
 #endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

test/fixtures/copy/utf/新建文件夹/experimental.json

@@ -0,0 +1,3 @@
+{
+  "ofLife": 42
+}

test/parallel/test-module-create-require-multibyte.js

@@ -0,0 +1,24 @@
+'use strict';
+
+require('../common');
+const fixtures = require('../common/fixtures');
+const assert = require('assert');
+
+// This test ensures that the module can be resolved
+// even if the path given to createRequire contains multibyte characters.
+
+const { createRequire } = require('module');
+
+{
+  const u = fixtures.fileURL('あ.js');
+
+  const reqToo = createRequire(u);
+  assert.deepStrictEqual(reqToo('./experimental'), { ofLife: 42 });
+}
+
+{
+  const u = fixtures.fileURL('copy/utf/新建文件夹/index.js');
+
+  const reqToo = createRequire(u);
+  assert.deepStrictEqual(reqToo('./experimental'), { ofLife: 42 });
+}