From afdbef1a81ff199029ac99e64e4c240c8f697570 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Wed, 18 Jan 2023 21:39:13 +0100
Subject: [PATCH] cellOskDialog: improve dictionary functions

---
 rpcs3/Emu/Cell/Modules/cellOskDialog.cpp | 69 +++++++++++++++++-------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
index 1ca32b6f4d..a7afd43905 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -10,6 +10,7 @@
 #include "cellSysutil.h"
 #include "cellOskDialog.h"
 #include "cellMsgDialog.h"
+#include "cellImeJp.h"
 
 #include "util/init_mutex.hpp"
 
@@ -855,8 +856,6 @@ error_code cellOskDialogAddSupportLanguage(u32 supportLanguage)
 {
 	cellOskDialog.warning("cellOskDialogAddSupportLanguage(supportLanguage=0x%x)", supportLanguage);
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().supported_languages = supportLanguage;
 
 	return CELL_OK;
@@ -866,8 +865,6 @@ error_code cellOskDialogSetLayoutMode(s32 layoutMode)
 {
 	cellOskDialog.warning("cellOskDialogSetLayoutMode(layoutMode=0x%x)", layoutMode);
 
-	// TODO: error checks
-
 	auto& osk = g_fxo->get<osk_info>();
 	osk.layout_mode = layoutMode;
 
@@ -953,6 +950,26 @@ error_code cellOskDialogExtRegisterKeyboardEventHookCallbackEx(u16 hookEventMode
 error_code cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr<char> filePath)
 {
 	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=**0x%0x)", filePath);
+
+	std::vector<std::string> paths;
+
+	if (filePath)
+	{
+		for (u32 i = 0; i < 4; i++)
+		{
+			if (!filePath[i])
+			{
+				break;
+			}
+
+			std::array<char, CELL_IMEJP_DIC_PATH_MAXLENGTH + 1> path{};
+			std::memcpy(path.data(), filePath[i].get_ptr(), CELL_IMEJP_DIC_PATH_MAXLENGTH);
+			paths.push_back(path.data());
+		}
+	}
+
+	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary: got %d dictionaries:\n%s", paths.size(), fmt::merge(paths, "\n"));
+
 	return CELL_OK;
 }
 
@@ -960,8 +977,6 @@ error_code cellOskDialogExtEnableClipboard()
 {
 	cellOskDialog.todo("cellOskDialogExtEnableClipboard()");
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().clipboard_enabled = true;
 
 	// TODO: implement copy paste
@@ -986,9 +1001,37 @@ error_code cellOskDialogExtSendFinishMessage(u32 /*CellOskDialogFinishReason*/ f
 	return CELL_OK;
 }
 
-error_code cellOskDialogExtAddOptionDictionary(vm::cptr<CellOskDialogImeDictionaryInfo> dictionaryInfo)
+error_code cellOskDialogExtAddOptionDictionary(vm::cpptr<CellOskDialogImeDictionaryInfo> dictionaryInfo)
 {
 	cellOskDialog.todo("cellOskDialogExtAddOptionDictionary(dictionaryInfo=*0x%x)", dictionaryInfo);
+
+	if (!dictionaryInfo)
+	{
+		return CELL_OSKDIALOG_ERROR_PARAM;
+	}
+
+	std::vector<std::pair<u32, std::string>> paths; // language and path
+
+	for (u32 i = 0; i < 10; i++)
+	{
+		if (!dictionaryInfo[i] || !dictionaryInfo[i]->dictionaryPath)
+		{
+			break;
+		}
+
+		std::array<char, CELL_IMEJP_DIC_PATH_MAXLENGTH + 1> path{};
+		std::memcpy(path.data(), dictionaryInfo[i]->dictionaryPath.get_ptr(), CELL_IMEJP_DIC_PATH_MAXLENGTH);
+		paths.push_back({ dictionaryInfo[i]->targetLanguage, path.data() });
+	}
+
+	std::vector<std::string> msgs;
+	for (const auto& entry : paths)
+	{
+		msgs.push_back(fmt::format("languages=0x%x, path='%s'", entry.first, entry.second));
+	}
+
+	cellOskDialog.todo("cellOskDialogExtAddOptionDictionary: got %d dictionaries:\n%s", msgs.size(), fmt::merge(msgs, "\n"));
+
 	return CELL_OK;
 }
 
@@ -1010,8 +1053,6 @@ error_code cellOskDialogExtInputDeviceLock()
 {
 	cellOskDialog.warning("cellOskDialogExtInputDeviceLock()");
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().lock_ext_input = true;
 
 	if (const auto osk = _get_osk_dialog(false))
@@ -1026,8 +1067,6 @@ error_code cellOskDialogExtInputDeviceUnlock()
 {
 	cellOskDialog.warning("cellOskDialogExtInputDeviceUnlock()");
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().lock_ext_input = false;
 
 	if (const auto osk = _get_osk_dialog(false))
@@ -1098,8 +1137,6 @@ error_code cellOskDialogExtSetPointerEnable(b8 enable)
 {
 	cellOskDialog.warning("cellOskDialogExtSetPointerEnable(enable=%d)", enable);
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().pointer_enabled = enable;
 	g_osk_pointer_enabled = enable;
 
@@ -1110,8 +1147,6 @@ error_code cellOskDialogExtUpdatePointerDisplayPos(vm::cptr<CellOskDialogPoint>
 {
 	cellOskDialog.warning("cellOskDialogExtUpdatePointerDisplayPos(pos=0x%x, posX=%f, posY=%f)", pos->x, pos->y);
 
-	// TODO: error checks
-
 	if (pos)
 	{
 		g_fxo->get<osk_info>().pointer_pos = *pos;
@@ -1126,8 +1161,6 @@ error_code cellOskDialogExtEnableHalfByteKana()
 {
 	cellOskDialog.todo("cellOskDialogExtEnableHalfByteKana()");
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().half_byte_kana_enabled = true;
 
 	// TODO: use new value in osk
@@ -1139,8 +1172,6 @@ error_code cellOskDialogExtDisableHalfByteKana()
 {
 	cellOskDialog.todo("cellOskDialogExtDisableHalfByteKana()");
 
-	// TODO: error checks
-
 	g_fxo->get<osk_info>().half_byte_kana_enabled = false;
 
 	// TODO: use new value in osk