yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Addressed issues

This commit is contained in:
Chloe Marcec 2021-09-09 00:09:04 +10:00
parent 9141816b10
commit 89958e27aa
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/service/acc/acc.cpp
View File

@ -491,7 +491,7 @@ public:
class EnsureTokenIdCacheAsyncInterface final : public IAsyncContext { class EnsureTokenIdCacheAsyncInterface final : public IAsyncContext {
public: public:
explicit EnsureTokenIdCacheAsyncInterface(Core::System& system_) : IAsyncContext(system_) { explicit EnsureTokenIdCacheAsyncInterface(Core::System& system_) : IAsyncContext{system_} {
MarkComplete(); MarkComplete();
} }
~EnsureTokenIdCacheAsyncInterface() = default; ~EnsureTokenIdCacheAsyncInterface() = default;
@ -504,13 +504,13 @@ public:
} }
protected: protected:
bool IsComplete() override { bool IsComplete() const override {
return true; return true;
} }
void Cancel() override {} void Cancel() override {}
ResultCode GetResult() override { ResultCode GetResult() const override {
return ResultSuccess; return ResultSuccess;
} }
}; };
@ -518,7 +518,9 @@ protected:
class IManagerForApplication final : public ServiceFramework<IManagerForApplication> { class IManagerForApplication final : public ServiceFramework<IManagerForApplication> {
public: public:
explicit IManagerForApplication(Core::System& system_, Common::UUID user_id_) explicit IManagerForApplication(Core::System& system_, Common::UUID user_id_)
: ServiceFramework{system_, "IManagerForApplication"}, user_id{user_id_}, system(system_) { : ServiceFramework{system_, "IManagerForApplication"},
ensure_token_id{std::make_shared<EnsureTokenIdCacheAsyncInterface>(system)},
user_id{user_id_} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IManagerForApplication::CheckAvailability, "CheckAvailability"}, {0, &IManagerForApplication::CheckAvailability, "CheckAvailability"},
@ -533,8 +535,6 @@ public:
// clang-format on // clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
ensure_token_id = std::make_shared<EnsureTokenIdCacheAsyncInterface>(system);
} }
private: private:
@ -591,7 +591,6 @@ private:
std::shared_ptr<EnsureTokenIdCacheAsyncInterface> ensure_token_id{}; std::shared_ptr<EnsureTokenIdCacheAsyncInterface> ensure_token_id{};
Common::UUID user_id{Common::INVALID_UUID}; Common::UUID user_id{Common::INVALID_UUID};
Core::System& system;
}; };
// 6.0.0+ // 6.0.0+

12
src/core/hle/service/acc/async_context.cpp
View File

@ -14,12 +14,12 @@ IAsyncContext::IAsyncContext(Core::System& system_)
compeletion_event.Initialize("IAsyncContext:CompletionEvent"); compeletion_event.Initialize("IAsyncContext:CompletionEvent");
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IAsyncContext::GetSystemEvent, "GetSystemEvent"}, {0, &IAsyncContext::GetSystemEvent, "GetSystemEvent"},
{1, &IAsyncContext::Cancel, "Cancel"}, {1, &IAsyncContext::Cancel, "Cancel"},
{2, &IAsyncContext::HasDone, "HasDone"}, {2, &IAsyncContext::HasDone, "HasDone"},
{3, &IAsyncContext::GetResult, "GetResult"}, {3, &IAsyncContext::GetResult, "GetResult"},
}; };
// clang-format on // clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);

4
src/core/hle/service/acc/async_context.h
View File

@ -23,9 +23,9 @@ public:
void GetResult(Kernel::HLERequestContext& ctx); void GetResult(Kernel::HLERequestContext& ctx);
protected: protected:
virtual bool IsComplete() = 0; virtual bool IsComplete() const = 0;
virtual void Cancel() = 0; virtual void Cancel() = 0;
virtual ResultCode GetResult() = 0; virtual ResultCode GetResult() const = 0;
void MarkComplete(); void MarkComplete();