From d8b98e4906232d5d1fa2d20d1005d0519d96d67f Mon Sep 17 00:00:00 2001
From: Yukino Song <nutosservice@gmail.com>
Date: Sun, 6 Oct 2024 05:28:57 +0800
Subject: [PATCH] Correctly log config values

---
 src/config.cpp                 | 5 +++++
 src/platform/windows/utils.cpp | 5 +++++
 src/platform/windows/utils.h   | 5 +----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index d8e93a46..949551ce 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -28,6 +28,7 @@
 
 #ifdef _WIN32
   #include <shellapi.h>
+  #include "platform/windows/utils.h"
 #endif
 
 #ifndef __APPLE__
@@ -979,7 +980,11 @@ namespace config {
     }
 
     for (auto &[name, val] : vars) {
+    #ifdef _WIN32
+      std::cout << "["sv << name << "] -- ["sv << convertUtf8ToCurrentCodepage(val) << ']' << std::endl;
+    #else
       std::cout << "["sv << name << "] -- ["sv << val << ']' << std::endl;
+    #endif
     }
 
     bool_f(vars, "headless_mode", video.headless_mode);
diff --git a/src/platform/windows/utils.cpp b/src/platform/windows/utils.cpp
index 150c72c1..281229ce 100644
--- a/src/platform/windows/utils.cpp
+++ b/src/platform/windows/utils.cpp
@@ -1,5 +1,10 @@
 #include "utils.h"
 
+#include <SetupApi.h>
+
+#include "src/utility.h"
+#include "src/logging.h"
+
 std::wstring acpToUtf16(const std::string& origStr) {
 	auto acp = GetACP();
 
diff --git a/src/platform/windows/utils.h b/src/platform/windows/utils.h
index 6f2be42a..406c1c2e 100644
--- a/src/platform/windows/utils.h
+++ b/src/platform/windows/utils.h
@@ -1,14 +1,11 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include <windows.h>
-#include <SetupApi.h>
 #include <wtsapi32.h>
 
-#include "src/utility.h"
-#include "src/logging.h"
-
 std::wstring acpToUtf16(const std::string& origStr);
 std::string utf16toAcp(const std::wstring& utf16Str);
 std::string convertUtf8ToCurrentCodepage(const std::string& utf8Str);