Merge f5e94b985b into 349b1f38aa

Updating the aroma APIs does not demand a major version bump imho
Users are always expected to be on latest aroma anyway, v3 would be saved for like. Stroopwafel

src/config.cpp

@@ -100,6 +100,28 @@ constexpr config_strings get_config_strings(nn::swkbd::LanguageType language) {
                 .restart_to_apply_action = "Neustarten zum Anwenden",
                 .need_menu_action = "Nur vom Wii U-Menü aus",
             };
+        case nn::swkbd::LanguageType::Simplified_Chinese:
+            return {
+                .plugin_name = "Inkay",
+                .network_category = "选择网络",
+                .connect_to_network_setting = "连接到Pretendo network",
+                .other_category = "其他设置",
+                .reset_wwp_setting = "重置Wara Wara Plaza",
+                .press_a_action = "请按 A",
+                .restart_to_apply_action = "重启以应用设置",
+                .need_menu_action = "仅来自WiiU Menu"
+            };
+        case nn::swkbd::LanguageType::traditional_Chinese:
+            return {
+                .plugin_name = "Inkay",
+                .network_category = "選擇網路",
+                .connect_to_network_setting = "連接到Pretendo network",
+                .other_category = "其他設定",
+                .reset_wwp_setting = "重置Wara Wara Plaza",
+                .press_a_action = "請按 A",
+                .restart_to_apply_action = "重啓以套用設定",
+                .need_menu_action = "僅來自WiiU Menu"
+            };
     }
 }
 
@@ -168,7 +190,6 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa
     // create root config category
     WUPSConfigCategory root = WUPSConfigCategory(rootHandle);
 
-	try {
     auto patching_cat = WUPSConfigCategory::Create(strings.network_category);
 
     //                                                  config id                   display name            default        current value             changed callback
@@ -198,18 +219,15 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa
     WUPSConfigItemHandle unregisterTasksItem;
     WUPSConfigAPIStatus err;
     if ((err = WUPSConfigAPI_Item_Create(unregisterTasksItemOptions, &unregisterTasksItem)) != WUPSCONFIG_API_RESULT_SUCCESS) {
-            throw std::runtime_error(std::string("Failed to create config item: ").append(WUPSConfigAPI_GetStatusStr(err)));
+        DEBUG_FUNCTION_LINE("Creating config menu failed: %s", WUPSConfigAPI_GetStatusStr(err));
+        return WUPSCONFIG_API_CALLBACK_RESULT_ERROR;
     }
     if ((err = WUPSConfigAPI_Category_AddItem(other_cat.getHandle(), unregisterTasksItem)) != WUPSCONFIG_API_RESULT_SUCCESS) {
-            throw std::runtime_error(std::string("Failed to add config item: ").append(WUPSConfigAPI_GetStatusStr(err)));
+        DEBUG_FUNCTION_LINE("Creating config menu failed: %s", WUPSConfigAPI_GetStatusStr(err));
+        return WUPSCONFIG_API_CALLBACK_RESULT_ERROR;
     }
 
     root.add(std::move(other_cat));
-	}
-	catch (std::exception &e) {
-        DEBUG_FUNCTION_LINE("Creating config menu failed: %s", e.what());
-        return WUPSCONFIG_API_CALLBACK_RESULT_ERROR;
-    }
 
     return WUPSCONFIG_API_CALLBACK_RESULT_SUCCESS;
 }

src/config.h

@@ -22,14 +22,14 @@ public:
 };
 
 struct config_strings {
-	const char* plugin_name;
+    const char *plugin_name;
-	const char* network_category;
+    const char *network_category;
-	const char* connect_to_network_setting;
+    const char *connect_to_network_setting;
-	const char* other_category;
+    const char *other_category;
-	const char* reset_wwp_setting;
+    const char *reset_wwp_setting;
-	const char* press_a_action;
+    const char *press_a_action;
-	const char* restart_to_apply_action;
+    const char *restart_to_apply_action;
-	const char* need_menu_action;
+    const char *need_menu_action;
 };
 
 #endif //INKAY_CONFIG_H

src/iosu_url_patches.h

@@ -1,8 +1,7 @@
 #ifndef _PATCHER_H
 #define _PATCHER_H
 
-typedef struct URL_Patch
+typedef struct URL_Patch {
-{
     unsigned int address;
     char url[80];
 } URL_Patch;

src/main.cpp

@@ -49,7 +49,7 @@
 
 #include <gx2/surface.h>
 
-#define INKAY_VERSION "v3.0"
+#define INKAY_VERSION "v2.5.0"
 
 /**
     Mandatory plugin information.
@@ -62,6 +62,7 @@ WUPS_PLUGIN_AUTHOR("Pretendo contributors");
 WUPS_PLUGIN_LICENSE("ISC");
 
 WUPS_USE_STORAGE("inkay");
+
 WUPS_USE_WUT_DEVOPTAB();
 
 #include <kernel/kernel.h>
@@ -71,25 +72,24 @@ WUPS_USE_WUT_DEVOPTAB();
 #include "utils/sysconfig.h"
 
 //thanks @Gary#4139 :p
-static void write_string(uint32_t addr, const char* str)
+static void write_string(uint32_t addr, const char *str) {
-{
     int len = strlen(str) + 1;
     int remaining = len % 4;
     int num = len - remaining;
 
     for (int i = 0; i < (num / 4); i++) {
-        Mocha_IOSUKernelWrite32(addr + i * 4, *(uint32_t*)(str + i * 4));
+        Mocha_IOSUKernelWrite32(addr + i * 4, *(uint32_t * )(str + i * 4));
     }
 
     if (remaining > 0) {
         uint8_t buf[4];
-        Mocha_IOSUKernelRead32(addr + num, (uint32_t*)&buf);
+        Mocha_IOSUKernelRead32(addr + num, (uint32_t * ) & buf);
 
         for (int i = 0; i < remaining; i++) {
             buf[i] = *(str + num + i);
         }
 
-        Mocha_IOSUKernelWrite32(addr + num, *(uint32_t*)&buf);
+        Mocha_IOSUKernelWrite32(addr + num, *(uint32_t * ) & buf);
     }
 }
 
@@ -97,7 +97,7 @@ static bool is555(MCPSystemVersion version) {
     return (version.major == 5) && (version.minor == 5) && (version.patch >= 5);
 }
 
-static const char * get_nintendo_network_message() {
+static const char *get_nintendo_network_message() {
     // TL note: "Nintendo Network" is a proper noun - "Network" is part of the name
     // TL note: "Using" instead of "Connected" is deliberate - we don't know if a successful connection exists, we are
     // only specifying what we'll *attempt* to connect to
@@ -113,9 +113,14 @@ static const char * get_nintendo_network_message() {
             return "Usando Nintendo Network";
         case nn::swkbd::LanguageType::German:
             return "Nutze Nintendo Network";
+        case nn::swkbd::LanguageType::Simplified_Chinese:
+            return "使用 Nintendo Network";
+        case nn::swkbd::LanguageType::traditional_Chinese:
+            return "使用 Nintendo Network";
     }
 }
-static const char * get_pretendo_message() {
+
+static const char *get_pretendo_message() {
     // TL note: "Pretendo Network" is also a proper noun - though "Pretendo" alone can refer to us as a project
     // TL note: "Using" instead of "Connected" is deliberate - we don't know if a successful connection exists, we are
     // only specifying what we'll *attempt* to connect to
@@ -131,6 +136,10 @@ static const char * get_pretendo_message() {
             return "Usando Pretendo Network";
         case nn::swkbd::LanguageType::German:
             return "Nutze Pretendo Network";
+        case nn::swkbd::LanguageType::Simplified_Chinese:
+            return "使用 Pretendo Network";
+        case nn::swkbd::LanguageType::traditional_Chinese:
+            return "使用 Pretendo Network";
     }
 }
 
@@ -169,19 +178,17 @@ INITIALIZE_PLUGIN() {
     if (Config::connect_to_network) {
         if (is555(os_version)) {
             Mocha_IOSUKernelWrite32(0xE1019F78, 0xE3A00001); // mov r0, #1
-        }
+        } else {
-        else {
             Mocha_IOSUKernelWrite32(0xE1019E84, 0xE3A00001); // mov r0, #1
         }
 
-        for (const auto& patch : url_patches) {
+        for (const auto &patch: url_patches) {
             write_string(patch.address, patch.url);
         }
         DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches applied successfully.");
 
         ShowNotification(get_pretendo_message());
-    }
+    } else {
-    else {
         DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches skipped.");
 
         ShowNotification(get_nintendo_network_message());
@@ -214,6 +221,5 @@ ON_APPLICATION_START() {
 }
 
 ON_APPLICATION_ENDS() {
-	// commented because it doesnt really unload inkay
+
-	//DEBUG_FUNCTION_LINE_VERBOSE("Unloading Inkay...\n");
 }

src/utils/replace_mem.cpp

@@ -23,13 +23,14 @@
 #include <coreinit/memorymap.h>
 #include <algorithm>
 
-bool replace(uint32_t start, uint32_t size, const char* original_val, size_t original_val_sz, const char* new_val, size_t new_val_sz) {
+bool replace(uint32_t start, uint32_t size, const char *original_val, size_t original_val_sz, const char *new_val,
+             size_t new_val_sz) {
     for (uint32_t addr = start; addr < start + size - original_val_sz; addr++) {
-        int ret = memcmp(original_val, (void*)addr, original_val_sz);
+        int ret = memcmp(original_val, (void *) addr, original_val_sz);
         if (ret == 0) {
-            DEBUG_FUNCTION_LINE_VERBOSE("found str @%08x: %s", addr, (const char*)addr);
+            DEBUG_FUNCTION_LINE_VERBOSE("found str @%08x: %s", addr, (const char *) addr);
-            KernelCopyData(OSEffectiveToPhysical(addr), OSEffectiveToPhysical((uint32_t)new_val), new_val_sz);
+            KernelCopyData(OSEffectiveToPhysical(addr), OSEffectiveToPhysical((uint32_t) new_val), new_val_sz);
-            DEBUG_FUNCTION_LINE_VERBOSE("new str   @%08x: %s", addr, (const char*)addr);
+            DEBUG_FUNCTION_LINE_VERBOSE("new str   @%08x: %s", addr, (const char *) addr);
             return true;
         }
     }
@@ -39,24 +40,24 @@ bool replace(uint32_t start, uint32_t size, const char* original_val, size_t ori
 
 void replaceBulk(uint32_t start, uint32_t size, std::span<const replacement> replacements) {
     // work out the biggest input replacement
-    auto max_sz = std::max_element(replacements.begin(), replacements.end(), [](auto& a, auto& b) {
+    auto max_sz = std::max_element(replacements.begin(), replacements.end(), [](auto &a, auto &b) {
         return a.orig.size_bytes() < b.orig.size_bytes();
     })->orig.size_bytes();
 
     int counts[replacements.size()];
-    for (auto& c : counts) {
+    for (auto &c: counts) {
         c = 0;
     }
 
     for (uint32_t addr = start; addr < start + size - max_sz; addr++) {
-        for (int i = 0; i < (int)replacements.size(); i++) {
+        for (int i = 0; i < (int) replacements.size(); i++) {
-            const auto& replacement = replacements[i];
+            const auto &replacement = replacements[i];
 
-            int ret = memcmp((void*)addr, replacement.orig.data(), replacement.orig.size_bytes());
+            int ret = memcmp((void *) addr, replacement.orig.data(), replacement.orig.size_bytes());
             if (ret == 0) {
                 KernelCopyData(
                         OSEffectiveToPhysical(addr),
-                        OSEffectiveToPhysical((uint32_t)replacement.repl.data()),
+                        OSEffectiveToPhysical((uint32_t) replacement.repl.data()),
                         replacement.repl.size_bytes()
                 );
                 counts[i]++;
@@ -64,7 +65,7 @@ void replaceBulk(uint32_t start, uint32_t size, std::span<const replacement> rep
             }
         }
     }
-    for (auto c : counts) {
+    for (auto c: counts) {
         DEBUG_FUNCTION_LINE("replaced %d times", c);
     }
 }

src/utils/replace_mem.h

@@ -18,7 +18,8 @@
 #include <cstddef>
 #include <span>
 
-bool replace(uint32_t start, uint32_t size, const char* original_val, size_t original_val_sz, const char* new_val, size_t new_val_sz);
+bool replace(uint32_t start, uint32_t size, const char *original_val, size_t original_val_sz, const char *new_val,
+             size_t new_val_sz);
 
 struct replacement {
     std::span<const uint8_t> orig;

src/utils/sysconfig.cpp

@@ -24,7 +24,7 @@
 #include <optional>
 
 nn::swkbd::LanguageType get_system_language() {
-    static std::optional<nn::swkbd::LanguageType> cached_language{};
+    static std::optional <nn::swkbd::LanguageType> cached_language{};
     if (cached_language) return *cached_language;
 
     UCHandle handle = UCOpen();

src/wut_extra.h

@@ -26,15 +26,15 @@ namespace nn::boss {
 extern "C" uint32_t Initialize__Q2_2nn4bossFv();
 extern "C" uint32_t Finalize__Q2_2nn4bossFv();
 
-extern "C" void __ct__Q3_2nn4boss4TaskFv(nn::boss::Task* task);
+extern "C" void __ct__Q3_2nn4boss4TaskFv(nn::boss::Task *task);
-extern "C" uint32_t Initialize__Q3_2nn4boss4TaskFPCcUi(nn::boss::Task* task, char const *, unsigned int);
+extern "C" uint32_t Initialize__Q3_2nn4boss4TaskFPCcUi(nn::boss::Task *task, char const *, unsigned int);
-extern "C" uint32_t Unregister__Q3_2nn4boss4TaskFv(nn::boss::Task* task);
+extern "C" uint32_t Unregister__Q3_2nn4boss4TaskFv(nn::boss::Task *task);
-extern "C" void __dt__Q3_2nn4boss4TaskFv(nn::boss::Task* task);
+extern "C" void __dt__Q3_2nn4boss4TaskFv(nn::boss::Task *task);
-extern "C" uint32_t StartScheduling__Q3_2nn4boss4TaskFb(nn::boss::Task* task, bool queueTaskOnCall);
+extern "C" uint32_t StartScheduling__Q3_2nn4boss4TaskFb(nn::boss::Task *task, bool queueTaskOnCall);
-extern "C" uint32_t GetState__Q3_2nn4boss4TaskCFPUi(nn::boss::Task* task, uint32_t *outExecCount);
+extern "C" uint32_t GetState__Q3_2nn4boss4TaskCFPUi(nn::boss::Task *task, uint32_t *outExecCount);
-extern "C" uint32_t Run__Q3_2nn4boss4TaskFb(nn::boss::Task* task, bool unk);
+extern "C" uint32_t Run__Q3_2nn4boss4TaskFb(nn::boss::Task *task, bool unk);
-extern "C" uint32_t UpdateIntervalSec__Q3_2nn4boss4TaskFUi(nn::boss::Task* task, uint32_t seconds);
+extern "C" uint32_t UpdateIntervalSec__Q3_2nn4boss4TaskFUi(nn::boss::Task *task, uint32_t seconds);
-extern "C" bool IsRegistered__Q3_2nn4boss4TaskCFv(nn::boss::Task* task);
+extern "C" bool IsRegistered__Q3_2nn4boss4TaskCFv(nn::boss::Task *task);
 
 #ifdef __cplusplus
 }