Browse Source
Merge pull request #2228 from DarkLordZach/applet-manager-p1
Merge pull request #2228 from DarkLordZach/applet-manager-p1
applets: Add AppletManager and implement PhotoViewer and Error appletspull/15/merge
bunnei
7 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 764 additions and 115 deletions
-
10src/core/CMakeLists.txt
-
50src/core/core.cpp
-
29src/core/core.h
-
34src/core/frontend/applets/error.cpp
-
37src/core/frontend/applets/error.h
-
27src/core/frontend/applets/general_frontend.cpp
-
28src/core/frontend/applets/general_frontend.h
-
27src/core/hle/service/am/am.cpp
-
82src/core/hle/service/am/applets/applets.cpp
-
55src/core/hle/service/am/applets/applets.h
-
182src/core/hle/service/am/applets/error.cpp
-
47src/core/hle/service/am/applets/error.h
-
56src/core/hle/service/am/applets/general_backend.cpp
-
48src/core/hle/service/am/applets/general_backend.h
-
6src/core/hle/service/am/applets/profile_select.cpp
-
4src/core/hle/service/am/applets/profile_select.h
-
7src/core/hle/service/am/applets/software_keyboard.cpp
-
4src/core/hle/service/am/applets/software_keyboard.h
-
24src/core/hle/service/am/applets/stub_applet.h
-
4src/core/hle/service/am/applets/web_browser.cpp
-
4src/core/hle/service/am/applets/web_browser.h
-
2src/yuzu/CMakeLists.txt
-
59src/yuzu/applets/error.cpp
-
33src/yuzu/applets/error.h
-
17src/yuzu/main.cpp
-
3src/yuzu/main.h
@ -0,0 +1,34 @@ |
|||
// Copyright 2019 yuzu emulator team
|
|||
// Licensed under GPLv2 or any later version
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include "core/frontend/applets/error.h"
|
|||
|
|||
namespace Core::Frontend { |
|||
|
|||
ErrorApplet::~ErrorApplet() = default; |
|||
|
|||
void DefaultErrorApplet::ShowError(ResultCode error, std::function<void()> finished) const { |
|||
LOG_CRITICAL(Service_Fatal, "Application requested error display: {:04}-{:04} (raw={:08X})", |
|||
static_cast<u32>(error.module.Value()), error.description.Value(), error.raw); |
|||
} |
|||
|
|||
void DefaultErrorApplet::ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time, |
|||
std::function<void()> finished) const { |
|||
LOG_CRITICAL( |
|||
Service_Fatal, |
|||
"Application requested error display: {:04X}-{:04X} (raw={:08X}) with timestamp={:016X}", |
|||
static_cast<u32>(error.module.Value()), error.description.Value(), error.raw, time.count()); |
|||
} |
|||
|
|||
void DefaultErrorApplet::ShowCustomErrorText(ResultCode error, std::string main_text, |
|||
std::string detail_text, |
|||
std::function<void()> finished) const { |
|||
LOG_CRITICAL(Service_Fatal, |
|||
"Application requested custom error with error_code={:04X}-{:04X} (raw={:08X})", |
|||
static_cast<u32>(error.module.Value()), error.description.Value(), error.raw); |
|||
LOG_CRITICAL(Service_Fatal, " Main Text: {}", main_text); |
|||
LOG_CRITICAL(Service_Fatal, " Detail Text: {}", detail_text); |
|||
} |
|||
|
|||
} // namespace Core::Frontend
|
|||
@ -0,0 +1,37 @@ |
|||
// Copyright 2019 yuzu emulator team |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include <chrono> |
|||
#include <functional> |
|||
|
|||
#include "core/hle/result.h" |
|||
|
|||
namespace Core::Frontend { |
|||
|
|||
class ErrorApplet { |
|||
public: |
|||
virtual ~ErrorApplet(); |
|||
|
|||
virtual void ShowError(ResultCode error, std::function<void()> finished) const = 0; |
|||
|
|||
virtual void ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time, |
|||
std::function<void()> finished) const = 0; |
|||
|
|||
virtual void ShowCustomErrorText(ResultCode error, std::string dialog_text, |
|||
std::string fullscreen_text, |
|||
std::function<void()> finished) const = 0; |
|||
}; |
|||
|
|||
class DefaultErrorApplet final : public ErrorApplet { |
|||
public: |
|||
void ShowError(ResultCode error, std::function<void()> finished) const override; |
|||
void ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time, |
|||
std::function<void()> finished) const override; |
|||
void ShowCustomErrorText(ResultCode error, std::string main_text, std::string detail_text, |
|||
std::function<void()> finished) const override; |
|||
}; |
|||
|
|||
} // namespace Core::Frontend |
|||
@ -0,0 +1,27 @@ |
|||
// Copyright 2019 yuzu emulator team
|
|||
// Licensed under GPLv2 or any later version
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include "common/logging/log.h"
|
|||
#include "core/frontend/applets/general_frontend.h"
|
|||
|
|||
namespace Core::Frontend { |
|||
|
|||
PhotoViewerApplet::~PhotoViewerApplet() = default; |
|||
|
|||
DefaultPhotoViewerApplet::~DefaultPhotoViewerApplet() {} |
|||
|
|||
void DefaultPhotoViewerApplet::ShowPhotosForApplication(u64 title_id, |
|||
std::function<void()> finished) const { |
|||
LOG_INFO(Service_AM, |
|||
"Application requested frontend to display stored photos for title_id={:016X}", |
|||
title_id); |
|||
finished(); |
|||
} |
|||
|
|||
void DefaultPhotoViewerApplet::ShowAllPhotos(std::function<void()> finished) const { |
|||
LOG_INFO(Service_AM, "Application requested frontend to display all stored photos."); |
|||
finished(); |
|||
} |
|||
|
|||
} // namespace Core::Frontend
|
|||
@ -0,0 +1,28 @@ |
|||
// Copyright 2019 yuzu emulator team |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include <functional> |
|||
#include "common/common_types.h" |
|||
|
|||
namespace Core::Frontend { |
|||
|
|||
class PhotoViewerApplet { |
|||
public: |
|||
virtual ~PhotoViewerApplet(); |
|||
|
|||
virtual void ShowPhotosForApplication(u64 title_id, std::function<void()> finished) const = 0; |
|||
virtual void ShowAllPhotos(std::function<void()> finished) const = 0; |
|||
}; |
|||
|
|||
class DefaultPhotoViewerApplet final : public PhotoViewerApplet { |
|||
public: |
|||
~DefaultPhotoViewerApplet() override; |
|||
|
|||
void ShowPhotosForApplication(u64 title_id, std::function<void()> finished) const override; |
|||
void ShowAllPhotos(std::function<void()> finished) const override; |
|||
}; |
|||
|
|||
} // namespace Core::Frontend |
|||
@ -0,0 +1,182 @@ |
|||
// Copyright 2019 yuzu emulator team
|
|||
// Licensed under GPLv2 or any later version
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include <array>
|
|||
#include <cstring>
|
|||
#include "common/assert.h"
|
|||
#include "common/logging/log.h"
|
|||
#include "common/string_util.h"
|
|||
#include "core/core.h"
|
|||
#include "core/frontend/applets/error.h"
|
|||
#include "core/hle/service/am/am.h"
|
|||
#include "core/hle/service/am/applets/error.h"
|
|||
|
|||
namespace Service::AM::Applets { |
|||
|
|||
#pragma pack(push, 4)
|
|||
struct ShowError { |
|||
u8 mode; |
|||
bool jump; |
|||
INSERT_PADDING_BYTES(4); |
|||
bool use_64bit_error_code; |
|||
INSERT_PADDING_BYTES(1); |
|||
u64 error_code_64; |
|||
u32 error_code_32; |
|||
}; |
|||
static_assert(sizeof(ShowError) == 0x14, "ShowError has incorrect size."); |
|||
#pragma pack(pop)
|
|||
|
|||
struct ShowErrorRecord { |
|||
u8 mode; |
|||
bool jump; |
|||
INSERT_PADDING_BYTES(6); |
|||
u64 error_code_64; |
|||
u64 posix_time; |
|||
}; |
|||
static_assert(sizeof(ShowErrorRecord) == 0x18, "ShowErrorRecord has incorrect size."); |
|||
|
|||
struct SystemErrorArg { |
|||
u8 mode; |
|||
bool jump; |
|||
INSERT_PADDING_BYTES(6); |
|||
u64 error_code_64; |
|||
std::array<char, 8> language_code; |
|||
std::array<char, 0x800> main_text; |
|||
std::array<char, 0x800> detail_text; |
|||
}; |
|||
static_assert(sizeof(SystemErrorArg) == 0x1018, "SystemErrorArg has incorrect size."); |
|||
|
|||
struct ApplicationErrorArg { |
|||
u8 mode; |
|||
bool jump; |
|||
INSERT_PADDING_BYTES(6); |
|||
u32 error_code; |
|||
std::array<char, 8> language_code; |
|||
std::array<char, 0x800> main_text; |
|||
std::array<char, 0x800> detail_text; |
|||
}; |
|||
static_assert(sizeof(ApplicationErrorArg) == 0x1014, "ApplicationErrorArg has incorrect size."); |
|||
|
|||
union Error::ErrorArguments { |
|||
ShowError error; |
|||
ShowErrorRecord error_record; |
|||
SystemErrorArg system_error; |
|||
ApplicationErrorArg application_error; |
|||
}; |
|||
|
|||
namespace { |
|||
template <typename T> |
|||
void CopyArgumentData(const std::vector<u8>& data, T& variable) { |
|||
ASSERT(data.size() >= sizeof(T)); |
|||
std::memcpy(&variable, data.data(), sizeof(T)); |
|||
} |
|||
|
|||
ResultCode Decode64BitError(u64 error) { |
|||
const auto description = (error >> 32) & 0x1FFF; |
|||
auto module = error & 0x3FF; |
|||
if (module >= 2000) |
|||
module -= 2000; |
|||
module &= 0x1FF; |
|||
return {static_cast<ErrorModule>(module), static_cast<u32>(description)}; |
|||
} |
|||
|
|||
} // Anonymous namespace
|
|||
|
|||
Error::Error(const Core::Frontend::ErrorApplet& frontend) : frontend(frontend) {} |
|||
|
|||
Error::~Error() = default; |
|||
|
|||
void Error::Initialize() { |
|||
Applet::Initialize(); |
|||
args = std::make_unique<ErrorArguments>(); |
|||
complete = false; |
|||
|
|||
const auto storage = broker.PopNormalDataToApplet(); |
|||
ASSERT(storage != nullptr); |
|||
const auto data = storage->GetData(); |
|||
|
|||
ASSERT(!data.empty()); |
|||
std::memcpy(&mode, data.data(), sizeof(ErrorAppletMode)); |
|||
|
|||
switch (mode) { |
|||
case ErrorAppletMode::ShowError: |
|||
CopyArgumentData(data, args->error); |
|||
if (args->error.use_64bit_error_code) { |
|||
error_code = Decode64BitError(args->error.error_code_64); |
|||
} else { |
|||
error_code = ResultCode(args->error.error_code_32); |
|||
} |
|||
break; |
|||
case ErrorAppletMode::ShowSystemError: |
|||
CopyArgumentData(data, args->system_error); |
|||
error_code = ResultCode(Decode64BitError(args->system_error.error_code_64)); |
|||
break; |
|||
case ErrorAppletMode::ShowApplicationError: |
|||
CopyArgumentData(data, args->application_error); |
|||
error_code = ResultCode(args->application_error.error_code); |
|||
break; |
|||
case ErrorAppletMode::ShowErrorRecord: |
|||
CopyArgumentData(data, args->error_record); |
|||
error_code = Decode64BitError(args->error_record.error_code_64); |
|||
break; |
|||
default: |
|||
UNIMPLEMENTED_MSG("Unimplemented LibAppletError mode={:02X}!", static_cast<u8>(mode)); |
|||
} |
|||
} |
|||
|
|||
bool Error::TransactionComplete() const { |
|||
return complete; |
|||
} |
|||
|
|||
ResultCode Error::GetStatus() const { |
|||
return RESULT_SUCCESS; |
|||
} |
|||
|
|||
void Error::ExecuteInteractive() { |
|||
UNREACHABLE_MSG("Unexpected interactive applet data!"); |
|||
} |
|||
|
|||
void Error::Execute() { |
|||
if (complete) { |
|||
return; |
|||
} |
|||
|
|||
const auto callback = [this] { DisplayCompleted(); }; |
|||
|
|||
switch (mode) { |
|||
case ErrorAppletMode::ShowError: |
|||
frontend.ShowError(error_code, callback); |
|||
break; |
|||
case ErrorAppletMode::ShowSystemError: |
|||
case ErrorAppletMode::ShowApplicationError: { |
|||
const auto system = mode == ErrorAppletMode::ShowSystemError; |
|||
const auto& main_text = |
|||
system ? args->system_error.main_text : args->application_error.main_text; |
|||
const auto& detail_text = |
|||
system ? args->system_error.detail_text : args->application_error.detail_text; |
|||
|
|||
frontend.ShowCustomErrorText( |
|||
error_code, |
|||
Common::StringFromFixedZeroTerminatedBuffer(main_text.data(), main_text.size()), |
|||
Common::StringFromFixedZeroTerminatedBuffer(detail_text.data(), detail_text.size()), |
|||
callback); |
|||
break; |
|||
} |
|||
case ErrorAppletMode::ShowErrorRecord: |
|||
frontend.ShowErrorWithTimestamp( |
|||
error_code, std::chrono::seconds{args->error_record.posix_time}, callback); |
|||
break; |
|||
default: |
|||
UNIMPLEMENTED_MSG("Unimplemented LibAppletError mode={:02X}!", static_cast<u8>(mode)); |
|||
DisplayCompleted(); |
|||
} |
|||
} |
|||
|
|||
void Error::DisplayCompleted() { |
|||
complete = true; |
|||
broker.PushNormalDataFromApplet(IStorage{{}}); |
|||
broker.SignalStateChanged(); |
|||
} |
|||
|
|||
} // namespace Service::AM::Applets
|
|||
@ -0,0 +1,47 @@ |
|||
// Copyright 2019 yuzu emulator team |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include "core/hle/result.h" |
|||
#include "core/hle/service/am/applets/applets.h" |
|||
|
|||
namespace Service::AM::Applets { |
|||
|
|||
enum class ErrorAppletMode : u8 { |
|||
ShowError = 0, |
|||
ShowSystemError = 1, |
|||
ShowApplicationError = 2, |
|||
ShowEula = 3, |
|||
ShowErrorPctl = 4, |
|||
ShowErrorRecord = 5, |
|||
ShowUpdateEula = 8, |
|||
}; |
|||
|
|||
class Error final : public Applet { |
|||
public: |
|||
explicit Error(const Core::Frontend::ErrorApplet& frontend); |
|||
~Error() override; |
|||
|
|||
void Initialize() override; |
|||
|
|||
bool TransactionComplete() const override; |
|||
ResultCode GetStatus() const override; |
|||
void ExecuteInteractive() override; |
|||
void Execute() override; |
|||
|
|||
void DisplayCompleted(); |
|||
|
|||
private: |
|||
union ErrorArguments; |
|||
|
|||
const Core::Frontend::ErrorApplet& frontend; |
|||
ResultCode error_code = RESULT_SUCCESS; |
|||
ErrorAppletMode mode = ErrorAppletMode::ShowError; |
|||
std::unique_ptr<ErrorArguments> args; |
|||
|
|||
bool complete = false; |
|||
}; |
|||
|
|||
} // namespace Service::AM::Applets |
|||
@ -0,0 +1,48 @@ |
|||
// Copyright 2019 yuzu emulator team |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include "core/hle/service/am/applets/applets.h" |
|||
|
|||
namespace Service::AM::Applets { |
|||
|
|||
enum class PhotoViewerAppletMode : u8 { |
|||
CurrentApp = 0, |
|||
AllApps = 1, |
|||
}; |
|||
|
|||
class PhotoViewer final : public Applet { |
|||
public: |
|||
explicit PhotoViewer(const Core::Frontend::PhotoViewerApplet& frontend); |
|||
~PhotoViewer() override; |
|||
|
|||
void Initialize() override; |
|||
bool TransactionComplete() const override; |
|||
ResultCode GetStatus() const override; |
|||
void ExecuteInteractive() override; |
|||
void Execute() override; |
|||
|
|||
void ViewFinished(); |
|||
|
|||
private: |
|||
const Core::Frontend::PhotoViewerApplet& frontend; |
|||
bool complete = false; |
|||
PhotoViewerAppletMode mode = PhotoViewerAppletMode::CurrentApp; |
|||
}; |
|||
|
|||
class StubApplet final : public Applet { |
|||
public: |
|||
StubApplet(); |
|||
~StubApplet() override; |
|||
|
|||
void Initialize() override; |
|||
|
|||
bool TransactionComplete() const override; |
|||
ResultCode GetStatus() const override; |
|||
void ExecuteInteractive() override; |
|||
void Execute() override; |
|||
}; |
|||
|
|||
} // namespace Service::AM::Applets |
|||
@ -1,24 +0,0 @@ |
|||
// Copyright 2018 yuzu emulator team |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include "core/hle/service/am/applets/applets.h" |
|||
|
|||
namespace Service::AM::Applets { |
|||
|
|||
class StubApplet final : public Applet { |
|||
public: |
|||
StubApplet(); |
|||
~StubApplet() override; |
|||
|
|||
void Initialize() override; |
|||
|
|||
bool TransactionComplete() const override; |
|||
ResultCode GetStatus() const override; |
|||
void ExecuteInteractive() override; |
|||
void Execute() override; |
|||
}; |
|||
|
|||
} // namespace Service::AM::Applets |
|||
@ -0,0 +1,59 @@ |
|||
// Copyright 2019 yuzu Emulator Project
|
|||
// Licensed under GPLv2 or any later version
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include <QDateTime>
|
|||
#include "core/hle/lock.h"
|
|||
#include "yuzu/applets/error.h"
|
|||
#include "yuzu/main.h"
|
|||
|
|||
QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { |
|||
connect(this, &QtErrorDisplay::MainWindowDisplayError, &parent, |
|||
&GMainWindow::ErrorDisplayDisplayError, Qt::QueuedConnection); |
|||
connect(&parent, &GMainWindow::ErrorDisplayFinished, this, |
|||
&QtErrorDisplay::MainWindowFinishedError, Qt::DirectConnection); |
|||
} |
|||
|
|||
QtErrorDisplay::~QtErrorDisplay() = default; |
|||
|
|||
void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const { |
|||
this->callback = std::move(finished); |
|||
emit MainWindowDisplayError( |
|||
tr("An error has occured.\nPlease try again or contact the developer of the " |
|||
"software.\n\nError Code: %1-%2 (0x%3)") |
|||
.arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) |
|||
.arg(error.description, 4, 10, QChar::fromLatin1('0')) |
|||
.arg(error.raw, 8, 16, QChar::fromLatin1('0'))); |
|||
} |
|||
|
|||
void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time, |
|||
std::function<void()> finished) const { |
|||
this->callback = std::move(finished); |
|||
emit MainWindowDisplayError( |
|||
tr("An error occured on %1 at %2.\nPlease try again or contact the " |
|||
"developer of the software.\n\nError Code: %3-%4 (0x%5)") |
|||
.arg(QDateTime::fromSecsSinceEpoch(time.count()).toString("dddd, MMMM d, yyyy")) |
|||
.arg(QDateTime::fromSecsSinceEpoch(time.count()).toString("h:mm:ss A")) |
|||
.arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) |
|||
.arg(error.description, 4, 10, QChar::fromLatin1('0')) |
|||
.arg(error.raw, 8, 16, QChar::fromLatin1('0'))); |
|||
} |
|||
|
|||
void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_text, |
|||
std::string fullscreen_text, |
|||
std::function<void()> finished) const { |
|||
this->callback = std::move(finished); |
|||
emit MainWindowDisplayError( |
|||
tr("An error has occured.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5") |
|||
.arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) |
|||
.arg(error.description, 4, 10, QChar::fromLatin1('0')) |
|||
.arg(error.raw, 8, 16, QChar::fromLatin1('0')) |
|||
.arg(QString::fromStdString(dialog_text)) |
|||
.arg(QString::fromStdString(fullscreen_text))); |
|||
} |
|||
|
|||
void QtErrorDisplay::MainWindowFinishedError() { |
|||
// Acquire the HLE mutex
|
|||
std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); |
|||
callback(); |
|||
} |
|||
@ -0,0 +1,33 @@ |
|||
// Copyright 2019 yuzu Emulator Project |
|||
// Licensed under GPLv2 or any later version |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include <QObject> |
|||
|
|||
#include "core/frontend/applets/error.h" |
|||
|
|||
class GMainWindow; |
|||
|
|||
class QtErrorDisplay final : public QObject, public Core::Frontend::ErrorApplet { |
|||
Q_OBJECT |
|||
|
|||
public: |
|||
explicit QtErrorDisplay(GMainWindow& parent); |
|||
~QtErrorDisplay() override; |
|||
|
|||
void ShowError(ResultCode error, std::function<void()> finished) const override; |
|||
void ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time, |
|||
std::function<void()> finished) const override; |
|||
void ShowCustomErrorText(ResultCode error, std::string dialog_text, std::string fullscreen_text, |
|||
std::function<void()> finished) const override; |
|||
|
|||
signals: |
|||
void MainWindowDisplayError(QString error) const; |
|||
|
|||
private: |
|||
void MainWindowFinishedError(); |
|||
|
|||
mutable std::function<void()> callback; |
|||
}; |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue