mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 14:19:08 +01:00
constants: Extract backup JPEG used by account services
This commit is contained in:
parent
de33ad25f5
commit
11f2f0f45c
5 changed files with 43 additions and 28 deletions
|
@ -5,6 +5,8 @@ add_library(core STATIC
|
||||||
arm/exclusive_monitor.h
|
arm/exclusive_monitor.h
|
||||||
arm/unicorn/arm_unicorn.cpp
|
arm/unicorn/arm_unicorn.cpp
|
||||||
arm/unicorn/arm_unicorn.h
|
arm/unicorn/arm_unicorn.h
|
||||||
|
constants.cpp
|
||||||
|
constants.h
|
||||||
core.cpp
|
core.cpp
|
||||||
core.h
|
core.h
|
||||||
core_cpu.cpp
|
core_cpu.cpp
|
||||||
|
|
17
src/core/constants.cpp
Normal file
17
src/core/constants.cpp
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
// Copyright 2019 yuzu Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include "core/constants.h"
|
||||||
|
|
||||||
|
namespace Core::Constants {
|
||||||
|
const std::array<u8, 107> ACCOUNT_BACKUP_JPEG{{
|
||||||
|
0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
|
||||||
|
0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05,
|
||||||
|
0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0a, 0x0b, 0x0e,
|
||||||
|
0x0b, 0x09, 0x09, 0x0d, 0x11, 0x0d, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x10, 0x0a, 0x0c, 0x12, 0x13,
|
||||||
|
0x12, 0x10, 0x13, 0x0f, 0x10, 0x10, 0x10, 0xff, 0xc9, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01,
|
||||||
|
0x01, 0x01, 0x11, 0x00, 0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08,
|
||||||
|
0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9,
|
||||||
|
}};
|
||||||
|
}
|
17
src/core/constants.h
Normal file
17
src/core/constants.h
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
// Copyright 2019 yuzu Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "common/common_types.h"
|
||||||
|
|
||||||
|
// This is to consolidate system-wide constants that are used by multiple components of yuzu.
|
||||||
|
// This is especially to prevent the case of something in frontend duplicating a constexpr array or
|
||||||
|
// directly including some service header for the sole purpose of data.
|
||||||
|
namespace Core::Constants {
|
||||||
|
|
||||||
|
// ACC Service - Blank JPEG used as user icon in absentia of real one.
|
||||||
|
extern const std::array<u8, 107> ACCOUNT_BACKUP_JPEG;
|
||||||
|
|
||||||
|
} // namespace Core::Constants
|
|
@ -10,6 +10,7 @@
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
|
#include "core/constants.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
#include "core/hle/service/acc/acc.h"
|
#include "core/hle/service/acc/acc.h"
|
||||||
|
@ -21,19 +22,6 @@
|
||||||
|
|
||||||
namespace Service::Account {
|
namespace Service::Account {
|
||||||
|
|
||||||
// Smallest JPEG https://github.com/mathiasbynens/small/blob/master/jpeg.jpg
|
|
||||||
// used as a backup should the one on disk not exist
|
|
||||||
constexpr u32 backup_jpeg_size = 107;
|
|
||||||
constexpr std::array<u8, backup_jpeg_size> backup_jpeg{{
|
|
||||||
0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
|
|
||||||
0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05,
|
|
||||||
0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0a, 0x0b, 0x0e,
|
|
||||||
0x0b, 0x09, 0x09, 0x0d, 0x11, 0x0d, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x10, 0x0a, 0x0c, 0x12, 0x13,
|
|
||||||
0x12, 0x10, 0x13, 0x0f, 0x10, 0x10, 0x10, 0xff, 0xc9, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01,
|
|
||||||
0x01, 0x01, 0x11, 0x00, 0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08,
|
|
||||||
0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9,
|
|
||||||
}};
|
|
||||||
|
|
||||||
static std::string GetImagePath(Common::UUID uuid) {
|
static std::string GetImagePath(Common::UUID uuid) {
|
||||||
return FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
|
return FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
|
||||||
"/system/save/8000000000000010/su/avators/" + uuid.FormatSwitch() + ".jpg";
|
"/system/save/8000000000000010/su/avators/" + uuid.FormatSwitch() + ".jpg";
|
||||||
|
@ -101,8 +89,8 @@ private:
|
||||||
if (!image.IsOpen()) {
|
if (!image.IsOpen()) {
|
||||||
LOG_WARNING(Service_ACC,
|
LOG_WARNING(Service_ACC,
|
||||||
"Failed to load user provided image! Falling back to built-in backup...");
|
"Failed to load user provided image! Falling back to built-in backup...");
|
||||||
ctx.WriteBuffer(backup_jpeg);
|
ctx.WriteBuffer(Core::Constants::ACCOUNT_BACKUP_JPEG);
|
||||||
rb.Push<u32>(backup_jpeg_size);
|
rb.Push<u32>(Core::Constants::ACCOUNT_BACKUP_JPEG.size());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,7 +112,7 @@ private:
|
||||||
if (!image.IsOpen()) {
|
if (!image.IsOpen()) {
|
||||||
LOG_WARNING(Service_ACC,
|
LOG_WARNING(Service_ACC,
|
||||||
"Failed to load user provided image! Falling back to built-in backup...");
|
"Failed to load user provided image! Falling back to built-in backup...");
|
||||||
rb.Push<u32>(backup_jpeg_size);
|
rb.Push<u32>(Core::Constants::ACCOUNT_BACKUP_JPEG.size());
|
||||||
} else {
|
} else {
|
||||||
rb.Push<u32>(SanitizeJPEGSize(image.GetSize()));
|
rb.Push<u32>(SanitizeJPEGSize(image.GetSize()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,21 +12,11 @@
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
#include "core/constants.h"
|
||||||
#include "core/hle/lock.h"
|
#include "core/hle/lock.h"
|
||||||
#include "yuzu/applets/profile_select.h"
|
#include "yuzu/applets/profile_select.h"
|
||||||
#include "yuzu/main.h"
|
#include "yuzu/main.h"
|
||||||
|
|
||||||
// Same backup JPEG used by acc IProfile::GetImage if no jpeg found
|
|
||||||
constexpr std::array<u8, 107> backup_jpeg{
|
|
||||||
0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
|
|
||||||
0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05,
|
|
||||||
0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0a, 0x0b, 0x0e,
|
|
||||||
0x0b, 0x09, 0x09, 0x0d, 0x11, 0x0d, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x10, 0x0a, 0x0c, 0x12, 0x13,
|
|
||||||
0x12, 0x10, 0x13, 0x0f, 0x10, 0x10, 0x10, 0xff, 0xc9, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01,
|
|
||||||
0x01, 0x01, 0x11, 0x00, 0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08,
|
|
||||||
0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9,
|
|
||||||
};
|
|
||||||
|
|
||||||
QString FormatUserEntryText(const QString& username, Common::UUID uuid) {
|
QString FormatUserEntryText(const QString& username, Common::UUID uuid) {
|
||||||
return QtProfileSelectionDialog::tr(
|
return QtProfileSelectionDialog::tr(
|
||||||
"%1\n%2", "%1 is the profile username, %2 is the formatted UUID (e.g. "
|
"%1\n%2", "%1 is the profile username, %2 is the formatted UUID (e.g. "
|
||||||
|
@ -45,7 +35,8 @@ QPixmap GetIcon(Common::UUID uuid) {
|
||||||
|
|
||||||
if (!icon) {
|
if (!icon) {
|
||||||
icon.fill(Qt::black);
|
icon.fill(Qt::black);
|
||||||
icon.loadFromData(backup_jpeg.data(), static_cast<u32>(backup_jpeg.size()));
|
icon.loadFromData(Core::Constants::ACCOUNT_BACKUP_JPEG.data(),
|
||||||
|
static_cast<u32>(Core::Constants::ACCOUNT_BACKUP_JPEG.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||||
|
|
Loading…
Reference in a new issue