src: move

yamachu · Jan 24, 2025 · 0041793 · 0041793
1 parent 7edf181
commit 0041793
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 33 deletions.
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -3146,19 +3146,6 @@ 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()))
 

diff --git a/src/node_modules.cc b/src/node_modules.cc
@@ -16,10 +16,6 @@
 
 #include "simdjson.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 namespace node {
 namespace modules {
 
@@ -330,22 +326,6 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
   return nullptr;
 }
 
-#ifdef _WIN32
-std::wstring ConvertToWideString(const std::string& str) {
-  auto cp = GetACP();
-  int size_needed = MultiByteToWideChar(
-      cp, 0, &str[0], static_cast<int>(str.size()), nullptr, 0);
-  std::wstring wstrTo(size_needed, 0);
-  MultiByteToWideChar(cp,
-                      0,
-                      &str[0],
-                      static_cast<int>(str.size()),
-                      &wstrTo[0],
-                      size_needed);
-  return wstrTo;
-}
-#endif
-
 void BindingData::GetNearestParentPackageJSON(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK_GE(args.Length(), 1);

diff --git a/src/util-inl.h b/src/util-inl.h
@@ -562,6 +562,18 @@ bool IsWindowsBatchFile(const char* filename) {
 #endif  // _WIN32
 }
 
+#ifdef _WIN32
+inline std::wstring ConvertToWideString(const std::string& str) {
+  auto cp = GetACP();
+  int size_needed = MultiByteToWideChar(
+      cp, 0, &str[0], static_cast<int>(str.size()), nullptr, 0);
+  std::wstring wstrTo(size_needed, 0);
+  MultiByteToWideChar(
+      cp, 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