summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-09-22 03:50:36 +0200
committerZach Hilman <zachhilman@gmail.com>2019-10-13 19:46:27 +0200
commit40284c68685a1796402a6909584345baf9f99348 (patch)
tree180e8f0aab35c99eb92829bb7642fa678b10211d /src/core/hle
parentsystem_archive: Synthesize shared fonts system archives (diff)
downloadyuzu-40284c68685a1796402a6909584345baf9f99348.tar
yuzu-40284c68685a1796402a6909584345baf9f99348.tar.gz
yuzu-40284c68685a1796402a6909584345baf9f99348.tar.bz2
yuzu-40284c68685a1796402a6909584345baf9f99348.tar.lz
yuzu-40284c68685a1796402a6909584345baf9f99348.tar.xz
yuzu-40284c68685a1796402a6909584345baf9f99348.tar.zst
yuzu-40284c68685a1796402a6909584345baf9f99348.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/ns/pl_u.cpp157
1 files changed, 47 insertions, 110 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index f64535237..bafba3d2f 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -24,6 +24,7 @@
#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"
@@ -94,15 +95,16 @@ static void DecryptSharedFont(const std::vector<u32>& input, Kernel::PhysicalMem
offset += 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);
+static 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));
}
// Helper function to make BuildSharedFontsRawRegions a bit nicer
@@ -168,114 +170,49 @@ 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
- 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);
+ // 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();
}
- } 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) {
+ romfs = FileSys::SystemArchive::SynthesizeSystemArchive(static_cast<u64>(font.first));
+ }
- // Create path if not already created
- if (!FileUtil::CreateFullPath(filepath)) {
- LOG_ERROR(Service_NS, "Failed to create sharedfonts path \"{}\"!", filepath);
- return;
+ if (!romfs) {
+ LOG_ERROR(Service_NS, "Failed to find or synthesize {: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 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;
}
- 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);
- }
+ 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);
+ // 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);
}
}