From ef3bd0281999f77cc7abe939724ec1873d6b590b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 25 Jan 2024 02:09:14 +0200
Subject: [PATCH] Properly transfer data between apps and applets

---
 src/core/applets/software_keyboard.cpp |  9 ++++++---
 src/core/services/apt.cpp              | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 432d74c6..dfe68b60 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -42,7 +42,7 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem
 	// Get keyboard configuration from the application
 	std::memcpy(&config, &parameters[0], sizeof(config));
 
-	const std::u16string text = u"Pander";
+	const std::u16string text = u"Pand";
 	u32 textAddress = sharedMem.addr;
 	
 	// Copy text to shared memory the app gave us
@@ -55,13 +55,16 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem
 	// Temporarily hardcode the pressed button to be the firs tone
 	switch (config.numButtonsM1) {
 		case SoftwareKeyboardButtonConfig::SingleButton: config.returnCode = SoftwareKeyboardResult::D0Click; break;
-		case SoftwareKeyboardButtonConfig::DualButton: config.returnCode = SoftwareKeyboardResult::D1Click0; break;
-		case SoftwareKeyboardButtonConfig::TripleButton: config.returnCode = SoftwareKeyboardResult::D2Click0; break;
+		case SoftwareKeyboardButtonConfig::DualButton: config.returnCode = SoftwareKeyboardResult::D1Click1; break;
+		case SoftwareKeyboardButtonConfig::TripleButton: config.returnCode = SoftwareKeyboardResult::D2Click2; break;
 		case SoftwareKeyboardButtonConfig::NoButton: config.returnCode = SoftwareKeyboardResult::None; break;
+		default: Helpers::warn("Software keyboard: Invalid button mode specification"); break;
 	}
 
 	config.textOffset = 0;
 	config.textLength = static_cast<u16>(text.size());
+	static_assert(offsetof(SoftwareKeyboardConfig, textOffset) == 324);
+	static_assert(offsetof(SoftwareKeyboardConfig, textLength) == 328);
 
 	if (config.filterFlags & SoftwareKeyboardFilter::Callback) {
 		Helpers::warn("Unimplemented software keyboard profanity callback");
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index f98c1bb5..b475b89d 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -148,9 +148,6 @@ void APTService::startLibraryApplet(u32 messagePointer) {
 	const u32 buffer = mem.read32(messagePointer + 24);
 	log("APT::StartLibraryApplet (app ID = %X)\n", appID);
 
-	mem.write32(messagePointer, IPC::responseHeader(0x16, 1, 0));
-	mem.write32(messagePointer + 4, Result::Success);
-
 	Applets::AppletBase* destApplet = appletManager.getApplet(appID);
 	if (destApplet == nullptr) {
 		Helpers::warn("APT::StartLibraryApplet: Unimplemented dest applet ID");
@@ -301,6 +298,8 @@ void APTService::sendParameter(u32 messagePointer) {
 void APTService::receiveParameter(u32 messagePointer) {
 	const u32 app = mem.read32(messagePointer + 4);
 	const u32 size = mem.read32(messagePointer + 8);
+	// Parameter data pointer is in the thread static buffer, which starts 0x100 bytes after the command buffer
+	const u32 buffer = mem.read32(messagePointer + 0x100 + 4);
 	log("APT::ReceiveParameter(app ID = %X, size = %04X)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::ReceiveParameter with size > 0x1000");
@@ -317,11 +316,18 @@ void APTService::receiveParameter(u32 messagePointer) {
 	mem.write32(messagePointer + 20, 0x10);
 	mem.write32(messagePointer + 24, parameter.object);
 	mem.write32(messagePointer + 28, 0);
+
+	const u32 transferSize = std::min<u32>(size, parameter.data.size());
+	for (u32 i = 0; i < transferSize; i++) {
+		mem.write8(buffer + i, parameter.data[i]);
+	}
 }
 
 void APTService::glanceParameter(u32 messagePointer) {
 	const u32 app = mem.read32(messagePointer + 4);
 	const u32 size = mem.read32(messagePointer + 8);
+	// Parameter data pointer is in the thread static buffer, which starts 0x100 bytes after the command buffer
+	const u32 buffer = mem.read32(messagePointer + 0x100 + 4);
 	log("APT::GlanceParameter(app ID = %X, size = %04X)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::GlanceParameter with size > 0x1000");
@@ -339,6 +345,11 @@ void APTService::glanceParameter(u32 messagePointer) {
 	mem.write32(messagePointer + 20, 0);
 	mem.write32(messagePointer + 24, parameter.object);
 	mem.write32(messagePointer + 28, 0);
+
+	const u32 transferSize = std::min<u32>(size, parameter.data.size());
+	for (u32 i = 0; i < transferSize; i++) {
+		mem.write8(buffer + i, parameter.data[i]);
+	}
 }
 
 void APTService::replySleepQuery(u32 messagePointer) {