summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/ns/pl_u.cpp164
-rw-r--r--src/core/hle/service/ns/pl_u.h3
2 files changed, 117 insertions, 50 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index c91cfa36e..7dcdb4a07 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -6,6 +6,13 @@
#include <cstring>
#include <vector>
+#include <FontChineseSimplified.h>
+#include <FontChineseTraditional.h>
+#include <FontExtendedChineseSimplified.h>
+#include <FontKorean.h>
+#include <FontNintendoExtended.h>
+#include <FontStandard.h>
+
#include "common/assert.h"
#include "common/common_paths.h"
#include "common/common_types.h"
@@ -17,7 +24,6 @@
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/romfs.h"
-#include "core/file_sys/system_archive/system_archive.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/filesystem/filesystem.h"
@@ -88,16 +94,15 @@ static void DecryptSharedFont(const std::vector<u32>& input, Kernel::PhysicalMem
offset += transformed_font.size() * sizeof(u32);
}
-void EncryptSharedFont(const std::vector<u8>& input, Kernel::PhysicalMemory& output) {
- ASSERT_MSG(input.size() * sizeof(u32) < SHARED_FONT_MEM_SIZE, "Shared fonts exceeds 17mb!");
-
- const auto key = Common::swap32(EXPECTED_RESULT ^ EXPECTED_MAGIC);
- std::vector<u32> transformed_font(input.size() + 2);
- transformed_font[0] = Common::swap32(EXPECTED_MAGIC);
- transformed_font[1] = Common::swap32(input.size() * sizeof(u32)) ^ key;
- std::transform(input.begin(), input.end(), transformed_font.begin() + 2,
- [key](u32 in) { return in ^ key; });
- std::memcpy(output.data(), transformed_font.data(), transformed_font.size() * sizeof(u32));
+static void EncryptSharedFont(const std::vector<u8>& input, Kernel::PhysicalMemory& output,
+ std::size_t& offset) {
+ ASSERT_MSG(offset + input.size() + 8 < SHARED_FONT_MEM_SIZE, "Shared fonts exceeds 17mb!");
+ const u32 KEY = EXPECTED_MAGIC ^ EXPECTED_RESULT;
+ std::memcpy(output.data() + offset, &EXPECTED_RESULT, sizeof(u32)); // Magic header
+ const u32 ENC_SIZE = static_cast<u32>(input.size()) ^ KEY;
+ std::memcpy(output.data() + offset + sizeof(u32), &ENC_SIZE, sizeof(u32));
+ std::memcpy(output.data() + offset + (sizeof(u32) * 2), input.data(), input.size());
+ offset += input.size() + (sizeof(u32) * 2);
}
// Helper function to make BuildSharedFontsRawRegions a bit nicer
@@ -163,49 +168,114 @@ PL_U::PL_U(Core::System& system)
// Attempt to load shared font data from disk
const auto* nand = fsc.GetSystemNANDContents();
std::size_t offset = 0;
- // Rebuild shared fonts from data ncas or synthesize
-
- impl->shared_font = std::make_shared<Kernel::PhysicalMemory>(SHARED_FONT_MEM_SIZE);
- for (auto font : SHARED_FONTS) {
- FileSys::VirtualFile romfs;
- const auto nca =
- nand->GetEntry(static_cast<u64>(font.first), FileSys::ContentRecordType::Data);
- if (nca) {
- romfs = nca->GetRomFS();
+ // Rebuild shared fonts from data ncas
+ if (nand->HasEntry(static_cast<u64>(FontArchives::Standard),
+ FileSys::ContentRecordType::Data)) {
+ impl->shared_font = std::make_shared<Kernel::PhysicalMemory>(SHARED_FONT_MEM_SIZE);
+ for (auto font : SHARED_FONTS) {
+ const auto nca =
+ nand->GetEntry(static_cast<u64>(font.first), FileSys::ContentRecordType::Data);
+ if (!nca) {
+ LOG_ERROR(Service_NS, "Failed to find {:016X}! Skipping",
+ static_cast<u64>(font.first));
+ continue;
+ }
+ const auto romfs = nca->GetRomFS();
+ if (!romfs) {
+ LOG_ERROR(Service_NS, "{:016X} has no RomFS! Skipping",
+ static_cast<u64>(font.first));
+ continue;
+ }
+ const auto extracted_romfs = FileSys::ExtractRomFS(romfs);
+ if (!extracted_romfs) {
+ LOG_ERROR(Service_NS, "Failed to extract RomFS for {:016X}! Skipping",
+ static_cast<u64>(font.first));
+ continue;
+ }
+ const auto font_fp = extracted_romfs->GetFile(font.second);
+ if (!font_fp) {
+ LOG_ERROR(Service_NS, "{:016X} has no file \"{}\"! Skipping",
+ static_cast<u64>(font.first), font.second);
+ continue;
+ }
+ std::vector<u32> font_data_u32(font_fp->GetSize() / sizeof(u32));
+ font_fp->ReadBytes<u32>(font_data_u32.data(), font_fp->GetSize());
+ // We need to be BigEndian as u32s for the xor encryption
+ std::transform(font_data_u32.begin(), font_data_u32.end(), font_data_u32.begin(),
+ Common::swap32);
+ FontRegion region{
+ static_cast<u32>(offset + 8),
+ static_cast<u32>((font_data_u32.size() * sizeof(u32)) -
+ 8)}; // Font offset and size do not account for the header
+ DecryptSharedFont(font_data_u32, *impl->shared_font, offset);
+ impl->shared_font_regions.push_back(region);
}
- if (!romfs) {
- romfs = FileSys::SystemArchive::SynthesizeSystemArchive(static_cast<u64>(font.first));
- }
+ } else {
+ impl->shared_font = std::make_shared<Kernel::PhysicalMemory>(
+ SHARED_FONT_MEM_SIZE); // Shared memory needs to always be allocated and a fixed size
+
+ const std::string user_path = FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir);
+ const std::string filepath{user_path + SHARED_FONT};
- if (!romfs) {
- LOG_ERROR(Service_NS, "Failed to find or synthesize {:016X}! Skipping",
- static_cast<u64>(font.first));
- continue;
+ // Create path if not already created
+ if (!FileUtil::CreateFullPath(filepath)) {
+ LOG_ERROR(Service_NS, "Failed to create sharedfonts path \"{}\"!", filepath);
+ return;
}
- const auto extracted_romfs = FileSys::ExtractRomFS(romfs);
- if (!extracted_romfs) {
- LOG_ERROR(Service_NS, "Failed to extract RomFS for {:016X}! Skipping",
- static_cast<u64>(font.first));
- continue;
+ bool using_ttf = false;
+ for (const char* font_ttf : SHARED_FONTS_TTF) {
+ if (FileUtil::Exists(user_path + font_ttf)) {
+ using_ttf = true;
+ FileUtil::IOFile file(user_path + font_ttf, "rb");
+ if (file.IsOpen()) {
+ std::vector<u8> ttf_bytes(file.GetSize());
+ file.ReadBytes<u8>(ttf_bytes.data(), ttf_bytes.size());
+ FontRegion region{
+ static_cast<u32>(offset + 8),
+ static_cast<u32>(ttf_bytes.size())}; // Font offset and size do not account
+ // for the header
+ EncryptSharedFont(ttf_bytes, *impl->shared_font, offset);
+ impl->shared_font_regions.push_back(region);
+ } else {
+ LOG_WARNING(Service_NS, "Unable to load font: {}", font_ttf);
+ }
+ } else if (using_ttf) {
+ LOG_WARNING(Service_NS, "Unable to find font: {}", font_ttf);
+ }
}
- const auto font_fp = extracted_romfs->GetFile(font.second);
- if (!font_fp) {
- LOG_ERROR(Service_NS, "{:016X} has no file \"{}\"! Skipping",
- static_cast<u64>(font.first), font.second);
- continue;
+ if (using_ttf)
+ return;
+ FileUtil::IOFile file(filepath, "rb");
+
+ if (file.IsOpen()) {
+ // Read shared font data
+ ASSERT(file.GetSize() == SHARED_FONT_MEM_SIZE);
+ file.ReadBytes(impl->shared_font->data(), impl->shared_font->size());
+ impl->BuildSharedFontsRawRegions(*impl->shared_font);
+ } else {
+ LOG_WARNING(Service_NS,
+ "Shared Font file missing. Loading open source replacement from memory");
+
+ // clang-format off
+ const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = {
+ {std::begin(FontChineseSimplified), std::end(FontChineseSimplified)},
+ {std::begin(FontChineseTraditional), std::end(FontChineseTraditional)},
+ {std::begin(FontExtendedChineseSimplified), std::end(FontExtendedChineseSimplified)},
+ {std::begin(FontKorean), std::end(FontKorean)},
+ {std::begin(FontNintendoExtended), std::end(FontNintendoExtended)},
+ {std::begin(FontStandard), std::end(FontStandard)},
+ };
+ // clang-format on
+
+ for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) {
+ const FontRegion region{static_cast<u32>(offset + 8),
+ static_cast<u32>(font_ttf.size())};
+ EncryptSharedFont(font_ttf, *impl->shared_font, offset);
+ impl->shared_font_regions.push_back(region);
+ }
}
- std::vector<u32> font_data_u32(font_fp->GetSize() / sizeof(u32));
- font_fp->ReadBytes<u32>(font_data_u32.data(), font_fp->GetSize());
- // We need to be BigEndian as u32s for the xor encryption
- std::transform(font_data_u32.begin(), font_data_u32.end(), font_data_u32.begin(),
- Common::swap32);
- // Font offset and size do not account for the header
- const FontRegion region{static_cast<u32>(offset + 8),
- static_cast<u32>((font_data_u32.size() * sizeof(u32)) - 8)};
- DecryptSharedFont(font_data_u32, *impl->shared_font, offset);
- impl->shared_font_regions.push_back(region);
}
}
diff --git a/src/core/hle/service/ns/pl_u.h b/src/core/hle/service/ns/pl_u.h
index a843d569e..1063f4204 100644
--- a/src/core/hle/service/ns/pl_u.h
+++ b/src/core/hle/service/ns/pl_u.h
@@ -5,7 +5,6 @@
#pragma once
#include <memory>
-#include "core/hle/kernel/physical_memory.h"
#include "core/hle/service/service.h"
namespace Service {
@@ -16,8 +15,6 @@ class FileSystemController;
namespace NS {
-void EncryptSharedFont(const std::vector<u8>& input, Kernel::PhysicalMemory& output);
-
class PL_U final : public ServiceFramework<PL_U> {
public:
explicit PL_U(Core::System& system);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 08:01:42 +0100