utf-8 support

Author: matcool

CMakeLists.txt

@@ -7,18 +7,12 @@ include(libraries/mat-dash/include.cmake)
 
 project(replay-bot)
 
-find_file(WINDOWS_HEADER windows.h)
-if(NOT WINDOWS_HEADER)
-  message(FATAL_ERROR "Can't find windows.h!")
-endif()
-
-# TODO: not
-add_compile_definitions(FTG_IGNORE_UNICODE)
-
 if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
   add_compile_definitions(SHOW_CONSOLE)
 endif()
 
+add_compile_definitions(UNICODE _UNICODE)
+
 file(
   GLOB_RECURSE SOURCE_FILES
   src/*.cpp

libraries/gd.h

@@ -54,7 +54,7 @@ namespace subprocess {
             sec_attrs.lpSecurityDescriptor = nullptr;
 
             m_proc_info = {0};
-            STARTUPINFOA start_info = {0};
+            STARTUPINFOW start_info = {0};
 
             start_info.cb = sizeof(start_info);
             start_info.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -65,7 +65,14 @@ namespace subprocess {
             start_info.hStdInput = m_stdin.m_read.handle;
             m_stdin.m_write.set_inherit(false);
 
-            CreateProcessA(nullptr, const_cast<char*>(command.c_str()), nullptr, nullptr, true, 0, nullptr, nullptr, &start_info, &m_proc_info);
+            // cant include "utils.hpp" here, so just copy paste code from myself :D
+            auto size = MultiByteToWideChar(CP_UTF8, 0, command.c_str(), -1, nullptr, 0);
+            auto buffer = new wchar_t[size];
+            MultiByteToWideChar(CP_UTF8, 0, command.c_str(), -1, buffer, size);
+
+            CreateProcessW(nullptr, buffer, nullptr, nullptr, true, 0, nullptr, nullptr, &start_info, &m_proc_info);
+
+            delete[] buffer;
 
             m_stdin.m_read.close();
         }

libraries/subprocess.hpp

@@ -66,12 +66,12 @@ void Recorder::start(const std::string& path) {
         }
         std::cout << "video should be done now" << std::endl;
         if (!m_include_audio || !std::filesystem::exists(song_file)) return;
-        char buffer[MAX_PATH];
-        if (!GetTempFileNameA(std::filesystem::temp_directory_path().string().c_str(), "rec", 0, buffer)) {
+        wchar_t buffer[MAX_PATH];
+        if (!GetTempFileNameW(widen(std::filesystem::temp_directory_path().string()).c_str(), L"rec", 0, buffer)) {
             std::cout << "error getting temp file" << std::endl;
             return;
         }
-        auto temp_path = std::string(buffer) + "." + std::filesystem::path(path).filename().string();
+        auto temp_path = narrow(buffer) + "." + std::filesystem::path(path).filename().string();
         std::filesystem::rename(buffer, temp_path);
         auto total_time = m_last_frame_t; // 1 frame too short?
         {
@@ -92,8 +92,8 @@ void Recorder::start(const std::string& path) {
                 return;
             }
         }
-        std::filesystem::remove(path);
-        std::filesystem::rename(temp_path, path);
+        std::filesystem::remove(widen(path));
+        std::filesystem::rename(temp_path, widen(path));
         std::cout << "video + audio should be done now!" << std::endl;
     }).detach();
 }

src/recorder.cpp

@@ -49,7 +49,7 @@ constexpr const char* format_magic = "RPLY";
 
 void Replay::save(const std::string& path) {
 	std::ofstream file;
-	file.open(path, std::ios::binary | std::ios::out);
+	file.open(widen(path), std::ios::binary | std::ios::out);
 	file << format_magic << format_ver << type;
 	bin_write(file, fps);
 	for (const auto& action : actions) {
@@ -66,7 +66,7 @@ void Replay::save(const std::string& path) {
 Replay Replay::load(const std::string& path)  {
 	Replay replay(0, ReplayType::XPOS);
 	std::ifstream file;
-	file.open(path, std::ios::binary | std::ios::in);
+	file.open(widen(path), std::ios::binary | std::ios::in);
 
 	file.seekg(0, std::ios::end);
 	size_t file_size = static_cast<size_t>(file.tellg());

src/replay.cpp

@@ -0,0 +1,21 @@
+#include "utils.hpp"
+
+std::string narrow(const wchar_t* str) {
+    auto size = WideCharToMultiByte(CP_UTF8, 0, str, -1, nullptr, 0, nullptr, nullptr);
+    if (size <= 0) { /* fuck */ }
+    auto buffer = new char[size];
+    WideCharToMultiByte(CP_UTF8, 0, str, -1, buffer, size, nullptr, nullptr);
+    std::string result(buffer, size_t(size) - 1);
+    delete[] buffer;
+    return result;
+}
+
+std::wstring widen(const char* str) {
+    auto size = MultiByteToWideChar(CP_UTF8, 0, str, -1, nullptr, 0);
+    if (size <= 0) { /* fuck */ }
+    auto buffer = new wchar_t[size];
+    MultiByteToWideChar(CP_UTF8, 0, str, -1, buffer, size);
+    std::wstring result(buffer, size_t(size) - 1);
+    delete[] buffer;
+    return result;
+}

src/utils.cpp

@@ -25,3 +25,8 @@ template <typename R, typename U>
 R& from_offset(U base, int offset) {
     return *cast<R*>(cast<intptr_t>(base) + offset);
 }
+
+std::string narrow(const wchar_t* str);
+inline auto narrow(const std::wstring& str) { return narrow(str.c_str()); }
+std::wstring widen(const char* str);
+inline auto widen(const std::string& str) { return widen(str.c_str()); }