franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pl_u: Use kernel physical memory

Browse Source
This commit is contained in:
Zach Hilman 2019-09-21 23:00:19 -04:00
parent b3a8a094a5
commit 36d829c27b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/file_sys/system_archive/shared_font.cpp
View File

@ -18,13 +18,16 @@ namespace {
template <std::size_t Size> template <std::size_t Size>
VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) { VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) {
std::vector<u32> vec(Size / sizeof(u32)); std::vector<u8> vec(Size);
std::memcpy(vec.data(), data.data(), vec.size() * sizeof(u32)); std::memcpy(vec.data(), data.data(), vec.size());
std::vector<u8> bfttf(Size + sizeof(u64)); Kernel::PhysicalMemory bfttf(Size + sizeof(u64));
Service::NS::EncryptSharedFont(vec, bfttf); Service::NS::EncryptSharedFont(vec, bfttf);
return std::make_shared<VectorVfsFile>(std::move(bfttf), name);
std::vector<u8> bfttf_vec(Size + sizeof(u64));
std::memcpy(bfttf_vec.data(), bfttf.data(), bfttf_vec.size());
return std::make_shared<VectorVfsFile>(std::move(bfttf_vec), name);
} }
} // Anonymous namespace } // Anonymous namespace

1
src/core/hle/service/ns/pl_u.h
View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include "core/hle/kernel/physical_memory.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Service { namespace Service {