From 9c7321fe6dbaadb66b70107b314092e9ce83991f Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 20 Jul 2018 11:02:25 -0500 Subject: HLE/ACC: Stub IManagerForApplication::GetAccountId to return an error. And make IManagerForApplication::CheckAvailability always return false. Returning a bogus id from GetAccountId causes games to crash on boot. We should investigate this with a hwtest and either stub it properly or implement it. --- src/core/hle/service/acc/acc.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/core') diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 8ee39b54c..3e1c2c0a0 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -82,14 +82,16 @@ private: LOG_WARNING(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); - rb.Push(true); // TODO: Check when this is supposed to return true and when not + rb.Push(false); // TODO: Check when this is supposed to return true and when not } void GetAccountId(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 4}; - rb.Push(RESULT_SUCCESS); - rb.Push(0x12345678ABCDEF); + // TODO(Subv): Find out what this actually does and implement it. Stub it as an error for + // now since we do not implement NNID. Returning a bogus id here will cause games to send + // invalid IPC requests after ListOpenUsers is called. + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultCode(-1)); } }; @@ -104,7 +106,7 @@ void Module::Interface::ListAllUsers(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); // TODO(Subv): There is only one user for now. const std::vector user_ids = {DEFAULT_USER_ID}; - ctx.WriteBuffer(user_ids.data(), user_ids.size() * sizeof(u128)); + ctx.WriteBuffer(user_ids); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); } @@ -113,7 +115,7 @@ void Module::Interface::ListOpenUsers(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); // TODO(Subv): There is only one user for now. const std::vector user_ids = {DEFAULT_USER_ID}; - ctx.WriteBuffer(user_ids.data(), user_ids.size() * sizeof(u128)); + ctx.WriteBuffer(user_ids); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); } -- cgit v1.2.3