fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XAM] Added property deserialization

Browse Source
This commit is contained in:
Adrian
2025-04-05 19:55:54 +01:00
committed by Radosław Gliński
parent be715f76fa
commit 900a02efff
7 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/xenia/kernel/xam/user_data.cc
View File

@@ -35,7 +35,7 @@ UserData::UserData(X_USER_DATA_TYPE data_type, UserDataTypes user_data) {
case X_USER_DATA_TYPE::WSTRING: {
std::u16string str = std::get<std::u16string>(user_data);
data_.data.unicode.size =
static_cast<uint16_t>(string_util::size_in_bytes(str));
static_cast<uint16_t>(string_util::size_in_bytes(str, false));
extended_data_.resize(data_.data.unicode.size);
memcpy(extended_data_.data(), reinterpret_cast<uint8_t*>(str.data()),
@@ -64,7 +64,7 @@ UserData::UserData(X_USER_DATA_TYPE data_type, UserDataTypes user_data) {
}
UserData::UserData(const X_USER_DATA_TYPE data_type,
const uint32_t data_max_size, const X_USER_DATA* user_data) {
const X_USER_DATA* user_data) {
memcpy(&data_, user_data, sizeof(X_USER_DATA));
data_.type = data_type;
@@ -103,6 +103,19 @@ UserData::UserData(X_USER_DATA_TYPE data_type, std::span<const uint8_t> data) {
extended_data_.insert(extended_data_.begin(), data.begin(), data.end());
}
UserData::UserData(std::span<const uint8_t> data) {
data_ =
*reinterpret_cast<const X_USER_DATA*>(data.data() + sizeof(AttributeKey));
if (requires_additional_data()) {
std::span<const uint8_t> extended_data = data.subspan(
sizeof(AttributeKey) + sizeof(X_USER_DATA), data_.data.binary.size);
extended_data_.insert(extended_data_.begin(), extended_data.begin(),
extended_data.end());
}
}
UserData::UserData(const X_USER_DATA_TYPE data_type,
const X_USER_DATA_UNION* user_data,
std::span<const uint8_t> extended_data) {