Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FS: convert to service framework

Browse source
This commit is contained in:
wwylele 2018-02-15 11:19:01 +02:00
parent e8c95a9a41
commit 71fac7bd72
7 changed files with 916 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/file_sys/archive_backend.cpp
View file

@ -12,23 +12,22 @@
namespace FileSys {
Path::Path(LowPathType type, u32 size, u32 pointer) : type(type) {
Path::Path(LowPathType type, const std::vector<u8>& data) : type(type) {
switch (type) {
case LowPathType::Binary: {
binary.resize(size);
Memory::ReadBlock(pointer, binary.data(), binary.size());
binary = data;
break;
}
case LowPathType::Char: {
string.resize(size - 1); // Data is always null-terminated.
Memory::ReadBlock(pointer, &string[0], string.size());
string.resize(data.size() - 1); // Data is always null-terminated.
std::memcpy(string.data(), data.data(), string.size());
break;
}
case LowPathType::Wchar: {
u16str.resize(size / 2 - 1); // Data is always null-terminated.
Memory::ReadBlock(pointer, &u16str[0], u16str.size() * sizeof(char16_t));
u16str.resize(data.size() / 2 - 1); // Data is always null-terminated.
std::memcpy(u16str.data(), data.data(), u16str.size() * sizeof(char16_t));
break;
}

2
src/core/file_sys/archive_backend.h
View file

@ -39,7 +39,7 @@ public:
Path() : type(LowPathType::Invalid) {}
Path(const char* path) : type(LowPathType::Char), string(path) {}
Path(std::vector<u8> binary_data) : type(LowPathType::Binary), binary(std::move(binary_data)) {}
Path(LowPathType type, u32 size, u32 pointer);
Path(LowPathType type, const std::vector<u8>& data);
LowPathType GetType() const {
return type;