Allow optional conversion & eol for OSREPORT

Source/Core/Common/Logging/LogManager.cpp

@@ -32,6 +32,8 @@ const Config::Info<bool> LOGGER_WRITE_TO_WINDOW{
     {Config::System::Logger, "Options", "WriteToWindow"}, true};
 const Config::Info<LogLevel> LOGGER_VERBOSITY{{Config::System::Logger, "Options", "Verbosity"},
                                               LogLevel::LNOTICE};
+const Config::Info<bool> LOGGER_CONVERT_FROM_SJIS{
+    {Config::System::Logger, "Options", "ConvertFromSJIS"}, true};
 
 class FileLogListener : public LogListener
 {
@@ -167,7 +169,8 @@ LogManager::LogManager()
     container.m_enable = Config::Get(
         Config::Info<bool>{{Config::System::Logger, "Logs", container.m_short_name}, false});
   }
-
+  m_convert_sjis =
+      Config::Get(Config::Info<bool>{{Config::System::Logger, "Options", "ConvertFromSJIS"}, true});
   m_path_cutoff_point = DeterminePathCutOffPoint();
 }
 
@@ -195,6 +198,8 @@ void LogManager::SaveSettings()
     Config::SetBaseOrCurrent(info, container.m_enable);
   }
 
+  Config::SetBaseOrCurrent(LOGGER_CONVERT_FROM_SJIS, IsEnabledConvertSJIS());
+
   Config::Save();
 }
 

Source/Core/Common/Logging/LogManager.h

@@ -48,6 +48,9 @@ class LogManager
   void SetEnable(LogType type, bool enable);
   bool IsEnabled(LogType type, LogLevel level = LogLevel::LNOTICE) const;
 
+  void SetEnableConvertSJIS(bool enable) { m_convert_sjis = enable; }
+  bool IsEnabledConvertSJIS() const { return m_convert_sjis; }
+
   std::map<std::string, std::string> GetLogTypes();
 
   const char* GetShortName(LogType type) const;
@@ -67,6 +70,8 @@ class LogManager
     bool m_enable = false;
   };
 
+  bool m_convert_sjis = true;
+
   LogManager();
   ~LogManager();
 

Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp

@@ -308,7 +308,7 @@ void CEXIIPL::TransferByte(u8& data)
 
         if (data == '\r')
         {
-          NOTICE_LOG_FMT(OSREPORT, "{}", SHIFTJISToUTF8(m_buffer));
+          NOTICE_LOG_FMT(OSREPORT, "{}", m_osreport_sjis ? SHIFTJISToUTF8(m_buffer) : m_buffer);
           m_buffer.clear();
         }
       }

Source/Core/Core/HW/EXI/EXI_DeviceIPL.h

@@ -36,6 +36,8 @@ class CEXIIPL : public IEXIDevice
 private:
   std::unique_ptr<u8[]> m_rom;
 
+  bool m_osreport_sjis = false;
+
   // TODO these ranges are highly suspect
   enum
   {

Source/Core/DolphinQt/Config/LogConfigWidget.cpp

@@ -55,6 +55,7 @@ void LogConfigWidget::CreateWidgets()
   m_out_file = new QCheckBox(tr("Write to File"));
   m_out_console = new QCheckBox(tr("Write to Console"));
   m_out_window = new QCheckBox(tr("Write to Window"));
+  m_convert_sjis = new QCheckBox(tr("Convert from Shift JIS"));
 
   auto* types = new QGroupBox(tr("Log Types"));
   auto* types_layout = new QVBoxLayout;
@@ -84,6 +85,7 @@ void LogConfigWidget::CreateWidgets()
   outputs_layout->addWidget(m_out_file);
   outputs_layout->addWidget(m_out_console);
   outputs_layout->addWidget(m_out_window);
+  outputs_layout->addWidget(m_convert_sjis);
 
   layout->addWidget(types);
   types_layout->addWidget(m_types_toggle);
@@ -107,6 +109,7 @@ void LogConfigWidget::ConnectWidgets()
   connect(m_out_file, &QCheckBox::toggled, this, &LogConfigWidget::SaveSettings);
   connect(m_out_console, &QCheckBox::toggled, this, &LogConfigWidget::SaveSettings);
   connect(m_out_window, &QCheckBox::toggled, this, &LogConfigWidget::SaveSettings);
+  connect(m_convert_sjis, &QCheckBox::toggled, this, &LogConfigWidget::SaveSettings);
 
   connect(m_types_toggle, &QPushButton::clicked, [this] {
     m_all_enabled = !m_all_enabled;
@@ -162,6 +165,7 @@ void LogConfigWidget::LoadSettings()
 
     m_types_list->item(i)->setCheckState(log_enabled ? Qt::Checked : Qt::Unchecked);
   }
+  m_convert_sjis->setCheckState(m_convert_sjis ? Qt::Checked : Qt::Unchecked);
 }
 
 void LogConfigWidget::SaveSettings()
@@ -213,6 +217,11 @@ void LogConfigWidget::SaveSettings()
     if (enabled != was_enabled)
       log_manager->SetEnable(type, enabled);
   }
+  const bool enabled = m_convert_sjis->checkState() == Qt::Checked;
+  bool was_enabled = log_manager->IsEnabledConvertSJIS();
+
+  if (enabled != was_enabled)
+    log_manager->SetEnableConvertSJIS(enabled);
 }
 
 void LogConfigWidget::closeEvent(QCloseEvent*)

Source/Core/DolphinQt/Config/LogConfigWidget.h

@@ -37,6 +37,8 @@ class LogConfigWidget final : public QDockWidget
   QCheckBox* m_out_file;
   QCheckBox* m_out_console;
   QCheckBox* m_out_window;
+  QCheckBox* m_convert_sjis;
+
   QPushButton* m_types_toggle;
   QListWidget* m_types_list;